From a19be26c3771d04bd8a150cff8186d3ab46670ea Mon Sep 17 00:00:00 2001 From: Maxim Katcharov Date: Wed, 12 Mar 2025 16:19:19 -0600 Subject: [PATCH 01/36] Rename operationTimeout --- .../client/internal/crypt/Crypt.java | 4 +-- .../internal/crypt/CryptConnection.java | 6 ++-- .../internal/gridfs/GridFSBucketImpl.java | 2 +- .../gridfs/GridFSPublisherCreator.java | 29 ++++++++++--------- .../internal/CollectionInfoRetriever.java | 4 +-- .../client/internal/CommandMarker.java | 13 +++++---- .../com/mongodb/client/internal/Crypt.java | 24 +++++++++------ .../client/internal/CryptConnection.java | 10 ++++--- 8 files changed, 52 insertions(+), 40 deletions(-) diff --git a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/crypt/Crypt.java b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/crypt/Crypt.java index 61ccaa320fe..a9407799dc7 100644 --- a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/crypt/Crypt.java +++ b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/crypt/Crypt.java @@ -143,9 +143,9 @@ public Mono encrypt(final String databaseName, final RawBsonDoc * * @param commandResponse the encrypted command response */ - public Mono decrypt(final RawBsonDocument commandResponse, @Nullable final Timeout operationTimeout) { + public Mono decrypt(final RawBsonDocument commandResponse, @Nullable final Timeout timeout) { notNull("commandResponse", commandResponse); - return executeStateMachine(() -> mongoCrypt.createDecryptionContext(commandResponse), operationTimeout) + return executeStateMachine(() -> mongoCrypt.createDecryptionContext(commandResponse), timeout) .onErrorMap(this::wrapInClientException); } diff --git a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/crypt/CryptConnection.java b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/crypt/CryptConnection.java index c05bfb663f2..f7febad164c 100644 --- a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/crypt/CryptConnection.java +++ b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/crypt/CryptConnection.java @@ -121,14 +121,14 @@ public void commandAsync(final String database, final BsonDocument command, : new SplittablePayloadBsonWriter(bsonBinaryWriter, bsonOutput, createSplittablePayloadMessageSettings(), payload, MAX_SPLITTABLE_DOCUMENT_SIZE); - Timeout operationTimeout = operationContext.getTimeoutContext().getTimeout(); + Timeout timeout = operationContext.getTimeoutContext().getTimeout(); getEncoder(command).encode(writer, command, EncoderContext.builder().build()); - crypt.encrypt(database, new RawBsonDocument(bsonOutput.getInternalBuffer(), 0, bsonOutput.getSize()), operationTimeout) + crypt.encrypt(database, new RawBsonDocument(bsonOutput.getInternalBuffer(), 0, bsonOutput.getSize()), timeout) .flatMap((Function>) encryptedCommand -> Mono.create(sink -> wrapped.commandAsync(database, encryptedCommand, commandFieldNameValidator, readPreference, new RawBsonDocumentCodec(), operationContext, responseExpected, EmptyMessageSequences.INSTANCE, sinkToCallback(sink)))) - .flatMap(rawBsonDocument -> crypt.decrypt(rawBsonDocument, operationTimeout)) + .flatMap(rawBsonDocument -> crypt.decrypt(rawBsonDocument, timeout)) .map(decryptedResponse -> commandResultDecoder.decode(new BsonBinaryReader(decryptedResponse.getByteBuffer().asNIO()), DecoderContext.builder().build()) diff --git a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/gridfs/GridFSBucketImpl.java b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/gridfs/GridFSBucketImpl.java index 948c666489c..0b3a166e698 100644 --- a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/gridfs/GridFSBucketImpl.java +++ b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/gridfs/GridFSBucketImpl.java @@ -232,7 +232,7 @@ public GridFSDownloadPublisher downloadToPublisher(final String filename) { @Override public GridFSDownloadPublisher downloadToPublisher(final String filename, final GridFSDownloadOptions options) { Function findPublisherCreator = - operationTimeout -> createGridFSFindPublisher(filesCollection, null, filename, options, operationTimeout); + timeout -> createGridFSFindPublisher(filesCollection, null, filename, options, timeout); return createGridFSDownloadPublisher(chunksCollection, null, findPublisherCreator); } diff --git a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/gridfs/GridFSPublisherCreator.java b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/gridfs/GridFSPublisherCreator.java index 166abca6a0b..cf50a9a2dc5 100644 --- a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/gridfs/GridFSPublisherCreator.java +++ b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/gridfs/GridFSPublisherCreator.java @@ -93,9 +93,9 @@ public static GridFSFindPublisher createGridFSFindPublisher( final MongoCollection filesCollection, @Nullable final ClientSession clientSession, @Nullable final Bson filter, - @Nullable final Timeout operationTimeout) { + @Nullable final Timeout timeout) { notNull("filesCollection", filesCollection); - return new GridFSFindPublisherImpl(createFindPublisher(filesCollection, clientSession, filter, operationTimeout)); + return new GridFSFindPublisherImpl(createFindPublisher(filesCollection, clientSession, filter, timeout)); } public static GridFSFindPublisher createGridFSFindPublisher( @@ -103,7 +103,7 @@ public static GridFSFindPublisher createGridFSFindPublisher( @Nullable final ClientSession clientSession, final String filename, final GridFSDownloadOptions options, - @Nullable final Timeout operationTimeout) { + @Nullable final Timeout timeout) { notNull("filesCollection", filesCollection); notNull("filename", filename); notNull("options", options); @@ -119,7 +119,8 @@ public static GridFSFindPublisher createGridFSFindPublisher( sort = -1; } - return createGridFSFindPublisher(filesCollection, clientSession, new Document("filename", filename), operationTimeout).skip(skip) + return createGridFSFindPublisher(filesCollection, clientSession, new Document("filename", filename), timeout) + .skip(skip) .sort(new Document("uploadDate", sort)); } @@ -127,19 +128,19 @@ public static FindPublisher createFindPublisher( final MongoCollection filesCollection, @Nullable final ClientSession clientSession, @Nullable final Bson filter, - @Nullable final Timeout operationTimeout) { + @Nullable final Timeout timeout) { notNull("filesCollection", filesCollection); FindPublisher publisher; if (clientSession == null) { - publisher = collectionWithTimeout(filesCollection, operationTimeout).find(); + publisher = collectionWithTimeout(filesCollection, timeout).find(); } else { - publisher = collectionWithTimeout(filesCollection, operationTimeout).find(clientSession); + publisher = collectionWithTimeout(filesCollection, timeout).find(clientSession); } if (filter != null) { publisher = publisher.filter(filter); } - if (operationTimeout != null) { + if (timeout != null) { publisher.timeoutMode(TimeoutMode.CURSOR_LIFETIME); } return publisher; @@ -175,8 +176,8 @@ public static Publisher createDeletePublisher(final MongoCollection { - Timeout operationTimeout = startTimeout(filesCollection.getTimeout(MILLISECONDS)); - return collectionWithTimeoutMono(filesCollection, operationTimeout) + Timeout timeout = startTimeout(filesCollection.getTimeout(MILLISECONDS)); + return collectionWithTimeoutMono(filesCollection, timeout) .flatMap(wrappedCollection -> { if (clientSession == null) { return Mono.from(wrappedCollection.deleteOne(filter)); @@ -187,7 +188,7 @@ public static Publisher createDeletePublisher(final MongoCollection { if (clientSession == null) { return Mono.from(wrappedCollection.deleteMany(new BsonDocument("files_id", id))); @@ -228,15 +229,15 @@ public static Publisher createDropPublisher(final MongoCollection { - Timeout operationTimeout = startTimeout(filesCollection.getTimeout(MILLISECONDS)); - return collectionWithTimeoutMono(filesCollection, operationTimeout) + Timeout timeout = startTimeout(filesCollection.getTimeout(MILLISECONDS)); + return collectionWithTimeoutMono(filesCollection, timeout) .flatMap(wrappedCollection -> { if (clientSession == null) { return Mono.from(wrappedCollection.drop()); } else { return Mono.from(wrappedCollection.drop(clientSession)); } - }).then(collectionWithTimeoutDeferred(chunksCollection, operationTimeout)) + }).then(collectionWithTimeoutDeferred(chunksCollection, timeout)) .flatMap(wrappedCollection -> { if (clientSession == null) { return Mono.from(wrappedCollection.drop()); diff --git a/driver-sync/src/main/com/mongodb/client/internal/CollectionInfoRetriever.java b/driver-sync/src/main/com/mongodb/client/internal/CollectionInfoRetriever.java index 9d02a1e8756..9ce34fd18a9 100644 --- a/driver-sync/src/main/com/mongodb/client/internal/CollectionInfoRetriever.java +++ b/driver-sync/src/main/com/mongodb/client/internal/CollectionInfoRetriever.java @@ -36,8 +36,8 @@ class CollectionInfoRetriever { this.client = notNull("client", client); } - public List filter(final String databaseName, final BsonDocument filter, @Nullable final Timeout operationTimeout) { - return databaseWithTimeout(client.getDatabase(databaseName), TIMEOUT_ERROR_MESSAGE, operationTimeout) + public List filter(final String databaseName, final BsonDocument filter, @Nullable final Timeout timeout) { + return databaseWithTimeout(client.getDatabase(databaseName), TIMEOUT_ERROR_MESSAGE, timeout) .listCollections(BsonDocument.class) .filter(filter) .into(new ArrayList<>()); diff --git a/driver-sync/src/main/com/mongodb/client/internal/CommandMarker.java b/driver-sync/src/main/com/mongodb/client/internal/CommandMarker.java index 73eed8efd01..d694cf682a3 100644 --- a/driver-sync/src/main/com/mongodb/client/internal/CommandMarker.java +++ b/driver-sync/src/main/com/mongodb/client/internal/CommandMarker.java @@ -84,11 +84,11 @@ class CommandMarker implements Closeable { } } - RawBsonDocument mark(final String databaseName, final RawBsonDocument command, @Nullable final Timeout operationTimeout) { + RawBsonDocument mark(final String databaseName, final RawBsonDocument command, @Nullable final Timeout timeout) { if (client != null) { try { try { - return executeCommand(databaseName, command, operationTimeout); + return executeCommand(databaseName, command, timeout); } catch (MongoOperationTimeoutException e){ throw e; } catch (MongoTimeoutException e) { @@ -96,7 +96,7 @@ RawBsonDocument mark(final String databaseName, final RawBsonDocument command, @ throw e; } startProcess(processBuilder); - return executeCommand(databaseName, command, operationTimeout); + return executeCommand(databaseName, command, timeout); } } catch (MongoException e) { throw wrapInClientException(e); @@ -113,14 +113,17 @@ public void close() { } } - private RawBsonDocument executeCommand(final String databaseName, final RawBsonDocument markableCommand, @Nullable final Timeout operationTimeout) { + private RawBsonDocument executeCommand( + final String databaseName, + final RawBsonDocument markableCommand, + @Nullable final Timeout timeout) { assertNotNull(client); MongoDatabase mongoDatabase = client.getDatabase(databaseName) .withReadConcern(ReadConcern.DEFAULT) .withReadPreference(ReadPreference.primary()); - return databaseWithTimeout(mongoDatabase, TIMEOUT_ERROR_MESSAGE, operationTimeout) + return databaseWithTimeout(mongoDatabase, TIMEOUT_ERROR_MESSAGE, timeout) .runCommand(markableCommand, RawBsonDocument.class); } diff --git a/driver-sync/src/main/com/mongodb/client/internal/Crypt.java b/driver-sync/src/main/com/mongodb/client/internal/Crypt.java index 15ba16e66da..ae7a75ae626 100644 --- a/driver-sync/src/main/com/mongodb/client/internal/Crypt.java +++ b/driver-sync/src/main/com/mongodb/client/internal/Crypt.java @@ -132,7 +132,10 @@ public class Crypt implements Closeable { * @param command the unencrypted command * @return the encrypted command */ - RawBsonDocument encrypt(final String databaseName, final RawBsonDocument command, @Nullable final Timeout timeoutOperation) { + RawBsonDocument encrypt( + final String databaseName, + final RawBsonDocument command, + @Nullable final Timeout timeout) { notNull("databaseName", databaseName); notNull("command", command); @@ -141,7 +144,7 @@ RawBsonDocument encrypt(final String databaseName, final RawBsonDocument command } try (MongoCryptContext encryptionContext = mongoCrypt.createEncryptionContext(databaseName, command)) { - return executeStateMachine(encryptionContext, databaseName, timeoutOperation); + return executeStateMachine(encryptionContext, databaseName, timeout); } catch (MongoCryptException e) { throw wrapInMongoException(e); } @@ -274,24 +277,27 @@ public void close() { } } - private RawBsonDocument executeStateMachine(final MongoCryptContext cryptContext, @Nullable final String databaseName, @Nullable final Timeout operationTimeout) { + private RawBsonDocument executeStateMachine( + final MongoCryptContext cryptContext, + @Nullable final String databaseName, + @Nullable final Timeout timeout) { while (true) { State state = cryptContext.getState(); switch (state) { case NEED_MONGO_COLLINFO: - collInfo(cryptContext, notNull("databaseName", databaseName), operationTimeout); + collInfo(cryptContext, notNull("databaseName", databaseName), timeout); break; case NEED_MONGO_MARKINGS: - mark(cryptContext, notNull("databaseName", databaseName), operationTimeout); + mark(cryptContext, notNull("databaseName", databaseName), timeout); break; case NEED_KMS_CREDENTIALS: fetchCredentials(cryptContext); break; case NEED_MONGO_KEYS: - fetchKeys(cryptContext, operationTimeout); + fetchKeys(cryptContext, timeout); break; case NEED_KMS: - decryptKeys(cryptContext, operationTimeout); + decryptKeys(cryptContext, timeout); break; case READY: return cryptContext.finish(); @@ -320,9 +326,9 @@ private void collInfo(final MongoCryptContext cryptContext, final String databas } } - private void mark(final MongoCryptContext cryptContext, final String databaseName, @Nullable final Timeout operationTimeout) { + private void mark(final MongoCryptContext cryptContext, final String databaseName, @Nullable final Timeout timeout) { try { - RawBsonDocument markedCommand = assertNotNull(commandMarker).mark(databaseName, cryptContext.getMongoOperation(), operationTimeout); + RawBsonDocument markedCommand = assertNotNull(commandMarker).mark(databaseName, cryptContext.getMongoOperation(), timeout); cryptContext.addMongoOperationResult(markedCommand); cryptContext.completeMongoOperation(); } catch (Throwable t) { diff --git a/driver-sync/src/main/com/mongodb/client/internal/CryptConnection.java b/driver-sync/src/main/com/mongodb/client/internal/CryptConnection.java index 803df89a6b6..b5c814edb04 100644 --- a/driver-sync/src/main/com/mongodb/client/internal/CryptConnection.java +++ b/driver-sync/src/main/com/mongodb/client/internal/CryptConnection.java @@ -112,9 +112,11 @@ public T command(final String database, final BsonDocument command, final Fi getEncoder(command).encode(writer, command, EncoderContext.builder().build()); - Timeout operationTimeout = operationContext.getTimeoutContext().getTimeout(); - RawBsonDocument encryptedCommand = crypt.encrypt(database, - new RawBsonDocument(bsonOutput.getInternalBuffer(), 0, bsonOutput.getSize()), operationTimeout); + Timeout timeout = operationContext.getTimeoutContext().getTimeout(); + RawBsonDocument encryptedCommand = crypt.encrypt( + database, + new RawBsonDocument(bsonOutput.getInternalBuffer(), 0, bsonOutput.getSize()), + timeout); RawBsonDocument encryptedResponse = wrapped.command(database, encryptedCommand, commandFieldNameValidator, readPreference, new RawBsonDocumentCodec(), operationContext, responseExpected, EmptyMessageSequences.INSTANCE); @@ -123,7 +125,7 @@ public T command(final String database, final BsonDocument command, final Fi return null; } - RawBsonDocument decryptedResponse = crypt.decrypt(encryptedResponse, operationTimeout); + RawBsonDocument decryptedResponse = crypt.decrypt(encryptedResponse, timeout); BsonBinaryReader reader = new BsonBinaryReader(decryptedResponse.getByteBuffer().asNIO()); From 489d6d93af8c2c24aada7fd38c18eb24cef4c740 Mon Sep 17 00:00:00 2001 From: Maxim Katcharov Date: Thu, 13 Mar 2025 15:57:45 -0600 Subject: [PATCH 02/36] Remove doWithResetTimeout --- .../com/mongodb/internal/TimeoutContext.java | 54 +++---------------- .../internal/async/SingleResultCallback.java | 2 + .../internal/connection/OperationContext.java | 8 ++- .../operation/AsyncCommandBatchCursor.java | 36 ++++++++----- .../operation/ChangeStreamOperation.java | 3 +- .../operation/CommandBatchCursor.java | 28 ++++++---- 6 files changed, 60 insertions(+), 71 deletions(-) diff --git a/driver-core/src/main/com/mongodb/internal/TimeoutContext.java b/driver-core/src/main/com/mongodb/internal/TimeoutContext.java index ba3b8eb0ac5..b4561e6fdc6 100644 --- a/driver-core/src/main/com/mongodb/internal/TimeoutContext.java +++ b/driver-core/src/main/com/mongodb/internal/TimeoutContext.java @@ -17,8 +17,6 @@ import com.mongodb.MongoClientException; import com.mongodb.MongoOperationTimeoutException; -import com.mongodb.internal.async.AsyncRunnable; -import com.mongodb.internal.async.SingleResultCallback; import com.mongodb.internal.connection.CommandMessage; import com.mongodb.internal.time.StartTime; import com.mongodb.internal.time.Timeout; @@ -26,17 +24,13 @@ import com.mongodb.session.ClientSession; import java.util.Objects; -import java.util.Optional; import java.util.function.LongConsumer; import static com.mongodb.assertions.Assertions.assertNotNull; import static com.mongodb.assertions.Assertions.assertNull; import static com.mongodb.assertions.Assertions.isTrue; import static com.mongodb.internal.VisibleForTesting.AccessModifier.PRIVATE; -import static com.mongodb.internal.async.AsyncRunnable.beginAsync; import static com.mongodb.internal.time.Timeout.ZeroSemantics.ZERO_DURATION_MEANS_INFINITE; -import static java.util.Optional.empty; -import static java.util.Optional.ofNullable; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.TimeUnit.NANOSECONDS; @@ -121,6 +115,12 @@ public TimeoutContext copyTimeoutContext() { return new TimeoutContext(getTimeoutSettings(), getTimeout()); } + public TimeoutContext withNewlyStartedTimeout() { + TimeoutContext newContext = copyTimeoutContext(); + newContext.timeout = startTimeout(newContext.timeoutSettings.getTimeoutMS()); + return newContext; + } + public TimeoutContext(final TimeoutSettings timeoutSettings) { this(false, timeoutSettings, startTimeout(timeoutSettings.getTimeoutMS())); } @@ -297,56 +297,18 @@ public int getConnectTimeoutMs() { /** * @see #hasTimeoutMS() - * @see #doWithResetTimeout(Runnable) - * @see #doWithResetTimeout(AsyncRunnable, SingleResultCallback) */ + @Deprecated // TODO-JAVA-5640 REMOVE method public void resetTimeoutIfPresent() { - getAndResetTimeoutIfPresent(); - } - - /** - * @see #hasTimeoutMS() - * @return A {@linkplain Optional#isPresent() non-empty} previous {@linkplain Timeout} iff {@link #hasTimeoutMS()}, - * i.e., iff it was reset. - */ - private Optional getAndResetTimeoutIfPresent() { - Timeout result = timeout; if (hasTimeoutMS()) { timeout = startTimeout(timeoutSettings.getTimeoutMS()); - return ofNullable(result); - } - return empty(); - } - - /** - * @see #resetTimeoutIfPresent() - */ - public void doWithResetTimeout(final Runnable action) { - Optional originalTimeout = getAndResetTimeoutIfPresent(); - try { - action.run(); - } finally { - originalTimeout.ifPresent(original -> timeout = original); } } - /** - * @see #resetTimeoutIfPresent() - */ - public void doWithResetTimeout(final AsyncRunnable action, final SingleResultCallback callback) { - beginAsync().thenRun(c -> { - Optional originalTimeout = getAndResetTimeoutIfPresent(); - beginAsync().thenRun(c2 -> { - action.finish(c2); - }).thenAlwaysRunAndFinish(() -> { - originalTimeout.ifPresent(original -> timeout = original); - }, c); - }).finish(callback); - } - /** * Resets the timeout if this timeout context is being used by pool maintenance */ + @Deprecated // TODO-JAVA-5640 REMOVE method public void resetMaintenanceTimeout() { if (!isMaintenanceContext) { return; diff --git a/driver-core/src/main/com/mongodb/internal/async/SingleResultCallback.java b/driver-core/src/main/com/mongodb/internal/async/SingleResultCallback.java index 632e453d0c0..de0771f4b57 100644 --- a/driver-core/src/main/com/mongodb/internal/async/SingleResultCallback.java +++ b/driver-core/src/main/com/mongodb/internal/async/SingleResultCallback.java @@ -29,6 +29,8 @@ *

This class is not part of the public API and may be removed or changed at any time

*/ public interface SingleResultCallback { + public static SingleResultCallback THEN_DO_NOTHING = (r, t) -> {}; + /** * Called when the function completes. This method must not complete abruptly, see {@link AsyncCallbackFunction} for more details. * diff --git a/driver-core/src/main/com/mongodb/internal/connection/OperationContext.java b/driver-core/src/main/com/mongodb/internal/connection/OperationContext.java index bf29ebc051b..5e6adeff530 100644 --- a/driver-core/src/main/com/mongodb/internal/connection/OperationContext.java +++ b/driver-core/src/main/com/mongodb/internal/connection/OperationContext.java @@ -101,8 +101,7 @@ public ServerApi getServerApi() { return serverApi; } - @VisibleForTesting(otherwise = VisibleForTesting.AccessModifier.PRIVATE) - public OperationContext(final long id, + private OperationContext(final long id, final RequestContext requestContext, final SessionContext sessionContext, final TimeoutContext timeoutContext, @@ -138,6 +137,11 @@ public ServerDeprioritization getServerDeprioritization() { return serverDeprioritization; } + public OperationContext withNewlyStartedTimeout() { + TimeoutContext tc = this.timeoutContext.withNewlyStartedTimeout(); + return this.withTimeoutContext(tc); + } + public static final class ServerDeprioritization { @Nullable private ServerAddress candidate; diff --git a/driver-core/src/main/com/mongodb/internal/operation/AsyncCommandBatchCursor.java b/driver-core/src/main/com/mongodb/internal/operation/AsyncCommandBatchCursor.java index 942721a27ad..a7052565aaf 100644 --- a/driver-core/src/main/com/mongodb/internal/operation/AsyncCommandBatchCursor.java +++ b/driver-core/src/main/com/mongodb/internal/operation/AsyncCommandBatchCursor.java @@ -53,6 +53,7 @@ import static com.mongodb.assertions.Assertions.assertTrue; import static com.mongodb.assertions.Assertions.doesNotThrow; import static com.mongodb.internal.async.AsyncRunnable.beginAsync; +import static com.mongodb.internal.async.SingleResultCallback.THEN_DO_NOTHING; import static com.mongodb.internal.operation.CommandBatchCursorHelper.FIRST_BATCH; import static com.mongodb.internal.operation.CommandBatchCursorHelper.MESSAGE_IF_CLOSED_AS_CURSOR; import static com.mongodb.internal.operation.CommandBatchCursorHelper.NEXT_BATCH; @@ -277,15 +278,14 @@ void markAsPinned(final AsyncConnection connectionToPin, final Connection.Pinnin void doClose() { TimeoutContext timeoutContext = operationContext.getTimeoutContext(); timeoutContext.resetToDefaultMaxTime(); - SingleResultCallback thenDoNothing = (r, t) -> {}; if (resetTimeoutWhenClosing) { - timeoutContext.doWithResetTimeout(this::releaseResourcesAsync, thenDoNothing); + releaseResourcesAsync(operationContext.withNewlyStartedTimeout(), THEN_DO_NOTHING); } else { - releaseResourcesAsync(thenDoNothing); + releaseResourcesAsync(operationContext, THEN_DO_NOTHING); } } - private void releaseResourcesAsync(final SingleResultCallback callback) { + private void releaseResourcesAsync(final OperationContext operationContext, final SingleResultCallback callback) { beginAsync().thenRunTryCatchAsyncBlocks(c -> { if (isSkipReleasingServerResourcesOnClose()) { unsetServerCursor(); @@ -295,7 +295,7 @@ private void releaseResourcesAsync(final SingleResultCallback callback) { getConnection(c2); }).thenConsume((connection, c3) -> { beginAsync().thenRun(c4 -> { - releaseServerResourcesAsync(connection, c4); + releaseServerResourcesAsync(connection, operationContext, c4); }).thenAlwaysRunAndFinish(() -> { connection.release(); }, c3); @@ -346,11 +346,12 @@ private void getConnection(final SingleResultCallback callback) } } - private void releaseServerResourcesAsync(final AsyncConnection connection, final SingleResultCallback callback) { + private void releaseServerResourcesAsync(final AsyncConnection connection, final OperationContext operationContext, + final SingleResultCallback callback) { beginAsync().thenRun((c) -> { ServerCursor localServerCursor = super.getServerCursor(); if (localServerCursor != null) { - killServerCursorAsync(getNamespace(), localServerCursor, connection, callback); + killServerCursorAsync(getNamespace(), localServerCursor, connection, operationContext, callback); } else { c.complete(c); } @@ -359,11 +360,22 @@ private void releaseServerResourcesAsync(final AsyncConnection connection, final }, callback); } - private void killServerCursorAsync(final MongoNamespace namespace, final ServerCursor localServerCursor, - final AsyncConnection localConnection, final SingleResultCallback callback) { - localConnection.commandAsync(namespace.getDatabaseName(), getKillCursorsCommand(namespace, localServerCursor), - NoOpFieldNameValidator.INSTANCE, ReadPreference.primary(), new BsonDocumentCodec(), - operationContext, (r, t) -> callback.onResult(null, null)); + private void killServerCursorAsync( + final MongoNamespace namespace, + final ServerCursor localServerCursor, + final AsyncConnection localConnection, + final OperationContext operationContext, + final SingleResultCallback callback) { + beginAsync().thenRun(c -> { + localConnection.commandAsync( + namespace.getDatabaseName(), + getKillCursorsCommand(namespace, localServerCursor), + NoOpFieldNameValidator.INSTANCE, + ReadPreference.primary(), + new BsonDocumentCodec(), + operationContext, + (r, t) -> c.complete(c)); + }).finish(callback); } } } diff --git a/driver-core/src/main/com/mongodb/internal/operation/ChangeStreamOperation.java b/driver-core/src/main/com/mongodb/internal/operation/ChangeStreamOperation.java index 4ef28c796cb..c648bbe1813 100644 --- a/driver-core/src/main/com/mongodb/internal/operation/ChangeStreamOperation.java +++ b/driver-core/src/main/com/mongodb/internal/operation/ChangeStreamOperation.java @@ -22,6 +22,7 @@ import com.mongodb.client.model.changestream.FullDocument; import com.mongodb.client.model.changestream.FullDocumentBeforeChange; import com.mongodb.internal.TimeoutContext; +import com.mongodb.internal.VisibleForTesting; import com.mongodb.internal.async.AsyncBatchCursor; import com.mongodb.internal.async.SingleResultCallback; import com.mongodb.internal.binding.AsyncReadBinding; @@ -64,7 +65,7 @@ public class ChangeStreamOperation implements AsyncReadOperation pipeline, final Decoder decoder) { this(namespace, fullDocument, fullDocumentBeforeChange, pipeline, decoder, ChangeStreamLevel.COLLECTION); diff --git a/driver-core/src/main/com/mongodb/internal/operation/CommandBatchCursor.java b/driver-core/src/main/com/mongodb/internal/operation/CommandBatchCursor.java index d201976e5ed..528e6827bb5 100644 --- a/driver-core/src/main/com/mongodb/internal/operation/CommandBatchCursor.java +++ b/driver-core/src/main/com/mongodb/internal/operation/CommandBatchCursor.java @@ -317,13 +317,13 @@ void doClose() { TimeoutContext timeoutContext = operationContext.getTimeoutContext(); timeoutContext.resetToDefaultMaxTime(); if (resetTimeoutWhenClosing) { - timeoutContext.doWithResetTimeout(this::releaseResources); + releaseResources(operationContext.withNewlyStartedTimeout()); } else { - releaseResources(); + releaseResources(operationContext); } } - private void releaseResources() { + private void releaseResources(final OperationContext operationContext) { try { if (isSkipReleasingServerResourcesOnClose()) { unsetServerCursor(); @@ -331,7 +331,7 @@ private void releaseResources() { if (super.getServerCursor() != null) { Connection connection = getConnection(); try { - releaseServerResources(connection); + releaseServerResources(connection, operationContext); } finally { connection.release(); } @@ -373,21 +373,29 @@ private Connection getConnection() { } } - private void releaseServerResources(final Connection connection) { + private void releaseServerResources(final Connection connection, final OperationContext operationContext) { try { ServerCursor localServerCursor = super.getServerCursor(); if (localServerCursor != null) { - killServerCursor(getNamespace(), localServerCursor, connection); + killServerCursor(getNamespace(), localServerCursor, connection, operationContext); } } finally { unsetServerCursor(); } } - private void killServerCursor(final MongoNamespace namespace, final ServerCursor localServerCursor, - final Connection localConnection) { - localConnection.command(namespace.getDatabaseName(), getKillCursorsCommand(namespace, localServerCursor), - NoOpFieldNameValidator.INSTANCE, ReadPreference.primary(), new BsonDocumentCodec(), operationContext); + private void killServerCursor( + final MongoNamespace namespace, + final ServerCursor localServerCursor, + final Connection localConnection, + final OperationContext operationContext) { + localConnection.command( + namespace.getDatabaseName(), + getKillCursorsCommand(namespace, localServerCursor), + NoOpFieldNameValidator.INSTANCE, + ReadPreference.primary(), + new BsonDocumentCodec(), + operationContext); } } } From fedc7643b324febb71f1bc8cdf0d0759406d7e95 Mon Sep 17 00:00:00 2001 From: Maxim Katcharov Date: Fri, 14 Mar 2025 16:37:37 -0600 Subject: [PATCH 03/36] Remove resetTimeoutIfPresent from CommandBatchCursor --- .../internal/operation/AsyncCommandBatchCursor.java | 11 ++++++----- .../internal/operation/CommandBatchCursor.java | 13 +++++++------ 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/driver-core/src/main/com/mongodb/internal/operation/AsyncCommandBatchCursor.java b/driver-core/src/main/com/mongodb/internal/operation/AsyncCommandBatchCursor.java index a7052565aaf..a391458ce6f 100644 --- a/driver-core/src/main/com/mongodb/internal/operation/AsyncCommandBatchCursor.java +++ b/driver-core/src/main/com/mongodb/internal/operation/AsyncCommandBatchCursor.java @@ -72,8 +72,8 @@ class AsyncCommandBatchCursor implements AsyncAggregateResponseBatchCursor private final int maxWireVersion; private final boolean firstBatchEmpty; private final ResourceManager resourceManager; - private final OperationContext operationContext; private final TimeoutMode timeoutMode; + private OperationContext operationContext; private final AtomicBoolean processedInitial = new AtomicBoolean(); private int batchSize; private volatile CommandCursorResult commandCursorResult; @@ -95,10 +95,10 @@ class AsyncCommandBatchCursor implements AsyncAggregateResponseBatchCursor this.comment = comment; this.maxWireVersion = connectionDescription.getMaxWireVersion(); this.firstBatchEmpty = commandCursorResult.getResults().isEmpty(); - operationContext = connectionSource.getOperationContext(); this.timeoutMode = timeoutMode; - operationContext.getTimeoutContext().setMaxTimeOverride(maxTimeMS); + operationContext = connectionSource.getOperationContext(); + operationContext.getTimeoutContext().setMaxTimeOverride(maxTimeMS); // TODO-JAVA-5640 with? AsyncConnection connectionToPin = connectionSource.getServerDescription().getType() == ServerType.LOAD_BALANCER ? connection : null; @@ -176,7 +176,7 @@ public int getMaxWireVersion() { void checkTimeoutModeAndResetTimeoutContextIfIteration() { if (timeoutMode == TimeoutMode.ITERATION) { - operationContext.getTimeoutContext().resetTimeoutIfPresent(); + operationContext = operationContext.withNewlyStartedTimeout(); } } @@ -230,7 +230,8 @@ private CommandCursorResult toCommandCursorResult(final ServerAddress serverA /** * Configures the cursor to {@link #close()} - * without {@linkplain TimeoutContext#resetTimeoutIfPresent() resetting} its {@linkplain TimeoutContext#getTimeout() timeout}. + * without {@linkplain TimeoutContext#withNewlyStartedTimeout() starting a new} + * {@linkplain TimeoutContext#getTimeout() timeout}. * This is useful when managing the {@link #close()} behavior externally. */ AsyncCommandBatchCursor disableTimeoutResetWhenClosing() { diff --git a/driver-core/src/main/com/mongodb/internal/operation/CommandBatchCursor.java b/driver-core/src/main/com/mongodb/internal/operation/CommandBatchCursor.java index 528e6827bb5..2a23f9d0711 100644 --- a/driver-core/src/main/com/mongodb/internal/operation/CommandBatchCursor.java +++ b/driver-core/src/main/com/mongodb/internal/operation/CommandBatchCursor.java @@ -67,8 +67,8 @@ class CommandBatchCursor implements AggregateResponseBatchCursor { private final int maxWireVersion; private final boolean firstBatchEmpty; private final ResourceManager resourceManager; - private final OperationContext operationContext; private final TimeoutMode timeoutMode; + private OperationContext operationContext; private int batchSize; private CommandCursorResult commandCursorResult; @@ -92,10 +92,10 @@ class CommandBatchCursor implements AggregateResponseBatchCursor { this.comment = comment; this.maxWireVersion = connectionDescription.getMaxWireVersion(); this.firstBatchEmpty = commandCursorResult.getResults().isEmpty(); - operationContext = connectionSource.getOperationContext(); this.timeoutMode = timeoutMode; - operationContext.getTimeoutContext().setMaxTimeOverride(maxTimeMS); + operationContext = connectionSource.getOperationContext(); + operationContext.getTimeoutContext().setMaxTimeOverride(maxTimeMS); // TODO-JAVA-5640 with? Connection connectionToPin = connectionSource.getServerDescription().getType() == ServerType.LOAD_BALANCER ? connection : null; resourceManager = new ResourceManager(namespace, connectionSource, connectionToPin, commandCursorResult.getServerCursor()); @@ -235,7 +235,7 @@ public int getMaxWireVersion() { void checkTimeoutModeAndResetTimeoutContextIfIteration() { if (timeoutMode == TimeoutMode.ITERATION) { - operationContext.getTimeoutContext().resetTimeoutIfPresent(); + operationContext = operationContext.withNewlyStartedTimeout(); } } @@ -271,7 +271,8 @@ private CommandCursorResult toCommandCursorResult(final ServerAddress serverA /** * Configures the cursor to {@link #close()} - * without {@linkplain TimeoutContext#resetTimeoutIfPresent() resetting} its {@linkplain TimeoutContext#getTimeout() timeout}. + * without {@linkplain TimeoutContext#withNewlyStartedTimeout() starting a new} + * {@linkplain TimeoutContext#getTimeout() timeout}. * This is useful when managing the {@link #close()} behavior externally. */ CommandBatchCursor disableTimeoutResetWhenClosing() { @@ -316,7 +317,7 @@ void markAsPinned(final Connection connectionToPin, final Connection.PinningMode void doClose() { TimeoutContext timeoutContext = operationContext.getTimeoutContext(); timeoutContext.resetToDefaultMaxTime(); - if (resetTimeoutWhenClosing) { + if (resetTimeoutWhenClosing) { // TODO-JAVA-5640 don't we always reset when closing? releaseResources(operationContext.withNewlyStartedTimeout()); } else { releaseResources(operationContext); From 3a81c6120f254fba6a79f04abe0c4eace58a114a Mon Sep 17 00:00:00 2001 From: Maxim Katcharov Date: Fri, 14 Mar 2025 16:49:48 -0600 Subject: [PATCH 04/36] Remove Timeout from RetryState --- .../internal/async/function/RetryState.java | 21 ++++++++----------- .../operation/CommandOperationHelper.java | 5 ++++- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/driver-core/src/main/com/mongodb/internal/async/function/RetryState.java b/driver-core/src/main/com/mongodb/internal/async/function/RetryState.java index e1cecf721fc..5c9f756a94d 100644 --- a/driver-core/src/main/com/mongodb/internal/async/function/RetryState.java +++ b/driver-core/src/main/com/mongodb/internal/async/function/RetryState.java @@ -47,7 +47,7 @@ @NotThreadSafe public final class RetryState { public static final int RETRIES = 1; - private static final int INFINITE_ATTEMPTS = Integer.MAX_VALUE; + public static final int INFINITE_ATTEMPTS = Integer.MAX_VALUE; private final LoopState loopState; private final int attempts; @@ -67,19 +67,16 @@ public final class RetryState { *

* * @param retries A positive number of allowed retries. {@link Integer#MAX_VALUE} is a special value interpreted as being unlimited. - * @param timeoutContext A timeout context that will be used to determine if the operation has timed out. + * @param retryUntilTimeoutThrowsException // TODO-JAVA-5640 shouldn't a timeout always stop retries? * @see #attempts() */ - public static RetryState withRetryableState(final int retries, final TimeoutContext timeoutContext) { + public static RetryState withRetryableState(final int retries, final boolean retryUntilTimeoutThrowsException) { assertTrue(retries > 0); - if (timeoutContext.hasTimeoutMS()){ - return new RetryState(INFINITE_ATTEMPTS, timeoutContext); - } - return new RetryState(retries, null); + return new RetryState(retries, retryUntilTimeoutThrowsException); } public static RetryState withNonRetryableState() { - return new RetryState(0, null); + return new RetryState(0, false); } /** @@ -94,19 +91,19 @@ public static RetryState withNonRetryableState() { * @see #attempts() */ public RetryState(final TimeoutContext timeoutContext) { - this(INFINITE_ATTEMPTS, timeoutContext); + this(INFINITE_ATTEMPTS, timeoutContext.hasTimeoutMS()); } /** * @param retries A non-negative number of allowed retries. {@link Integer#MAX_VALUE} is a special value interpreted as being unlimited. - * @param timeoutContext A timeout context that will be used to determine if the operation has timed out. + * @param retryUntilTimeoutThrowsException * @see #attempts() */ - private RetryState(final int retries, @Nullable final TimeoutContext timeoutContext) { + private RetryState(final int retries, final boolean retryUntilTimeoutThrowsException) { assertTrue(retries >= 0); loopState = new LoopState(); attempts = retries == INFINITE_ATTEMPTS ? INFINITE_ATTEMPTS : retries + 1; - this.retryUntilTimeoutThrowsException = timeoutContext != null && timeoutContext.hasTimeoutMS(); + this.retryUntilTimeoutThrowsException = retryUntilTimeoutThrowsException; } /** diff --git a/driver-core/src/main/com/mongodb/internal/operation/CommandOperationHelper.java b/driver-core/src/main/com/mongodb/internal/operation/CommandOperationHelper.java index db6870f52e8..8332ad916fb 100644 --- a/driver-core/src/main/com/mongodb/internal/operation/CommandOperationHelper.java +++ b/driver-core/src/main/com/mongodb/internal/operation/CommandOperationHelper.java @@ -45,6 +45,7 @@ import static com.mongodb.assertions.Assertions.assertFalse; import static com.mongodb.assertions.Assertions.assertNotNull; +import static com.mongodb.internal.async.function.RetryState.INFINITE_ATTEMPTS; import static com.mongodb.internal.operation.OperationHelper.LOGGER; import static java.lang.String.format; import static java.util.Arrays.asList; @@ -122,7 +123,9 @@ private static Throwable chooseRetryableWriteException( static RetryState initialRetryState(final boolean retry, final TimeoutContext timeoutContext) { if (retry) { - return RetryState.withRetryableState(RetryState.RETRIES, timeoutContext); + boolean retryUntilTimeoutThrowsException = timeoutContext.hasTimeoutMS(); + int retries = retryUntilTimeoutThrowsException ? INFINITE_ATTEMPTS : RetryState.RETRIES; + return RetryState.withRetryableState(retries, retryUntilTimeoutThrowsException); } return RetryState.withNonRetryableState(); } From f650d436cb8b872383e980870b41d6cf59b2f986 Mon Sep 17 00:00:00 2001 From: Nabil Hachicha Date: Tue, 29 Apr 2025 14:30:04 +0100 Subject: [PATCH 05/36] Add tracing support using Micrometer --- driver-core/build.gradle.kts | 1 + .../main/com/mongodb/MongoClientSettings.java | 31 ++++++ .../internal/connection/CommandMessage.java | 4 + .../connection/InternalStreamConnection.java | 51 +++++++++ .../internal/connection/OperationContext.java | 57 ++++++---- .../operation/CommandBatchCursor.java | 7 +- .../internal/operation/FindOperation.java | 40 +++++-- .../internal/session/ServerSessionPool.java | 3 +- .../com/mongodb/internal/tracing/Span.java | 52 +++++++++ .../internal/tracing/TraceContext.java | 23 ++++ .../internal/tracing/TracingManager.java | 80 ++++++++++++++ .../internal/tracing/package-info.java | 23 ++++ .../com/mongodb/tracing/MicrometerTracer.java | 102 ++++++++++++++++++ .../src/main/com/mongodb/tracing/Tracer.java | 53 +++++++++ .../com/mongodb/tracing/package-info.java | 23 ++++ .../com/mongodb/ClusterFixture.java | 1 + driver-core/src/test/resources/specifications | 2 +- .../connection/CommandHelperTest.java | 4 +- .../connection/CommandMessageTest.java | 3 +- .../src/main/com/mongodb/MongoClient.java | 1 + .../internal/OperationExecutorImpl.java | 2 + .../client/internal/MongoClientImpl.java | 3 +- .../client/internal/MongoClusterImpl.java | 17 +-- gradle/libs.versions.toml | 2 + 24 files changed, 546 insertions(+), 39 deletions(-) create mode 100644 driver-core/src/main/com/mongodb/internal/tracing/Span.java create mode 100644 driver-core/src/main/com/mongodb/internal/tracing/TraceContext.java create mode 100644 driver-core/src/main/com/mongodb/internal/tracing/TracingManager.java create mode 100644 driver-core/src/main/com/mongodb/internal/tracing/package-info.java create mode 100644 driver-core/src/main/com/mongodb/tracing/MicrometerTracer.java create mode 100644 driver-core/src/main/com/mongodb/tracing/Tracer.java create mode 100644 driver-core/src/main/com/mongodb/tracing/package-info.java diff --git a/driver-core/build.gradle.kts b/driver-core/build.gradle.kts index 4f06805a6ea..7e260b18d23 100644 --- a/driver-core/build.gradle.kts +++ b/driver-core/build.gradle.kts @@ -54,6 +54,7 @@ dependencies { optionalImplementation(libs.snappy.java) optionalImplementation(libs.zstd.jni) + optionalImplementation(libs.micrometer) testImplementation(project(path = ":bson", configuration = "testArtifacts")) testImplementation(libs.reflections) diff --git a/driver-core/src/main/com/mongodb/MongoClientSettings.java b/driver-core/src/main/com/mongodb/MongoClientSettings.java index 31206e56029..642682d1b3a 100644 --- a/driver-core/src/main/com/mongodb/MongoClientSettings.java +++ b/driver-core/src/main/com/mongodb/MongoClientSettings.java @@ -30,9 +30,11 @@ import com.mongodb.connection.SslSettings; import com.mongodb.connection.TransportSettings; import com.mongodb.event.CommandListener; +import com.mongodb.internal.tracing.TracingManager; import com.mongodb.lang.Nullable; import com.mongodb.spi.dns.DnsClient; import com.mongodb.spi.dns.InetAddressResolver; +import com.mongodb.tracing.Tracer; import org.bson.UuidRepresentation; import org.bson.codecs.BsonCodecProvider; import org.bson.codecs.BsonValueCodecProvider; @@ -118,6 +120,7 @@ public final class MongoClientSettings { private final InetAddressResolver inetAddressResolver; @Nullable private final Long timeoutMS; + private final TracingManager tracingManager; /** * Gets the default codec registry. It includes the following providers: @@ -238,6 +241,7 @@ public static final class Builder { private ContextProvider contextProvider; private DnsClient dnsClient; private InetAddressResolver inetAddressResolver; + private TracingManager tracingManager; private Builder() { } @@ -275,6 +279,7 @@ private Builder(final MongoClientSettings settings) { if (settings.heartbeatSocketTimeoutSetExplicitly) { heartbeatSocketTimeoutMS = settings.heartbeatSocketSettings.getReadTimeout(MILLISECONDS); } + tracingManager = settings.tracingManager; } /** @@ -723,6 +728,20 @@ Builder heartbeatSocketTimeoutMS(final int heartbeatSocketTimeoutMS) { return this; } + /** + * Sets the tracer to use for creating Spans for operations and commands. + * + * @param tracer the tracer + * @see com.mongodb.tracing.MicrometerTracer + * @return this + * @since 5.5 + */ + @Alpha(Reason.CLIENT) + public Builder tracer(final Tracer tracer) { + this.tracingManager = new TracingManager(tracer); + return this; + } + /** * Build an instance of {@code MongoClientSettings}. * @@ -1040,6 +1059,17 @@ public ContextProvider getContextProvider() { return contextProvider; } + /** + * Get the tracer to create Spans for operations and commands. + * + * @return this + * @since 5.5 + */ + @Alpha(Reason.CLIENT) + public TracingManager getTracingManager() { + return tracingManager; + } + @Override public boolean equals(final Object o) { if (this == o) { @@ -1156,5 +1186,6 @@ private MongoClientSettings(final Builder builder) { heartbeatConnectTimeoutSetExplicitly = builder.heartbeatConnectTimeoutMS != 0; contextProvider = builder.contextProvider; timeoutMS = builder.timeoutMS; + tracingManager = builder.tracingManager; } } diff --git a/driver-core/src/main/com/mongodb/internal/connection/CommandMessage.java b/driver-core/src/main/com/mongodb/internal/connection/CommandMessage.java index 12543e92ccb..0660938e4f2 100644 --- a/driver-core/src/main/com/mongodb/internal/connection/CommandMessage.java +++ b/driver-core/src/main/com/mongodb/internal/connection/CommandMessage.java @@ -186,6 +186,10 @@ BsonDocument getCommandDocument(final ByteBufferBsonOutput bsonOutput) { } } + BsonDocument getCommand() { + return command; + } + /** * Get the field name from a buffer positioned at the start of the document sequence identifier of an OP_MSG Section of type * `PAYLOAD_TYPE_1_DOCUMENT_SEQUENCE`. diff --git a/driver-core/src/main/com/mongodb/internal/connection/InternalStreamConnection.java b/driver-core/src/main/com/mongodb/internal/connection/InternalStreamConnection.java index bf009aa1b07..e477239e6dc 100644 --- a/driver-core/src/main/com/mongodb/internal/connection/InternalStreamConnection.java +++ b/driver-core/src/main/com/mongodb/internal/connection/InternalStreamConnection.java @@ -51,6 +51,9 @@ import com.mongodb.internal.logging.StructuredLogger; import com.mongodb.internal.session.SessionContext; import com.mongodb.internal.time.Timeout; +import com.mongodb.internal.tracing.Span; +import com.mongodb.internal.tracing.TraceContext; +import com.mongodb.internal.tracing.TracingManager; import com.mongodb.lang.Nullable; import org.bson.BsonBinaryReader; import org.bson.BsonDocument; @@ -374,13 +377,24 @@ public boolean isClosed() { public T sendAndReceive(final CommandMessage message, final Decoder decoder, final OperationContext operationContext) { Supplier sendAndReceiveInternal = () -> sendAndReceiveInternal( message, decoder, operationContext); + + Span tracingSpan = createTracingSpan(message, operationContext); + try { return sendAndReceiveInternal.get(); } catch (MongoCommandException e) { + if (tracingSpan != null) { + tracingSpan.error(e); + } + if (reauthenticationIsTriggered(e)) { return reauthenticateAndRetry(sendAndReceiveInternal, operationContext); } throw e; + } finally { + if (tracingSpan != null) { + tracingSpan.end(); + } } } @@ -391,6 +405,7 @@ public void sendAndReceiveAsync(final CommandMessage message, final Decoder< AsyncSupplier sendAndReceiveAsyncInternal = c -> sendAndReceiveAsyncInternal( message, decoder, operationContext, c); + beginAsync().thenSupply(c -> { sendAndReceiveAsyncInternal.getAsync(c); }).onErrorIf(e -> reauthenticationIsTriggered(e), (t, c) -> { @@ -872,6 +887,42 @@ public ByteBuf getBuffer(final int size) { return stream.getBuffer(size); } + @Nullable + private Span createTracingSpan(final CommandMessage message, final OperationContext operationContext) { + TracingManager tracingManager = operationContext.getTracingManager(); + Span span; + if (tracingManager.isEnabled()) { + BsonDocument command = message.getCommand(); + TraceContext parentContext = null; + long cursorId = -1; + if (command.containsKey("getMore")) { + cursorId = command.getInt64("getMore").longValue(); + parentContext = tracingManager.getCursorParentContext(cursorId); + } else { + parentContext = tracingManager.getParentContext(operationContext.getId()); + } + + span = tracingManager.addSpan("Command " + command.getFirstKey(), parentContext); + span.tag("db.system", "mongodb"); + span.tag("db.namespace", message.getNamespace().getFullName()); + span.tag("db.query.summary", command.getFirstKey()); + span.tag("db.query.opcode", String.valueOf(message.getOpCode())); + span.tag("db.query.text", command.toString()); + if (cursorId != -1) { + span.tag("db.mongodb.cursor_id", String.valueOf(cursorId)); + } + span.tag("server.address", serverId.getAddress().getHost()); + span.tag("server.port", String.valueOf(serverId.getAddress().getPort())); + span.tag("server.type", message.getSettings().getServerType().name()); + + span.tag("db.mongodb.server_connection_id", this.description.getConnectionId().toString()); + } else { + span = null; + } + + return span; + } + private class MessageHeaderCallback implements SingleResultCallback { private final OperationContext operationContext; private final SingleResultCallback callback; diff --git a/driver-core/src/main/com/mongodb/internal/connection/OperationContext.java b/driver-core/src/main/com/mongodb/internal/connection/OperationContext.java index 7e0de92da1d..c74f4116a3f 100644 --- a/driver-core/src/main/com/mongodb/internal/connection/OperationContext.java +++ b/driver-core/src/main/com/mongodb/internal/connection/OperationContext.java @@ -27,6 +27,7 @@ import com.mongodb.internal.TimeoutSettings; import com.mongodb.internal.VisibleForTesting; import com.mongodb.internal.session.SessionContext; +import com.mongodb.internal.tracing.TracingManager; import com.mongodb.lang.Nullable; import com.mongodb.selector.ServerSelector; @@ -47,6 +48,7 @@ public class OperationContext { private final SessionContext sessionContext; private final RequestContext requestContext; private final TimeoutContext timeoutContext; + private final TracingManager tracingManager; @Nullable private final ServerApi serverApi; @Nullable @@ -54,12 +56,17 @@ public class OperationContext { public OperationContext(final RequestContext requestContext, final SessionContext sessionContext, final TimeoutContext timeoutContext, @Nullable final ServerApi serverApi) { - this(requestContext, sessionContext, timeoutContext, serverApi, null); + this(requestContext, sessionContext, timeoutContext, TracingManager.NO_OP, serverApi, null); } public OperationContext(final RequestContext requestContext, final SessionContext sessionContext, final TimeoutContext timeoutContext, - @Nullable final ServerApi serverApi, @Nullable final String operationName) { - this(NEXT_ID.incrementAndGet(), requestContext, sessionContext, timeoutContext, new ServerDeprioritization(), serverApi, operationName); + final TracingManager tracingManager, + @Nullable final ServerApi serverApi, + @Nullable final String operationName) { + this(NEXT_ID.incrementAndGet(), requestContext, sessionContext, timeoutContext, new ServerDeprioritization(), + tracingManager, + serverApi, + operationName); } public static OperationContext simpleOperationContext( @@ -68,8 +75,10 @@ public static OperationContext simpleOperationContext( IgnorableRequestContext.INSTANCE, NoOpSessionContext.INSTANCE, new TimeoutContext(timeoutSettings), + TracingManager.NO_OP, serverApi, - null); + null + ); } public static OperationContext simpleOperationContext(final TimeoutContext timeoutContext) { @@ -77,26 +86,34 @@ public static OperationContext simpleOperationContext(final TimeoutContext timeo IgnorableRequestContext.INSTANCE, NoOpSessionContext.INSTANCE, timeoutContext, + TracingManager.NO_OP, null, null); } public OperationContext withSessionContext(final SessionContext sessionContext) { - return new OperationContext(id, requestContext, sessionContext, timeoutContext, serverDeprioritization, serverApi, operationName); + return new OperationContext(id, requestContext, sessionContext, timeoutContext, serverDeprioritization, tracingManager, serverApi, + operationName); } public OperationContext withTimeoutContext(final TimeoutContext timeoutContext) { - return new OperationContext(id, requestContext, sessionContext, timeoutContext, serverDeprioritization, serverApi, operationName); + return new OperationContext(id, requestContext, sessionContext, timeoutContext, serverDeprioritization, tracingManager, serverApi, + operationName); } public OperationContext withOperationName(final String operationName) { - return new OperationContext(id, requestContext, sessionContext, timeoutContext, serverDeprioritization, serverApi, operationName); + return new OperationContext(id, requestContext, sessionContext, timeoutContext, serverDeprioritization, tracingManager, serverApi, + operationName); } public long getId() { return id; } + public TracingManager getTracingManager() { + return tracingManager; + } + public SessionContext getSessionContext() { return sessionContext; } @@ -121,33 +138,37 @@ public String getOperationName() { @VisibleForTesting(otherwise = VisibleForTesting.AccessModifier.PRIVATE) public OperationContext(final long id, - final RequestContext requestContext, - final SessionContext sessionContext, - final TimeoutContext timeoutContext, - final ServerDeprioritization serverDeprioritization, - @Nullable final ServerApi serverApi, - @Nullable final String operationName) { + final RequestContext requestContext, + final SessionContext sessionContext, + final TimeoutContext timeoutContext, + final ServerDeprioritization serverDeprioritization, + final TracingManager tracingManager, + @Nullable final ServerApi serverApi, + @Nullable final String operationName) { this.id = id; this.serverDeprioritization = serverDeprioritization; this.requestContext = requestContext; this.sessionContext = sessionContext; this.timeoutContext = timeoutContext; + this.tracingManager = tracingManager; this.serverApi = serverApi; this.operationName = operationName; } @VisibleForTesting(otherwise = VisibleForTesting.AccessModifier.PRIVATE) public OperationContext(final long id, - final RequestContext requestContext, - final SessionContext sessionContext, - final TimeoutContext timeoutContext, - @Nullable final ServerApi serverApi, - @Nullable final String operationName) { + final RequestContext requestContext, + final SessionContext sessionContext, + final TimeoutContext timeoutContext, + final TracingManager tracingManager, + @Nullable final ServerApi serverApi, + @Nullable final String operationName) { this.id = id; this.serverDeprioritization = new ServerDeprioritization(); this.requestContext = requestContext; this.sessionContext = sessionContext; this.timeoutContext = timeoutContext; + this.tracingManager = tracingManager; this.serverApi = serverApi; this.operationName = operationName; } diff --git a/driver-core/src/main/com/mongodb/internal/operation/CommandBatchCursor.java b/driver-core/src/main/com/mongodb/internal/operation/CommandBatchCursor.java index d201976e5ed..a061abafbe9 100644 --- a/driver-core/src/main/com/mongodb/internal/operation/CommandBatchCursor.java +++ b/driver-core/src/main/com/mongodb/internal/operation/CommandBatchCursor.java @@ -75,6 +75,7 @@ class CommandBatchCursor implements AggregateResponseBatchCursor { @Nullable private List nextBatch; private boolean resetTimeoutWhenClosing; + private final long cursorId; CommandBatchCursor( final TimeoutMode timeoutMode, @@ -95,10 +96,13 @@ class CommandBatchCursor implements AggregateResponseBatchCursor { operationContext = connectionSource.getOperationContext(); this.timeoutMode = timeoutMode; + ServerCursor serverCursor = commandCursorResult.getServerCursor(); + this.cursorId = serverCursor != null ? serverCursor.getId() : -1; + operationContext.getTimeoutContext().setMaxTimeOverride(maxTimeMS); Connection connectionToPin = connectionSource.getServerDescription().getType() == ServerType.LOAD_BALANCER ? connection : null; - resourceManager = new ResourceManager(namespace, connectionSource, connectionToPin, commandCursorResult.getServerCursor()); + resourceManager = new ResourceManager(namespace, connectionSource, connectionToPin, serverCursor); resetTimeoutWhenClosing = true; } @@ -169,6 +173,7 @@ public void remove() { @Override public void close() { + operationContext.getTracingManager().removeCursorParentContext(cursorId); resourceManager.close(); } diff --git a/driver-core/src/main/com/mongodb/internal/operation/FindOperation.java b/driver-core/src/main/com/mongodb/internal/operation/FindOperation.java index ab37613db13..9d21f41d876 100644 --- a/driver-core/src/main/com/mongodb/internal/operation/FindOperation.java +++ b/driver-core/src/main/com/mongodb/internal/operation/FindOperation.java @@ -30,6 +30,8 @@ import com.mongodb.internal.binding.AsyncReadBinding; import com.mongodb.internal.binding.ReadBinding; import com.mongodb.internal.connection.OperationContext; +import com.mongodb.internal.tracing.Span; +import com.mongodb.internal.tracing.TracingManager; import com.mongodb.lang.Nullable; import org.bson.BsonBoolean; import org.bson.BsonDocument; @@ -296,13 +298,18 @@ public BatchCursor execute(final ReadBinding binding) { if (invalidTimeoutModeException != null) { throw invalidTimeoutModeException; } + OperationContext operationContext = binding.getOperationContext(); - RetryState retryState = initialRetryState(retryReads, binding.getOperationContext().getTimeoutContext()); - Supplier> read = decorateReadWithRetries(retryState, binding.getOperationContext(), () -> + // Adds a Tracing Span for 'find' operation + TracingManager tracingManager = operationContext.getTracingManager(); + Span tracingSpan = tracingManager.addSpan("find", operationContext.getId()); + + RetryState retryState = initialRetryState(retryReads, operationContext.getTimeoutContext()); + Supplier> read = decorateReadWithRetries(retryState, operationContext, () -> withSourceAndConnection(binding::getReadConnectionSource, false, (source, connection) -> { - retryState.breakAndThrowIfRetryAnd(() -> !canRetryRead(source.getServerDescription(), binding.getOperationContext())); + retryState.breakAndThrowIfRetryAnd(() -> !canRetryRead(source.getServerDescription(), operationContext)); try { - return createReadCommandAndExecute(retryState, binding.getOperationContext(), source, namespace.getDatabaseName(), + return createReadCommandAndExecute(retryState, operationContext, source, namespace.getDatabaseName(), getCommandCreator(), CommandResultDocumentCodec.create(decoder, FIRST_BATCH), transformer(), connection); } catch (MongoCommandException e) { @@ -310,7 +317,16 @@ public BatchCursor execute(final ReadBinding binding) { } }) ); - return read.get(); + try { + return read.get(); + } catch (MongoQueryException e) { + tracingSpan.error(e); + throw e; + } finally { + tracingSpan.end(); + // Clean up the tracing span after the operation is complete + tracingManager.cleanContexts(operationContext.getId()); + } } @Override @@ -473,9 +489,17 @@ private TimeoutMode getTimeoutMode() { } private CommandReadTransformer> transformer() { - return (result, source, connection) -> - new CommandBatchCursor<>(getTimeoutMode(), result, batchSize, getMaxTimeForCursor(source.getOperationContext()), decoder, - comment, source, connection); + return (result, source, connection) -> { + OperationContext operationContext = source.getOperationContext(); + + // register cursor id with the operation context, so 'getMore' commands can be folded under the 'find' operation + long cursorId = result.getDocument("cursor").getInt64("id").longValue(); + TracingManager tracingManager = operationContext.getTracingManager(); + tracingManager.addCursorParentContext(cursorId, operationContext.getId()); + + return new CommandBatchCursor<>(getTimeoutMode(), result, batchSize, getMaxTimeForCursor(operationContext), decoder, + comment, source, connection); + }; } private CommandReadTransformerAsync> asyncTransformer() { diff --git a/driver-core/src/main/com/mongodb/internal/session/ServerSessionPool.java b/driver-core/src/main/com/mongodb/internal/session/ServerSessionPool.java index 9111eaed3a9..00da3adb822 100644 --- a/driver-core/src/main/com/mongodb/internal/session/ServerSessionPool.java +++ b/driver-core/src/main/com/mongodb/internal/session/ServerSessionPool.java @@ -29,6 +29,7 @@ import com.mongodb.internal.connection.NoOpSessionContext; import com.mongodb.internal.connection.OperationContext; import com.mongodb.internal.selector.ReadPreferenceServerSelector; +import com.mongodb.internal.tracing.TracingManager; import com.mongodb.internal.validator.NoOpFieldNameValidator; import com.mongodb.lang.Nullable; import com.mongodb.selector.ServerSelector; @@ -70,7 +71,7 @@ interface Clock { public ServerSessionPool(final Cluster cluster, final TimeoutSettings timeoutSettings, @Nullable final ServerApi serverApi) { this(cluster, new OperationContext(IgnorableRequestContext.INSTANCE, NoOpSessionContext.INSTANCE, - new TimeoutContext(timeoutSettings.connectionOnly()), serverApi)); + new TimeoutContext(timeoutSettings.connectionOnly()), serverApi, TracingManager.NO_OP)); } public ServerSessionPool(final Cluster cluster, final OperationContext operationContext) { diff --git a/driver-core/src/main/com/mongodb/internal/tracing/Span.java b/driver-core/src/main/com/mongodb/internal/tracing/Span.java new file mode 100644 index 00000000000..10b95bed5af --- /dev/null +++ b/driver-core/src/main/com/mongodb/internal/tracing/Span.java @@ -0,0 +1,52 @@ +/* + * Copyright 2008-present MongoDB, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.mongodb.internal.tracing; + +public interface Span { + Span EMPTY = new Span() { + @Override + public void tag(final String key, final String value) { + } + + @Override + public void event(final String event) { + } + + @Override + public void error(final Throwable throwable) { + } + + @Override + public void end() { + } + + @Override + public TraceContext context() { + return TraceContext.EMPTY; + } + }; + + void tag(String key, String value); + + void event(String event); + + void error(Throwable throwable); + + void end(); + + TraceContext context(); +} diff --git a/driver-core/src/main/com/mongodb/internal/tracing/TraceContext.java b/driver-core/src/main/com/mongodb/internal/tracing/TraceContext.java new file mode 100644 index 00000000000..cb2f6ef1020 --- /dev/null +++ b/driver-core/src/main/com/mongodb/internal/tracing/TraceContext.java @@ -0,0 +1,23 @@ +/* + * Copyright 2008-present MongoDB, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.mongodb.internal.tracing; + +@SuppressWarnings("InterfaceIsType") +public interface TraceContext { + TraceContext EMPTY = new TraceContext() { + }; +} diff --git a/driver-core/src/main/com/mongodb/internal/tracing/TracingManager.java b/driver-core/src/main/com/mongodb/internal/tracing/TracingManager.java new file mode 100644 index 00000000000..f6bc5d14d81 --- /dev/null +++ b/driver-core/src/main/com/mongodb/internal/tracing/TracingManager.java @@ -0,0 +1,80 @@ +/* + * Copyright 2008-present MongoDB, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.mongodb.internal.tracing; + +import com.mongodb.tracing.Tracer; + +import java.util.HashMap; + +public class TracingManager { + public static final TracingManager NO_OP = new TracingManager(Tracer.NO_OP); + + private final Tracer tracer; + private final TraceContext parentContext; + + // Map a cursor id to its parent context (useful for folding getMore commands under the parent operation) + private final HashMap cursors = new HashMap<>(); + + // Map an operation's span context so the subsequent commands spans can fold under the parent operation + private final HashMap operationContexts = new HashMap<>(); + + public TracingManager(final Tracer tracer) { + this.tracer = tracer; + this.parentContext = tracer.currentContext(); + } + + public TracingManager(final Tracer tracer, final TraceContext parentContext) { + this.tracer = tracer; + this.parentContext = parentContext; + } + + public Span addSpan(final String name, final Long operationId) { + Span span = tracer.nextSpan(name); + operationContexts.put(operationId, span.context()); + return span; + } + + public Span addSpan(final String name, final TraceContext parentContext) { + return tracer.nextSpan(name, parentContext); + } + + public void cleanContexts(final Long operationId) { + operationContexts.remove(operationId); + } + + public TraceContext getParentContext(final Long operationId) { + assert operationContexts.containsKey(operationId); + return operationContexts.get(operationId); + } + + public void addCursorParentContext(final long cursorId, final long operationId) { + assert operationContexts.containsKey(operationId); + cursors.put(cursorId, operationContexts.get(operationId)); + } + + public TraceContext getCursorParentContext(final long cursorId) { + return cursors.get(cursorId); + } + + public void removeCursorParentContext(final long cursorId) { + cursors.remove(cursorId); + } + + public boolean isEnabled() { + return tracer.enabled(); + } +} diff --git a/driver-core/src/main/com/mongodb/internal/tracing/package-info.java b/driver-core/src/main/com/mongodb/internal/tracing/package-info.java new file mode 100644 index 00000000000..6b1f711c20b --- /dev/null +++ b/driver-core/src/main/com/mongodb/internal/tracing/package-info.java @@ -0,0 +1,23 @@ +/* + * Copyright 2008-present MongoDB, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * Contains classes related to sessions + */ +@NonNullApi +package com.mongodb.internal.tracing; + +import com.mongodb.lang.NonNullApi; diff --git a/driver-core/src/main/com/mongodb/tracing/MicrometerTracer.java b/driver-core/src/main/com/mongodb/tracing/MicrometerTracer.java new file mode 100644 index 00000000000..b34fa2247b4 --- /dev/null +++ b/driver-core/src/main/com/mongodb/tracing/MicrometerTracer.java @@ -0,0 +1,102 @@ +/* + * Copyright 2008-present MongoDB, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.mongodb.tracing; + +import com.mongodb.internal.tracing.Span; +import com.mongodb.internal.tracing.TraceContext; + +public class MicrometerTracer implements Tracer { + private final io.micrometer.tracing.Tracer tracer; + + public MicrometerTracer(final io.micrometer.tracing.Tracer tracer) { + this.tracer = tracer; + } + + @Override + public TraceContext currentContext() { + return new MicrometerTraceContext(tracer.currentTraceContext().context()); + } + + @Override + public Span nextSpan(final String name) { + return new MicrometerSpan(tracer.nextSpan().name(name).start()); + } + + @Override + public Span nextSpan(final String name, final TraceContext parent) { + if (parent != null) { + io.micrometer.tracing.Span span = tracer.spanBuilder() + .name(name) + .setParent(((MicrometerTraceContext) parent).getTraceContext()) + .start(); + return new MicrometerSpan(span); + } else { + return nextSpan(name); + } + } + + @Override + public boolean enabled() { + return true; + } + + private static class MicrometerTraceContext implements TraceContext { + private final io.micrometer.tracing.TraceContext traceContext; + + MicrometerTraceContext(final io.micrometer.tracing.TraceContext traceContext) { + this.traceContext = traceContext; + } + + public io.micrometer.tracing.TraceContext getTraceContext() { + return traceContext; + } + } + + private static class MicrometerSpan implements Span { + private final io.micrometer.tracing.Span span; + + MicrometerSpan(final io.micrometer.tracing.Span span) { + this.span = span; + } + + @Override + public void tag(final String key, final String value) { + span.tag(key, value); + } + + // TODO add variant with TimeUnit + @Override + public void event(final String event) { + span.event(event); + } + + @Override + public void error(final Throwable throwable) { + span.error(throwable); + } + + @Override + public void end() { + span.end(); + } + + @Override + public TraceContext context() { + return new MicrometerTraceContext(span.context()); + } + } +} diff --git a/driver-core/src/main/com/mongodb/tracing/Tracer.java b/driver-core/src/main/com/mongodb/tracing/Tracer.java new file mode 100644 index 00000000000..14d7093d4cb --- /dev/null +++ b/driver-core/src/main/com/mongodb/tracing/Tracer.java @@ -0,0 +1,53 @@ +/* + * Copyright 2008-present MongoDB, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.mongodb.tracing; + +import com.mongodb.internal.tracing.Span; +import com.mongodb.internal.tracing.TraceContext; + +public interface Tracer { + Tracer NO_OP = new Tracer() { + + @Override + public TraceContext currentContext() { + return TraceContext.EMPTY; + } + + @Override + public Span nextSpan(final String name) { + return Span.EMPTY; + } + + @Override + public Span nextSpan(final String name, final TraceContext parent) { + return Span.EMPTY; + } + + @Override + public boolean enabled() { + return false; + } + }; + + TraceContext currentContext(); + + Span nextSpan(String name); // uses current active span + + Span nextSpan(String name, TraceContext parent); // manually attach the next span to the provided parent + + boolean enabled(); +} diff --git a/driver-core/src/main/com/mongodb/tracing/package-info.java b/driver-core/src/main/com/mongodb/tracing/package-info.java new file mode 100644 index 00000000000..2ec7551d300 --- /dev/null +++ b/driver-core/src/main/com/mongodb/tracing/package-info.java @@ -0,0 +1,23 @@ +/* + * Copyright 2008-present MongoDB, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * Contains classes related to sessions + */ +@NonNullApi +package com.mongodb.tracing; + +import com.mongodb.lang.NonNullApi; diff --git a/driver-core/src/test/functional/com/mongodb/ClusterFixture.java b/driver-core/src/test/functional/com/mongodb/ClusterFixture.java index 30792bf0487..d2916206a7d 100644 --- a/driver-core/src/test/functional/com/mongodb/ClusterFixture.java +++ b/driver-core/src/test/functional/com/mongodb/ClusterFixture.java @@ -71,6 +71,7 @@ import com.mongodb.internal.operation.DropDatabaseOperation; import com.mongodb.internal.operation.ReadOperation; import com.mongodb.internal.operation.WriteOperation; +import com.mongodb.internal.tracing.TracingManager; import com.mongodb.lang.Nullable; import io.netty.handler.ssl.SslContext; import io.netty.handler.ssl.SslContextBuilder; diff --git a/driver-core/src/test/resources/specifications b/driver-core/src/test/resources/specifications index c13d23b91b4..61270d61656 160000 --- a/driver-core/src/test/resources/specifications +++ b/driver-core/src/test/resources/specifications @@ -1 +1 @@ -Subproject commit c13d23b91b422b348c54195fe1c49406fc457559 +Subproject commit 61270d61656709944e6b75e160453e3bfa658483 diff --git a/driver-core/src/test/unit/com/mongodb/internal/connection/CommandHelperTest.java b/driver-core/src/test/unit/com/mongodb/internal/connection/CommandHelperTest.java index f7873379c3b..f40c7d17f20 100644 --- a/driver-core/src/test/unit/com/mongodb/internal/connection/CommandHelperTest.java +++ b/driver-core/src/test/unit/com/mongodb/internal/connection/CommandHelperTest.java @@ -26,6 +26,7 @@ import com.mongodb.internal.IgnorableRequestContext; import com.mongodb.internal.TimeoutContext; import com.mongodb.internal.TimeoutSettings; +import com.mongodb.internal.tracing.TracingManager; import org.bson.BsonDocument; import org.bson.codecs.Decoder; import org.junit.jupiter.api.Test; @@ -118,9 +119,8 @@ void testIsCommandOk() { assertFalse(CommandHelper.isCommandOk(new BsonDocument())); } - OperationContext createOperationContext() { return new OperationContext(IgnorableRequestContext.INSTANCE, NoOpSessionContext.INSTANCE, - new TimeoutContext(TimeoutSettings.DEFAULT), ServerApi.builder().version(ServerApiVersion.V1).build()); + new TimeoutContext(TimeoutSettings.DEFAULT), ServerApi.builder().version(ServerApiVersion.V1).build(), TracingManager.NO_OP); } } diff --git a/driver-core/src/test/unit/com/mongodb/internal/connection/CommandMessageTest.java b/driver-core/src/test/unit/com/mongodb/internal/connection/CommandMessageTest.java index 533e74f0d23..3ceb7567eef 100644 --- a/driver-core/src/test/unit/com/mongodb/internal/connection/CommandMessageTest.java +++ b/driver-core/src/test/unit/com/mongodb/internal/connection/CommandMessageTest.java @@ -32,6 +32,7 @@ import com.mongodb.internal.operation.ClientBulkWriteOperation; import com.mongodb.internal.operation.ClientBulkWriteOperation.ClientBulkWriteCommand.OpsAndNsInfo; import com.mongodb.internal.session.SessionContext; +import com.mongodb.internal.tracing.TracingManager; import com.mongodb.internal.validator.NoOpFieldNameValidator; import org.bson.BsonArray; import org.bson.BsonBoolean; @@ -163,7 +164,7 @@ void getCommandDocumentFromClientBulkWrite() { output, new OperationContext( IgnorableRequestContext.INSTANCE, NoOpSessionContext.INSTANCE, - new TimeoutContext(TimeoutSettings.DEFAULT), null)); + new TimeoutContext(TimeoutSettings.DEFAULT), null, TracingManager.NO_OP)); BsonDocument actualCommandDocument = commandMessage.getCommandDocument(output); assertEquals(expectedCommandDocument, actualCommandDocument); } diff --git a/driver-legacy/src/main/com/mongodb/MongoClient.java b/driver-legacy/src/main/com/mongodb/MongoClient.java index 09d58e1b493..9478dc76177 100644 --- a/driver-legacy/src/main/com/mongodb/MongoClient.java +++ b/driver-legacy/src/main/com/mongodb/MongoClient.java @@ -43,6 +43,7 @@ import com.mongodb.internal.diagnostics.logging.Loggers; import com.mongodb.internal.session.ServerSessionPool; import com.mongodb.internal.thread.DaemonThreadFactory; +import com.mongodb.internal.tracing.TracingManager; import com.mongodb.internal.validator.NoOpFieldNameValidator; import com.mongodb.lang.Nullable; import org.bson.BsonArray; diff --git a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/OperationExecutorImpl.java b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/OperationExecutorImpl.java index dacf0c9b82e..1689c9b31e9 100644 --- a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/OperationExecutorImpl.java +++ b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/OperationExecutorImpl.java @@ -34,6 +34,7 @@ import com.mongodb.internal.operation.AsyncReadOperation; import com.mongodb.internal.operation.AsyncWriteOperation; import com.mongodb.internal.operation.OperationHelper; +import com.mongodb.internal.tracing.TracingManager; import com.mongodb.lang.Nullable; import com.mongodb.reactivestreams.client.ClientSession; import com.mongodb.reactivestreams.client.ReactiveContextProvider; @@ -204,6 +205,7 @@ private OperationContext getOperationContext(final RequestContext requestContext requestContext, new ReadConcernAwareNoOpSessionContext(readConcern), createTimeoutContext(session, timeoutSettings), + mongoClient.getSettings().getTracingManager(), mongoClient.getSettings().getServerApi(), commandName); } diff --git a/driver-sync/src/main/com/mongodb/client/internal/MongoClientImpl.java b/driver-sync/src/main/com/mongodb/client/internal/MongoClientImpl.java index 6870277b1c6..acb19fe12d9 100644 --- a/driver-sync/src/main/com/mongodb/client/internal/MongoClientImpl.java +++ b/driver-sync/src/main/com/mongodb/client/internal/MongoClientImpl.java @@ -106,7 +106,8 @@ public MongoClientImpl(final Cluster cluster, operationExecutor, settings.getReadConcern(), settings.getReadPreference(), settings.getRetryReads(), settings.getRetryWrites(), settings.getServerApi(), new ServerSessionPool(cluster, TimeoutSettings.create(settings), settings.getServerApi()), - TimeoutSettings.create(settings), settings.getUuidRepresentation(), settings.getWriteConcern()); + TimeoutSettings.create(settings), settings.getUuidRepresentation(), + settings.getWriteConcern(), settings.getTracingManager()); this.closed = new AtomicBoolean(); BsonDocument clientMetadataDocument = delegate.getCluster().getClientMetadata().getBsonDocument(); diff --git a/driver-sync/src/main/com/mongodb/client/internal/MongoClusterImpl.java b/driver-sync/src/main/com/mongodb/client/internal/MongoClusterImpl.java index 0430d9407c1..5944edae4e2 100644 --- a/driver-sync/src/main/com/mongodb/client/internal/MongoClusterImpl.java +++ b/driver-sync/src/main/com/mongodb/client/internal/MongoClusterImpl.java @@ -57,6 +57,7 @@ import com.mongodb.internal.operation.SyncOperations; import com.mongodb.internal.operation.WriteOperation; import com.mongodb.internal.session.ServerSessionPool; +import com.mongodb.internal.tracing.TracingManager; import com.mongodb.lang.Nullable; import org.bson.BsonDocument; import org.bson.Document; @@ -99,6 +100,7 @@ final class MongoClusterImpl implements MongoCluster { private final UuidRepresentation uuidRepresentation; private final WriteConcern writeConcern; private final SyncOperations operations; + private final TracingManager tracingManager; MongoClusterImpl( @Nullable final AutoEncryptionSettings autoEncryptionSettings, final Cluster cluster, final CodecRegistry codecRegistry, @@ -106,7 +108,8 @@ final class MongoClusterImpl implements MongoCluster { @Nullable final OperationExecutor operationExecutor, final ReadConcern readConcern, final ReadPreference readPreference, final boolean retryReads, final boolean retryWrites, @Nullable final ServerApi serverApi, final ServerSessionPool serverSessionPool, final TimeoutSettings timeoutSettings, final UuidRepresentation uuidRepresentation, - final WriteConcern writeConcern) { + final WriteConcern writeConcern, + final TracingManager tracingManager) { this.autoEncryptionSettings = autoEncryptionSettings; this.cluster = cluster; this.codecRegistry = codecRegistry; @@ -123,6 +126,8 @@ final class MongoClusterImpl implements MongoCluster { this.timeoutSettings = timeoutSettings; this.uuidRepresentation = uuidRepresentation; this.writeConcern = writeConcern; + this.tracingManager = tracingManager; + operations = new SyncOperations<>( null, BsonDocument.class, @@ -165,35 +170,35 @@ public Long getTimeout(final TimeUnit timeUnit) { public MongoCluster withCodecRegistry(final CodecRegistry codecRegistry) { return new MongoClusterImpl(autoEncryptionSettings, cluster, codecRegistry, contextProvider, crypt, originator, operationExecutor, readConcern, readPreference, retryReads, retryWrites, serverApi, serverSessionPool, timeoutSettings, - uuidRepresentation, writeConcern); + uuidRepresentation, writeConcern, tracingManager); } @Override public MongoCluster withReadPreference(final ReadPreference readPreference) { return new MongoClusterImpl(autoEncryptionSettings, cluster, codecRegistry, contextProvider, crypt, originator, operationExecutor, readConcern, readPreference, retryReads, retryWrites, serverApi, serverSessionPool, timeoutSettings, - uuidRepresentation, writeConcern); + uuidRepresentation, writeConcern, tracingManager); } @Override public MongoCluster withWriteConcern(final WriteConcern writeConcern) { return new MongoClusterImpl(autoEncryptionSettings, cluster, codecRegistry, contextProvider, crypt, originator, operationExecutor, readConcern, readPreference, retryReads, retryWrites, serverApi, serverSessionPool, timeoutSettings, - uuidRepresentation, writeConcern); + uuidRepresentation, writeConcern, tracingManager); } @Override public MongoCluster withReadConcern(final ReadConcern readConcern) { return new MongoClusterImpl(autoEncryptionSettings, cluster, codecRegistry, contextProvider, crypt, originator, operationExecutor, readConcern, readPreference, retryReads, retryWrites, serverApi, serverSessionPool, timeoutSettings, - uuidRepresentation, writeConcern); + uuidRepresentation, writeConcern, tracingManager); } @Override public MongoCluster withTimeout(final long timeout, final TimeUnit timeUnit) { return new MongoClusterImpl(autoEncryptionSettings, cluster, codecRegistry, contextProvider, crypt, originator, operationExecutor, readConcern, readPreference, retryReads, retryWrites, serverApi, serverSessionPool, - timeoutSettings.withTimeout(timeout, timeUnit), uuidRepresentation, writeConcern); + timeoutSettings.withTimeout(timeout, timeUnit), uuidRepresentation, writeConcern, tracingManager); } @Override diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8b8222d66e5..90aec4c1c38 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -24,6 +24,7 @@ reactive-streams = "1.0.4" snappy = "1.1.10.3" zstd = "1.5.5-3" jetbrains-annotations = "26.0.2" +micrometer = "1.4.5" kotlin = "1.8.10" kotlinx-coroutines-bom = "1.6.4" @@ -93,6 +94,7 @@ reactive-streams = { module = " org.reactivestreams:reactive-streams", version.r slf4j = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" } snappy-java = { module = "org.xerial.snappy:snappy-java", version.ref = "snappy" } zstd-jni = { module = "com.github.luben:zstd-jni", version.ref = "zstd" } +micrometer = { module = "io.micrometer:micrometer-tracing", version.ref = "micrometer" } graal-sdk = { module = "org.graalvm.sdk:graal-sdk", version.ref = "graal-sdk" } graal-sdk-nativeimage = { module = "org.graalvm.sdk:nativeimage", version.ref = "graal-sdk" } From 4a16c29f00fe1c2a251fea0712243a05a9d9ebe3 Mon Sep 17 00:00:00 2001 From: Nabil Hachicha Date: Mon, 4 Aug 2025 00:29:29 +0100 Subject: [PATCH 06/36] Simplifying bookkeeping logic for Span grouping --- .../main/com/mongodb/MongoClientSettings.java | 28 +- .../internal/connection/CommandMessage.java | 4 - .../connection/InternalStreamConnection.java | 186 +++++++---- .../connection/LoggingCommandEventSender.java | 4 +- .../internal/connection/OperationContext.java | 27 +- .../operation/CommandBatchCursor.java | 7 +- .../internal/operation/FindOperation.java | 31 +- .../internal/session/ServerSessionPool.java | 3 +- .../com/mongodb/internal/tracing/Span.java | 69 +++- .../com/mongodb/internal/tracing/Tags.java | 42 +++ .../com/mongodb/internal/tracing/Tracer.java | 97 ++++++ .../internal/tracing/TracingManager.java | 106 ++++--- .../internal/tracing/TransactionSpan.java | 110 +++++++ .../internal/tracing/package-info.java | 2 +- .../com/mongodb/tracing/MicrometerTracer.java | 88 +++++- .../src/main/com/mongodb/tracing/Tracer.java | 53 ---- .../com/mongodb/tracing/package-info.java | 4 +- .../com/mongodb/ClusterFixture.java | 1 - .../connection/CommandHelperTest.java | 3 +- .../connection/CommandMessageTest.java | 3 +- .../syncadapter/SyncClientSession.kt | 3 + .../client/syncadapter/SyncClientSession.kt | 3 + .../src/main/com/mongodb/MongoClient.java | 1 - .../internal/OperationExecutorImpl.java | 2 +- .../client/syncadapter/SyncClientSession.java | 7 + .../scala/syncadapter/SyncClientSession.scala | 3 + driver-sync/build.gradle.kts | 3 + .../com/mongodb/client/ClientSession.java | 10 + .../client/internal/ClientSessionImpl.java | 114 ++++--- .../client/internal/MongoClientImpl.java | 3 +- .../client/internal/MongoClusterImpl.java | 53 +++- .../com/mongodb/client/tracing/SpanTree.java | 295 ++++++++++++++++++ .../mongodb/client/tracing/ZipkinTracer.java | 95 ++++++ gradle/libs.versions.toml | 11 + 34 files changed, 1195 insertions(+), 276 deletions(-) create mode 100644 driver-core/src/main/com/mongodb/internal/tracing/Tags.java create mode 100644 driver-core/src/main/com/mongodb/internal/tracing/Tracer.java create mode 100644 driver-core/src/main/com/mongodb/internal/tracing/TransactionSpan.java delete mode 100644 driver-core/src/main/com/mongodb/tracing/Tracer.java create mode 100644 driver-sync/src/test/functional/com/mongodb/client/tracing/SpanTree.java create mode 100644 driver-sync/src/test/functional/com/mongodb/client/tracing/ZipkinTracer.java diff --git a/driver-core/src/main/com/mongodb/MongoClientSettings.java b/driver-core/src/main/com/mongodb/MongoClientSettings.java index 642682d1b3a..938b9c76068 100644 --- a/driver-core/src/main/com/mongodb/MongoClientSettings.java +++ b/driver-core/src/main/com/mongodb/MongoClientSettings.java @@ -30,11 +30,10 @@ import com.mongodb.connection.SslSettings; import com.mongodb.connection.TransportSettings; import com.mongodb.event.CommandListener; -import com.mongodb.internal.tracing.TracingManager; +import com.mongodb.internal.tracing.Tracer; import com.mongodb.lang.Nullable; import com.mongodb.spi.dns.DnsClient; import com.mongodb.spi.dns.InetAddressResolver; -import com.mongodb.tracing.Tracer; import org.bson.UuidRepresentation; import org.bson.codecs.BsonCodecProvider; import org.bson.codecs.BsonValueCodecProvider; @@ -120,7 +119,7 @@ public final class MongoClientSettings { private final InetAddressResolver inetAddressResolver; @Nullable private final Long timeoutMS; - private final TracingManager tracingManager; + private final Tracer tracer; /** * Gets the default codec registry. It includes the following providers: @@ -241,7 +240,7 @@ public static final class Builder { private ContextProvider contextProvider; private DnsClient dnsClient; private InetAddressResolver inetAddressResolver; - private TracingManager tracingManager; + private Tracer tracer; private Builder() { } @@ -279,7 +278,7 @@ private Builder(final MongoClientSettings settings) { if (settings.heartbeatSocketTimeoutSetExplicitly) { heartbeatSocketTimeoutMS = settings.heartbeatSocketSettings.getReadTimeout(MILLISECONDS); } - tracingManager = settings.tracingManager; + tracer = settings.tracer; } /** @@ -729,16 +728,16 @@ Builder heartbeatSocketTimeoutMS(final int heartbeatSocketTimeoutMS) { } /** - * Sets the tracer to use for creating Spans for operations and commands. + * Sets the tracer to use for creating Spans for operations, commands and transactions. * * @param tracer the tracer * @see com.mongodb.tracing.MicrometerTracer * @return this - * @since 5.5 + * @since 5.6 */ @Alpha(Reason.CLIENT) public Builder tracer(final Tracer tracer) { - this.tracingManager = new TracingManager(tracer); + this.tracer = tracer; return this; } @@ -1060,14 +1059,13 @@ public ContextProvider getContextProvider() { } /** - * Get the tracer to create Spans for operations and commands. + * Get the tracer to create Spans for operations, commands and transactions. * - * @return this - * @since 5.5 + * @return the configured Tracer + * @since 5.6 */ - @Alpha(Reason.CLIENT) - public TracingManager getTracingManager() { - return tracingManager; + public Tracer getTracer() { + return tracer; } @Override @@ -1186,6 +1184,6 @@ private MongoClientSettings(final Builder builder) { heartbeatConnectTimeoutSetExplicitly = builder.heartbeatConnectTimeoutMS != 0; contextProvider = builder.contextProvider; timeoutMS = builder.timeoutMS; - tracingManager = builder.tracingManager; + tracer = (builder.tracer == null) ? Tracer.NO_OP : builder.tracer; } } diff --git a/driver-core/src/main/com/mongodb/internal/connection/CommandMessage.java b/driver-core/src/main/com/mongodb/internal/connection/CommandMessage.java index 0660938e4f2..12543e92ccb 100644 --- a/driver-core/src/main/com/mongodb/internal/connection/CommandMessage.java +++ b/driver-core/src/main/com/mongodb/internal/connection/CommandMessage.java @@ -186,10 +186,6 @@ BsonDocument getCommandDocument(final ByteBufferBsonOutput bsonOutput) { } } - BsonDocument getCommand() { - return command; - } - /** * Get the field name from a buffer positioned at the start of the document sequence identifier of an OP_MSG Section of type * `PAYLOAD_TYPE_1_DOCUMENT_SEQUENCE`. diff --git a/driver-core/src/main/com/mongodb/internal/connection/InternalStreamConnection.java b/driver-core/src/main/com/mongodb/internal/connection/InternalStreamConnection.java index e477239e6dc..bd3008cf927 100644 --- a/driver-core/src/main/com/mongodb/internal/connection/InternalStreamConnection.java +++ b/driver-core/src/main/com/mongodb/internal/connection/InternalStreamConnection.java @@ -52,7 +52,6 @@ import com.mongodb.internal.session.SessionContext; import com.mongodb.internal.time.Timeout; import com.mongodb.internal.tracing.Span; -import com.mongodb.internal.tracing.TraceContext; import com.mongodb.internal.tracing.TracingManager; import com.mongodb.lang.Nullable; import org.bson.BsonBinaryReader; @@ -97,6 +96,18 @@ import static com.mongodb.internal.connection.ProtocolHelper.isCommandOk; import static com.mongodb.internal.logging.LogMessage.Level.DEBUG; import static com.mongodb.internal.thread.InterruptionUtil.translateInterruptedException; +import static com.mongodb.internal.tracing.Tags.CLIENT_CONNECTION_ID; +import static com.mongodb.internal.tracing.Tags.CURSOR_ID; +import static com.mongodb.internal.tracing.Tags.NAMESPACE; +import static com.mongodb.internal.tracing.Tags.QUERY_SUMMARY; +import static com.mongodb.internal.tracing.Tags.QUERY_TEXT; +import static com.mongodb.internal.tracing.Tags.SERVER_ADDRESS; +import static com.mongodb.internal.tracing.Tags.SERVER_CONNECTION_ID; +import static com.mongodb.internal.tracing.Tags.SERVER_PORT; +import static com.mongodb.internal.tracing.Tags.SERVER_TYPE; +import static com.mongodb.internal.tracing.Tags.SESSION_ID; +import static com.mongodb.internal.tracing.Tags.SYSTEM; +import static com.mongodb.internal.tracing.Tags.TRANSACTION_NUMBER; import static java.util.Arrays.asList; /** @@ -377,24 +388,13 @@ public boolean isClosed() { public T sendAndReceive(final CommandMessage message, final Decoder decoder, final OperationContext operationContext) { Supplier sendAndReceiveInternal = () -> sendAndReceiveInternal( message, decoder, operationContext); - - Span tracingSpan = createTracingSpan(message, operationContext); - try { return sendAndReceiveInternal.get(); - } catch (MongoCommandException e) { - if (tracingSpan != null) { - tracingSpan.error(e); - } - + } catch (Throwable e) { if (reauthenticationIsTriggered(e)) { return reauthenticateAndRetry(sendAndReceiveInternal, operationContext); } throw e; - } finally { - if (tracingSpan != null) { - tracingSpan.end(); - } } } @@ -406,9 +406,7 @@ public void sendAndReceiveAsync(final CommandMessage message, final Decoder< AsyncSupplier sendAndReceiveAsyncInternal = c -> sendAndReceiveAsyncInternal( message, decoder, operationContext, c); - beginAsync().thenSupply(c -> { - sendAndReceiveAsyncInternal.getAsync(c); - }).onErrorIf(e -> reauthenticationIsTriggered(e), (t, c) -> { + beginAsync().thenSupply(sendAndReceiveAsyncInternal::getAsync).onErrorIf(this::reauthenticationIsTriggered, (t, c) -> { reauthenticateAndRetryAsync(sendAndReceiveAsyncInternal, operationContext, c); }).finish(callback); } @@ -447,15 +445,44 @@ public boolean reauthenticationIsTriggered(@Nullable final Throwable t) { private T sendAndReceiveInternal(final CommandMessage message, final Decoder decoder, final OperationContext operationContext) { CommandEventSender commandEventSender; + try (ByteBufferBsonOutput bsonOutput = new ByteBufferBsonOutput(this)) { message.encode(bsonOutput, operationContext); - commandEventSender = createCommandEventSender(message, bsonOutput, operationContext); - commandEventSender.sendStartedEvent(); + Span tracingSpan = createTracingSpan(message, operationContext, bsonOutput); + + boolean isLoggingCommandNeeded = isLoggingCommandNeeded(); + boolean isTracingCommandPayloadNeeded = tracingSpan != null && operationContext.getTracingManager().isCommandPayloadEnabled(); + + // Only hydrate the command document if necessary + BsonDocument commandDocument = null; + if (isLoggingCommandNeeded || isTracingCommandPayloadNeeded) { + commandDocument = message.getCommandDocument(bsonOutput); + } + if (isLoggingCommandNeeded) { + commandEventSender = new LoggingCommandEventSender( + SECURITY_SENSITIVE_COMMANDS, SECURITY_SENSITIVE_HELLO_COMMANDS, description, commandListener, + operationContext, message, commandDocument, + COMMAND_PROTOCOL_LOGGER, loggerSettings); + commandEventSender.sendStartedEvent(); + } else { + commandEventSender = new NoOpCommandEventSender(); + } + if (isTracingCommandPayloadNeeded) { + tracingSpan.tag(QUERY_TEXT, commandDocument.toJson()); + } + try { sendCommandMessage(message, bsonOutput, operationContext); } catch (Exception e) { + if (tracingSpan != null) { + tracingSpan.error(e); + } commandEventSender.sendFailedEvent(e); throw e; + } finally { + if (tracingSpan != null) { + tracingSpan.end(); + } } } @@ -568,7 +595,18 @@ private void sendAndReceiveAsyncInternal(final CommandMessage message, final try { message.encode(bsonOutput, operationContext); - CommandEventSender commandEventSender = createCommandEventSender(message, bsonOutput, operationContext); + + CommandEventSender commandEventSender; + if (isLoggingCommandNeeded()) { + BsonDocument commandDocument = message.getCommandDocument(bsonOutput); + commandEventSender = new LoggingCommandEventSender( + SECURITY_SENSITIVE_COMMANDS, SECURITY_SENSITIVE_HELLO_COMMANDS, description, commandListener, + operationContext, message, commandDocument, + COMMAND_PROTOCOL_LOGGER, loggerSettings); + } else { + commandEventSender = new NoOpCommandEventSender(); + } + commandEventSender.sendStartedEvent(); Compressor localSendCompressor = sendCompressor; if (localSendCompressor == null || SECURITY_SENSITIVE_COMMANDS.contains(message.getCommandDocument(bsonOutput).getFirstKey())) { @@ -887,42 +925,6 @@ public ByteBuf getBuffer(final int size) { return stream.getBuffer(size); } - @Nullable - private Span createTracingSpan(final CommandMessage message, final OperationContext operationContext) { - TracingManager tracingManager = operationContext.getTracingManager(); - Span span; - if (tracingManager.isEnabled()) { - BsonDocument command = message.getCommand(); - TraceContext parentContext = null; - long cursorId = -1; - if (command.containsKey("getMore")) { - cursorId = command.getInt64("getMore").longValue(); - parentContext = tracingManager.getCursorParentContext(cursorId); - } else { - parentContext = tracingManager.getParentContext(operationContext.getId()); - } - - span = tracingManager.addSpan("Command " + command.getFirstKey(), parentContext); - span.tag("db.system", "mongodb"); - span.tag("db.namespace", message.getNamespace().getFullName()); - span.tag("db.query.summary", command.getFirstKey()); - span.tag("db.query.opcode", String.valueOf(message.getOpCode())); - span.tag("db.query.text", command.toString()); - if (cursorId != -1) { - span.tag("db.mongodb.cursor_id", String.valueOf(cursorId)); - } - span.tag("server.address", serverId.getAddress().getHost()); - span.tag("server.port", String.valueOf(serverId.getAddress().getPort())); - span.tag("server.type", message.getSettings().getServerType().name()); - - span.tag("db.mongodb.server_connection_id", this.description.getConnectionId().toString()); - } else { - span = null; - } - - return span; - } - private class MessageHeaderCallback implements SingleResultCallback { private final OperationContext operationContext; private final SingleResultCallback callback; @@ -1003,19 +1005,75 @@ public void onResult(@Nullable final ByteBuf result, @Nullable final Throwable t private static final StructuredLogger COMMAND_PROTOCOL_LOGGER = new StructuredLogger("protocol.command"); - private CommandEventSender createCommandEventSender(final CommandMessage message, final ByteBufferBsonOutput bsonOutput, - final OperationContext operationContext) { + private boolean isLoggingCommandNeeded() { boolean listensOrLogs = commandListener != null || COMMAND_PROTOCOL_LOGGER.isRequired(DEBUG, getClusterId()); - if (!recordEverything && (isMonitoringConnection || !opened() || !authenticated.get() || !listensOrLogs)) { - return new NoOpCommandEventSender(); - } - return new LoggingCommandEventSender( - SECURITY_SENSITIVE_COMMANDS, SECURITY_SENSITIVE_HELLO_COMMANDS, description, commandListener, - operationContext, message, bsonOutput, - COMMAND_PROTOCOL_LOGGER, loggerSettings); + return recordEverything || (!isMonitoringConnection && opened() && authenticated.get() && listensOrLogs); } private ClusterId getClusterId() { return description.getConnectionId().getServerId().getClusterId(); } + + /** + * Creates a tracing span for the given command message. + *

+ * The span is only created if tracing is enabled and the command is not security-sensitive. + * It attaches various tags to the span, such as database system, namespace, query summary, opcode, + * server address, port, server type, client and server connection IDs, and, if applicable, + * transaction number and session ID. For cursor fetching commands, the parent context is retrieved using the cursor ID. + * If command payload tracing is enabled, the command document is also attached as a tag. + * + * @param message the command message to trace + * @param operationContext the operation context containing tracing and session information + * @param bsonOutput the BSON output used to serialize the command + * @return the created {@link Span}, or {@code null} if tracing is not enabled or the command is security-sensitive + */ + @Nullable + private Span createTracingSpan(final CommandMessage message, final OperationContext operationContext, final ByteBufferBsonOutput bsonOutput) { + + TracingManager tracingManager = operationContext.getTracingManager(); + BsonDocument command = message.getCommandDocument(bsonOutput); + +// BsonDocument command = message.getCommand(); + String commandName = command.getFirstKey(); +// Span newSpan = tracingManager.addSpan("_____Command_____[ " + commandName + " ]", myparentContext); + if (!tracingManager.isEnabled() + || SECURITY_SENSITIVE_COMMANDS.contains(commandName) + || SECURITY_SENSITIVE_HELLO_COMMANDS.contains(commandName)) { + return null; + } + + Span span = tracingManager + .addSpan("Command " + commandName, operationContext.getTracingSpanContext()) + .tag(SYSTEM, "mongodb") + .tag(NAMESPACE, message.getNamespace().getDatabaseName()) + .tag(QUERY_SUMMARY, commandName); + + if (command.containsKey("getMore")) { + span.tag(CURSOR_ID, command.getInt64("getMore").longValue()); + } + + tagServerAndConnectionInfo(span, message); + tagSessionAndTransactionInfo(span, operationContext); + + return span; + } + + private void tagServerAndConnectionInfo(final Span span, final CommandMessage message) { + span.tag(SERVER_ADDRESS, serverId.getAddress().getHost()) + .tag(SERVER_PORT, String.valueOf(serverId.getAddress().getPort())) + .tag(SERVER_TYPE, message.getSettings().getServerType().name()) + .tag(CLIENT_CONNECTION_ID, this.description.getConnectionId().toString()) + .tag(SERVER_CONNECTION_ID, String.valueOf(this.description.getConnectionId().getServerValue())); + } + + private void tagSessionAndTransactionInfo(final Span span, final OperationContext operationContext) { + SessionContext sessionContext = operationContext.getSessionContext(); + if (sessionContext.hasSession() && !sessionContext.isImplicitSession()) { + span.tag(TRANSACTION_NUMBER, String.valueOf(sessionContext.getTransactionNumber())) + .tag(SESSION_ID, String.valueOf(sessionContext.getSessionId() + .get(sessionContext.getSessionId().getFirstKey()) + .asBinary().asUuid())); + } + } } diff --git a/driver-core/src/main/com/mongodb/internal/connection/LoggingCommandEventSender.java b/driver-core/src/main/com/mongodb/internal/connection/LoggingCommandEventSender.java index 3821ca947c6..136ec10a1dd 100644 --- a/driver-core/src/main/com/mongodb/internal/connection/LoggingCommandEventSender.java +++ b/driver-core/src/main/com/mongodb/internal/connection/LoggingCommandEventSender.java @@ -78,7 +78,7 @@ class LoggingCommandEventSender implements CommandEventSender { @Nullable final CommandListener commandListener, final OperationContext operationContext, final CommandMessage message, - final ByteBufferBsonOutput bsonOutput, + final BsonDocument commandDocument, final StructuredLogger logger, final LoggerSettings loggerSettings) { this.description = description; @@ -88,7 +88,7 @@ class LoggingCommandEventSender implements CommandEventSender { this.loggerSettings = loggerSettings; this.startTimeNanos = System.nanoTime(); this.message = message; - this.commandDocument = message.getCommandDocument(bsonOutput); + this.commandDocument = commandDocument; this.commandName = commandDocument.getFirstKey(); this.redactionRequired = securitySensitiveCommands.contains(commandName) || (securitySensitiveHelloCommands.contains(commandName) && commandDocument.containsKey("speculativeAuthenticate")); diff --git a/driver-core/src/main/com/mongodb/internal/connection/OperationContext.java b/driver-core/src/main/com/mongodb/internal/connection/OperationContext.java index c74f4116a3f..9f1c232b274 100644 --- a/driver-core/src/main/com/mongodb/internal/connection/OperationContext.java +++ b/driver-core/src/main/com/mongodb/internal/connection/OperationContext.java @@ -27,6 +27,7 @@ import com.mongodb.internal.TimeoutSettings; import com.mongodb.internal.VisibleForTesting; import com.mongodb.internal.session.SessionContext; +import com.mongodb.internal.tracing.TraceContext; import com.mongodb.internal.tracing.TracingManager; import com.mongodb.lang.Nullable; import com.mongodb.selector.ServerSelector; @@ -53,6 +54,8 @@ public class OperationContext { private final ServerApi serverApi; @Nullable private final String operationName; + @Nullable + private TraceContext tracingContext; public OperationContext(final RequestContext requestContext, final SessionContext sessionContext, final TimeoutContext timeoutContext, @Nullable final ServerApi serverApi) { @@ -66,7 +69,8 @@ public OperationContext(final RequestContext requestContext, final SessionContex this(NEXT_ID.incrementAndGet(), requestContext, sessionContext, timeoutContext, new ServerDeprioritization(), tracingManager, serverApi, - operationName); + operationName, + null); } public static OperationContext simpleOperationContext( @@ -93,17 +97,17 @@ public static OperationContext simpleOperationContext(final TimeoutContext timeo public OperationContext withSessionContext(final SessionContext sessionContext) { return new OperationContext(id, requestContext, sessionContext, timeoutContext, serverDeprioritization, tracingManager, serverApi, - operationName); + operationName, tracingContext); } public OperationContext withTimeoutContext(final TimeoutContext timeoutContext) { return new OperationContext(id, requestContext, sessionContext, timeoutContext, serverDeprioritization, tracingManager, serverApi, - operationName); + operationName, tracingContext); } public OperationContext withOperationName(final String operationName) { return new OperationContext(id, requestContext, sessionContext, timeoutContext, serverDeprioritization, tracingManager, serverApi, - operationName); + operationName, tracingContext); } public long getId() { @@ -136,6 +140,15 @@ public String getOperationName() { return operationName; } + @Nullable + public TraceContext getTracingSpanContext() { + return tracingContext != null ? tracingContext : null; + } + + public void setTracingContext(final TraceContext tracingContext) { + this.tracingContext = tracingContext; + } + @VisibleForTesting(otherwise = VisibleForTesting.AccessModifier.PRIVATE) public OperationContext(final long id, final RequestContext requestContext, @@ -144,7 +157,9 @@ public OperationContext(final long id, final ServerDeprioritization serverDeprioritization, final TracingManager tracingManager, @Nullable final ServerApi serverApi, - @Nullable final String operationName) { + @Nullable final String operationName, + @Nullable final TraceContext tracingContext) { + this.id = id; this.serverDeprioritization = serverDeprioritization; this.requestContext = requestContext; @@ -153,6 +168,7 @@ public OperationContext(final long id, this.tracingManager = tracingManager; this.serverApi = serverApi; this.operationName = operationName; + this.tracingContext = tracingContext; } @VisibleForTesting(otherwise = VisibleForTesting.AccessModifier.PRIVATE) @@ -171,6 +187,7 @@ public OperationContext(final long id, this.tracingManager = tracingManager; this.serverApi = serverApi; this.operationName = operationName; + this.tracingContext = null; } diff --git a/driver-core/src/main/com/mongodb/internal/operation/CommandBatchCursor.java b/driver-core/src/main/com/mongodb/internal/operation/CommandBatchCursor.java index a061abafbe9..d201976e5ed 100644 --- a/driver-core/src/main/com/mongodb/internal/operation/CommandBatchCursor.java +++ b/driver-core/src/main/com/mongodb/internal/operation/CommandBatchCursor.java @@ -75,7 +75,6 @@ class CommandBatchCursor implements AggregateResponseBatchCursor { @Nullable private List nextBatch; private boolean resetTimeoutWhenClosing; - private final long cursorId; CommandBatchCursor( final TimeoutMode timeoutMode, @@ -96,13 +95,10 @@ class CommandBatchCursor implements AggregateResponseBatchCursor { operationContext = connectionSource.getOperationContext(); this.timeoutMode = timeoutMode; - ServerCursor serverCursor = commandCursorResult.getServerCursor(); - this.cursorId = serverCursor != null ? serverCursor.getId() : -1; - operationContext.getTimeoutContext().setMaxTimeOverride(maxTimeMS); Connection connectionToPin = connectionSource.getServerDescription().getType() == ServerType.LOAD_BALANCER ? connection : null; - resourceManager = new ResourceManager(namespace, connectionSource, connectionToPin, serverCursor); + resourceManager = new ResourceManager(namespace, connectionSource, connectionToPin, commandCursorResult.getServerCursor()); resetTimeoutWhenClosing = true; } @@ -173,7 +169,6 @@ public void remove() { @Override public void close() { - operationContext.getTracingManager().removeCursorParentContext(cursorId); resourceManager.close(); } diff --git a/driver-core/src/main/com/mongodb/internal/operation/FindOperation.java b/driver-core/src/main/com/mongodb/internal/operation/FindOperation.java index 9d21f41d876..84039a03296 100644 --- a/driver-core/src/main/com/mongodb/internal/operation/FindOperation.java +++ b/driver-core/src/main/com/mongodb/internal/operation/FindOperation.java @@ -30,8 +30,6 @@ import com.mongodb.internal.binding.AsyncReadBinding; import com.mongodb.internal.binding.ReadBinding; import com.mongodb.internal.connection.OperationContext; -import com.mongodb.internal.tracing.Span; -import com.mongodb.internal.tracing.TracingManager; import com.mongodb.lang.Nullable; import org.bson.BsonBoolean; import org.bson.BsonDocument; @@ -298,18 +296,13 @@ public BatchCursor execute(final ReadBinding binding) { if (invalidTimeoutModeException != null) { throw invalidTimeoutModeException; } - OperationContext operationContext = binding.getOperationContext(); - // Adds a Tracing Span for 'find' operation - TracingManager tracingManager = operationContext.getTracingManager(); - Span tracingSpan = tracingManager.addSpan("find", operationContext.getId()); - - RetryState retryState = initialRetryState(retryReads, operationContext.getTimeoutContext()); - Supplier> read = decorateReadWithRetries(retryState, operationContext, () -> + RetryState retryState = initialRetryState(retryReads, binding.getOperationContext().getTimeoutContext()); + Supplier> read = decorateReadWithRetries(retryState, binding.getOperationContext(), () -> withSourceAndConnection(binding::getReadConnectionSource, false, (source, connection) -> { - retryState.breakAndThrowIfRetryAnd(() -> !canRetryRead(source.getServerDescription(), operationContext)); + retryState.breakAndThrowIfRetryAnd(() -> !canRetryRead(source.getServerDescription(), binding.getOperationContext())); try { - return createReadCommandAndExecute(retryState, operationContext, source, namespace.getDatabaseName(), + return createReadCommandAndExecute(retryState, binding.getOperationContext(), source, namespace.getDatabaseName(), getCommandCreator(), CommandResultDocumentCodec.create(decoder, FIRST_BATCH), transformer(), connection); } catch (MongoCommandException e) { @@ -317,16 +310,7 @@ public BatchCursor execute(final ReadBinding binding) { } }) ); - try { - return read.get(); - } catch (MongoQueryException e) { - tracingSpan.error(e); - throw e; - } finally { - tracingSpan.end(); - // Clean up the tracing span after the operation is complete - tracingManager.cleanContexts(operationContext.getId()); - } + return read.get(); } @Override @@ -492,11 +476,6 @@ private CommandReadTransformer> transformer( return (result, source, connection) -> { OperationContext operationContext = source.getOperationContext(); - // register cursor id with the operation context, so 'getMore' commands can be folded under the 'find' operation - long cursorId = result.getDocument("cursor").getInt64("id").longValue(); - TracingManager tracingManager = operationContext.getTracingManager(); - tracingManager.addCursorParentContext(cursorId, operationContext.getId()); - return new CommandBatchCursor<>(getTimeoutMode(), result, batchSize, getMaxTimeForCursor(operationContext), decoder, comment, source, connection); }; diff --git a/driver-core/src/main/com/mongodb/internal/session/ServerSessionPool.java b/driver-core/src/main/com/mongodb/internal/session/ServerSessionPool.java index 00da3adb822..9111eaed3a9 100644 --- a/driver-core/src/main/com/mongodb/internal/session/ServerSessionPool.java +++ b/driver-core/src/main/com/mongodb/internal/session/ServerSessionPool.java @@ -29,7 +29,6 @@ import com.mongodb.internal.connection.NoOpSessionContext; import com.mongodb.internal.connection.OperationContext; import com.mongodb.internal.selector.ReadPreferenceServerSelector; -import com.mongodb.internal.tracing.TracingManager; import com.mongodb.internal.validator.NoOpFieldNameValidator; import com.mongodb.lang.Nullable; import com.mongodb.selector.ServerSelector; @@ -71,7 +70,7 @@ interface Clock { public ServerSessionPool(final Cluster cluster, final TimeoutSettings timeoutSettings, @Nullable final ServerApi serverApi) { this(cluster, new OperationContext(IgnorableRequestContext.INSTANCE, NoOpSessionContext.INSTANCE, - new TimeoutContext(timeoutSettings.connectionOnly()), serverApi, TracingManager.NO_OP)); + new TimeoutContext(timeoutSettings.connectionOnly()), serverApi)); } public ServerSessionPool(final Cluster cluster, final OperationContext operationContext) { diff --git a/driver-core/src/main/com/mongodb/internal/tracing/Span.java b/driver-core/src/main/com/mongodb/internal/tracing/Span.java index 10b95bed5af..41f6ef0afdf 100644 --- a/driver-core/src/main/com/mongodb/internal/tracing/Span.java +++ b/driver-core/src/main/com/mongodb/internal/tracing/Span.java @@ -16,10 +16,41 @@ package com.mongodb.internal.tracing; + +/** + * Represents a tracing span for the driver internal operations. + *

+ * A span records information about a single operation, such as tags, events, errors, and its context. + * Implementations can be used to propagate tracing information and record telemetry. + *

+ *

+ * Spans can be used to trace different aspects of MongoDB driver activity: + *

    + *
  • Command Spans: Trace the execution of MongoDB commands (e.g., find, insert, update).
    • + *
  • Operation Spans: Trace higher-level operations, which may include multiple commands or internal steps.
    • + *
  • Transaction Spans: Trace the lifecycle of a transaction, including all operations and commands within it.
    • + *
+ *

+ * + * @since 5.6 + */ public interface Span { + /** + * An empty / no-op implementation of the Span interface. + *

+ * This implementation is used as a default when no actual tracing is required. + * All methods in this implementation perform no operations and return default values. + *

+ */ Span EMPTY = new Span() { @Override - public void tag(final String key, final String value) { + public Span tag(final String key, final String value) { + return this; + } + + @Override + public Span tag(final String key, final Long value) { + return this; } @Override @@ -40,13 +71,47 @@ public TraceContext context() { } }; - void tag(String key, String value); + /** + * Adds a tag to the span with a key-value pair. + * + * @param key The tag key. + * @param value The tag value. + * @return The current instance of the span. + */ + Span tag(String key, String value); + + /** + * Adds a tag to the span with a key and a numeric value. + * + * @param key The tag key. + * @param value The numeric tag value. + * @return The current instance of the span. + */ + Span tag(String key, Long value); + /** + * Records an event in the span. + * + * @param event The event description. + */ void event(String event); + /** + * Records an error for this span. + * + * @param throwable The error to record. + */ void error(Throwable throwable); + /** + * Ends the span, marking it as complete. + */ void end(); + /** + * Retrieves the context associated with the span. + * + * @return The trace context associated with the span. + */ TraceContext context(); } diff --git a/driver-core/src/main/com/mongodb/internal/tracing/Tags.java b/driver-core/src/main/com/mongodb/internal/tracing/Tags.java new file mode 100644 index 00000000000..e4407f2a401 --- /dev/null +++ b/driver-core/src/main/com/mongodb/internal/tracing/Tags.java @@ -0,0 +1,42 @@ +/* + * Copyright 2008-present MongoDB, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.mongodb.internal.tracing; + +/** + * Contains constant tag names used for tracing and monitoring MongoDB operations. + * These tags are typically used to annotate spans or events with relevant metadata. + * + * @since 5.6 + */ +public final class Tags { + private Tags() { + } + + public static final String SYSTEM = "db.system"; + public static final String NAMESPACE = "db.namespace"; + public static final String COLLECTION = "db.collection.name"; + public static final String QUERY_SUMMARY = "db.query.summary"; + public static final String QUERY_TEXT = "db.query.text"; + public static final String CURSOR_ID = "db.mongodb.cursor_id"; + public static final String SERVER_ADDRESS = "server.address"; + public static final String SERVER_PORT = "server.port"; + public static final String SERVER_TYPE = "server.type"; + public static final String CLIENT_CONNECTION_ID = "db.mongodb.client_connection_id"; + public static final String SERVER_CONNECTION_ID = "db.mongodb.server_connection_id"; + public static final String TRANSACTION_NUMBER = "db.mongodb.txnNumber"; + public static final String SESSION_ID = "db.mongodb.lsid"; +} diff --git a/driver-core/src/main/com/mongodb/internal/tracing/Tracer.java b/driver-core/src/main/com/mongodb/internal/tracing/Tracer.java new file mode 100644 index 00000000000..c2881e9e2fb --- /dev/null +++ b/driver-core/src/main/com/mongodb/internal/tracing/Tracer.java @@ -0,0 +1,97 @@ +/* + * Copyright 2008-present MongoDB, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.mongodb.internal.tracing; + +import com.mongodb.lang.Nullable; + +/** + * A Tracer interface that provides methods for tracing commands, operations and transactions. + *

+ * This interface defines methods to retrieve the current trace context, create new spans, and check if tracing is enabled. + * It also includes a no-operation (NO_OP) implementation for cases where tracing is not required. + *

+ * + * @since 5.6 + */ +public interface Tracer { + Tracer NO_OP = new Tracer() { + + @Override + public TraceContext currentContext() { + return TraceContext.EMPTY; + } + + @Override + public Span nextSpan(final String name) { + return Span.EMPTY; + } + + @Override + public Span nextSpan(final String name, @Nullable final TraceContext parent) { + return Span.EMPTY; + } + + @Override + public boolean enabled() { + return false; + } + + @Override + public boolean includeCommandPayload() { + return false; + } + }; + + /** + * Retrieves the current trace context from the Micrometer tracer. + * + * @return A {@link TraceContext} representing the underlying {@link io.micrometer.tracing.TraceContext}. + * exists. + */ + TraceContext currentContext(); + + /** + * Creates a new span with the specified name. + * + * @param name The name of the span. + * @return A {@link Span} representing the newly created span. + */ + Span nextSpan(String name); // uses current active span + + /** + * Creates a new span with the specified name and optional parent trace context. + * + * @param name The name of the span. + * @param parent The parent {@link TraceContext}, or null if no parent context is provided. + * @return A {@link Span} representing the newly created span. + */ + Span nextSpan(String name, @Nullable TraceContext parent); // manually attach the next span to the provided parent + + /** + * Indicates whether tracing is enabled. + * + * @return {@code true} if tracing is enabled, {@code false} otherwise. + */ + boolean enabled(); + + /** + * Indicates whether command payloads are included in the trace context. + * + * @return {@code true} if command payloads are allowed, {@code false} otherwise. + */ + boolean includeCommandPayload(); // whether the tracer allows command payloads in the trace context +} diff --git a/driver-core/src/main/com/mongodb/internal/tracing/TracingManager.java b/driver-core/src/main/com/mongodb/internal/tracing/TracingManager.java index f6bc5d14d81..6db92f0d75a 100644 --- a/driver-core/src/main/com/mongodb/internal/tracing/TracingManager.java +++ b/driver-core/src/main/com/mongodb/internal/tracing/TracingManager.java @@ -16,65 +16,97 @@ package com.mongodb.internal.tracing; -import com.mongodb.tracing.Tracer; +import com.mongodb.lang.Nullable; -import java.util.HashMap; +import static com.mongodb.internal.tracing.Tags.SYSTEM; +import static java.lang.System.getenv; +/** + * Manages tracing spans for MongoDB driver activities. + *

+ * This class provides methods to create and manage spans for commands, operations and transactions. + * It integrates with a {@link Tracer} to propagate tracing information and record telemetry. + *

+ */ public class TracingManager { + /** + * A no-op instance of the TracingManager used when tracing is disabled. + */ public static final TracingManager NO_OP = new TracingManager(Tracer.NO_OP); + private static final String ENV_ALLOW_COMMAND_PAYLOAD = "MONGODB_TRACING_ALLOW_COMMAND_PAYLOAD"; private final Tracer tracer; private final TraceContext parentContext; + private final boolean enableCommandPayload; - // Map a cursor id to its parent context (useful for folding getMore commands under the parent operation) - private final HashMap cursors = new HashMap<>(); - - // Map an operation's span context so the subsequent commands spans can fold under the parent operation - private final HashMap operationContexts = new HashMap<>(); - + /** + * Constructs a new TracingManager with the specified tracer. + * + * @param tracer The tracer to use for tracing operations. + */ public TracingManager(final Tracer tracer) { - this.tracer = tracer; - this.parentContext = tracer.currentContext(); + this(tracer, tracer.currentContext()); } + /** + * Constructs a new TracingManager with the specified tracer and parent context. + * Setting the environment variable {@code MONGODB_TRACING_ALLOW_COMMAND_PAYLOAD} to "true" will enable command payload tracing. + * + * @param tracer The tracer to use for tracing operations. + * @param parentContext The parent trace context. + */ public TracingManager(final Tracer tracer, final TraceContext parentContext) { this.tracer = tracer; this.parentContext = parentContext; + String envAllowCommandPayload = getenv(ENV_ALLOW_COMMAND_PAYLOAD); + if (envAllowCommandPayload != null) { + this.enableCommandPayload = Boolean.parseBoolean(envAllowCommandPayload); + } else { + this.enableCommandPayload = tracer.includeCommandPayload(); + } } - public Span addSpan(final String name, final Long operationId) { - Span span = tracer.nextSpan(name); - operationContexts.put(operationId, span.context()); - return span; - } - - public Span addSpan(final String name, final TraceContext parentContext) { + /** + * Creates a new span with the specified name and parent trace context. + *

+ * This method is used to create a span that is linked to a parent context, + * enabling hierarchical tracing of operations. + *

+ * + * @param name The name of the span. + * @param parentContext The parent trace context to associate with the span. + * @return The created span. + */ + public Span addSpan(final String name, @Nullable final TraceContext parentContext) { return tracer.nextSpan(name, parentContext); } - public void cleanContexts(final Long operationId) { - operationContexts.remove(operationId); - } - - public TraceContext getParentContext(final Long operationId) { - assert operationContexts.containsKey(operationId); - return operationContexts.get(operationId); - } - - public void addCursorParentContext(final long cursorId, final long operationId) { - assert operationContexts.containsKey(operationId); - cursors.put(cursorId, operationContexts.get(operationId)); - } - - public TraceContext getCursorParentContext(final long cursorId) { - return cursors.get(cursorId); - } - - public void removeCursorParentContext(final long cursorId) { - cursors.remove(cursorId); + /** + * Creates a new transaction span for the specified server session. + * + * @return The created transaction span. + */ + public Span addTransactionSpan() { + Span span = tracer.nextSpan("transaction", parentContext); + span.tag(SYSTEM, "mongodb"); + return span; } + /** + * Checks whether tracing is enabled. + * + * @return True if tracing is enabled, false otherwise. + */ public boolean isEnabled() { return tracer.enabled(); } + + /** + * Checks whether command payload tracing is enabled. + * + * @return True if command payload tracing is enabled, false otherwise. + */ + public boolean isCommandPayloadEnabled() { + return enableCommandPayload; + } } diff --git a/driver-core/src/main/com/mongodb/internal/tracing/TransactionSpan.java b/driver-core/src/main/com/mongodb/internal/tracing/TransactionSpan.java new file mode 100644 index 00000000000..d975f6931e0 --- /dev/null +++ b/driver-core/src/main/com/mongodb/internal/tracing/TransactionSpan.java @@ -0,0 +1,110 @@ +/* + * Copyright 2008-present MongoDB, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.mongodb.internal.tracing; + +import com.mongodb.lang.Nullable; + +/** + * State class for transaction tracing. + */ +public class TransactionSpan { + private boolean isConvenientTransaction = false; + private final Span span; + @Nullable + private Throwable reportedError; + + public TransactionSpan(final TracingManager tracingManager) { + this.span = tracingManager.addTransactionSpan(); + } + + /** + * Handles a transaction span error. + *

+ * If the transaction is convenient, the error is reported as an event. This is done since + * the error is not fatal and the transaction may be retried. + *

+ * If the transaction is not convenient, the error is reported as a span error and the + * transaction context is cleaned up. + * + * @param e The error to report. + */ + public void handleTransactionSpanError(final Throwable e) { + if (isConvenientTransaction) { + // report error as event (since subsequent retries might succeed, also keep track of the last event + span.event(e.toString()); + reportedError = e; + } else { + span.error(e); + } + + if (!isConvenientTransaction) { + span.end(); + } + } + + /** + * Finalizes the transaction span by logging the specified status as an event and ending the span. + * + * @param status The status to log as an event. + */ + public void finalizeTransactionSpan(final String status) { + span.event(status); + // clear previous commit error if any + if (!isConvenientTransaction) { + span.end(); + } + reportedError = null; // clear previous commit error if any + } + + /** + * Finalizes the transaction span by logging any last span event as an error and ending the span. + * Optionally cleans up the transaction context if specified. + * + * @param cleanupTransactionContext A boolean indicating whether to clean up the transaction context. + */ + public void spanFinalizing(final boolean cleanupTransactionContext) { + if (reportedError != null) { + span.error(reportedError); + } + span.end(); + reportedError = null; + // Don't clean up transaction context if we're still retrying (we want the retries to fold under the original transaction span) + if (cleanupTransactionContext) { + isConvenientTransaction = false; + } + } + + /** + * Indicates that the transaction is a convenient transaction. + *

+ * This has an impact on how the transaction span is handled. If the transaction is convenient, any errors that occur + * during the transaction are reported as events. If the transaction is not convenient, errors are reported as span + * errors and the transaction context is cleaned up. + */ + public void setIsConvenientTransaction() { + this.isConvenientTransaction = true; + } + + /** + * Retrieves the trace context associated with the transaction span. + * + * @return The trace context associated with the transaction span. + */ + public TraceContext getContext() { + return span.context(); + } +} diff --git a/driver-core/src/main/com/mongodb/internal/tracing/package-info.java b/driver-core/src/main/com/mongodb/internal/tracing/package-info.java index 6b1f711c20b..e7dd3311143 100644 --- a/driver-core/src/main/com/mongodb/internal/tracing/package-info.java +++ b/driver-core/src/main/com/mongodb/internal/tracing/package-info.java @@ -15,7 +15,7 @@ */ /** - * Contains classes related to sessions + * Contains classes related to tracing */ @NonNullApi package com.mongodb.internal.tracing; diff --git a/driver-core/src/main/com/mongodb/tracing/MicrometerTracer.java b/driver-core/src/main/com/mongodb/tracing/MicrometerTracer.java index b34fa2247b4..ed678b93cab 100644 --- a/driver-core/src/main/com/mongodb/tracing/MicrometerTracer.java +++ b/driver-core/src/main/com/mongodb/tracing/MicrometerTracer.java @@ -18,12 +18,40 @@ import com.mongodb.internal.tracing.Span; import com.mongodb.internal.tracing.TraceContext; - +import com.mongodb.internal.tracing.Tracer; +import com.mongodb.lang.Nullable; + +/** + * A {@link Tracer} implementation that delegates tracing operations to a Micrometer {@link io.micrometer.tracing.Tracer}. + *

+ * This class enables integration of MongoDB driver tracing with Micrometer-based tracing systems. + * It provides methods to create and manage spans using the Micrometer tracing API. + *

+ * + * @since 5.6 + */ public class MicrometerTracer implements Tracer { private final io.micrometer.tracing.Tracer tracer; + private final boolean allowCommandPayload; + /** + * Constructs a new {@link MicrometerTracer} instance. + * + * @param tracer The Micrometer {@link io.micrometer.tracing.Tracer} to delegate tracing operations to. + */ public MicrometerTracer(final io.micrometer.tracing.Tracer tracer) { + this(tracer, false); + } + + /** + * Constructs a new {@link MicrometerTracer} instance with an option to allow command payloads. + * + * @param tracer The Micrometer {@link io.micrometer.tracing.Tracer} to delegate tracing operations to. + * @param allowCommandPayload Whether to allow command payloads in the trace context. + */ + public MicrometerTracer(final io.micrometer.tracing.Tracer tracer, final boolean allowCommandPayload) { this.tracer = tracer; + this.allowCommandPayload = allowCommandPayload; } @Override @@ -37,16 +65,17 @@ public Span nextSpan(final String name) { } @Override - public Span nextSpan(final String name, final TraceContext parent) { - if (parent != null) { - io.micrometer.tracing.Span span = tracer.spanBuilder() - .name(name) - .setParent(((MicrometerTraceContext) parent).getTraceContext()) - .start(); - return new MicrometerSpan(span); - } else { - return nextSpan(name); + public Span nextSpan(final String name, @Nullable final TraceContext parent) { + if (parent instanceof MicrometerTraceContext) { + io.micrometer.tracing.TraceContext micrometerContext = ((MicrometerTraceContext) parent).getTraceContext(); + if (micrometerContext != null) { + return new MicrometerSpan(tracer.spanBuilder() + .name(name) + .setParent(micrometerContext) + .start()); + } } + return nextSpan(name); } @Override @@ -54,31 +83,64 @@ public boolean enabled() { return true; } + @Override + public boolean includeCommandPayload() { + return allowCommandPayload; + } + + /** + * Represents a Micrometer-based trace context. + */ private static class MicrometerTraceContext implements TraceContext { private final io.micrometer.tracing.TraceContext traceContext; - MicrometerTraceContext(final io.micrometer.tracing.TraceContext traceContext) { + /** + * Constructs a new {@link MicrometerTraceContext} instance. + * + * @param traceContext The Micrometer {@link io.micrometer.tracing.TraceContext}, or null if none exists. + */ + MicrometerTraceContext(@Nullable final io.micrometer.tracing.TraceContext traceContext) { this.traceContext = traceContext; } + /** + * Retrieves the underlying Micrometer trace context. + * + * @return The Micrometer {@link io.micrometer.tracing.TraceContext}, or null if none exists. + */ + @Nullable public io.micrometer.tracing.TraceContext getTraceContext() { return traceContext; } } + /** + * Represents a Micrometer-based span. + */ private static class MicrometerSpan implements Span { private final io.micrometer.tracing.Span span; + /** + * Constructs a new {@link MicrometerSpan} instance. + * + * @param span The Micrometer {@link io.micrometer.tracing.Span} to delegate operations to. + */ MicrometerSpan(final io.micrometer.tracing.Span span) { this.span = span; } @Override - public void tag(final String key, final String value) { + public Span tag(final String key, final String value) { + span.tag(key, value); + return this; + } + + @Override + public Span tag(final String key, final Long value) { span.tag(key, value); + return this; } - // TODO add variant with TimeUnit @Override public void event(final String event) { span.event(event); diff --git a/driver-core/src/main/com/mongodb/tracing/Tracer.java b/driver-core/src/main/com/mongodb/tracing/Tracer.java deleted file mode 100644 index 14d7093d4cb..00000000000 --- a/driver-core/src/main/com/mongodb/tracing/Tracer.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright 2008-present MongoDB, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.mongodb.tracing; - -import com.mongodb.internal.tracing.Span; -import com.mongodb.internal.tracing.TraceContext; - -public interface Tracer { - Tracer NO_OP = new Tracer() { - - @Override - public TraceContext currentContext() { - return TraceContext.EMPTY; - } - - @Override - public Span nextSpan(final String name) { - return Span.EMPTY; - } - - @Override - public Span nextSpan(final String name, final TraceContext parent) { - return Span.EMPTY; - } - - @Override - public boolean enabled() { - return false; - } - }; - - TraceContext currentContext(); - - Span nextSpan(String name); // uses current active span - - Span nextSpan(String name, TraceContext parent); // manually attach the next span to the provided parent - - boolean enabled(); -} diff --git a/driver-core/src/main/com/mongodb/tracing/package-info.java b/driver-core/src/main/com/mongodb/tracing/package-info.java index 2ec7551d300..43e82603a09 100644 --- a/driver-core/src/main/com/mongodb/tracing/package-info.java +++ b/driver-core/src/main/com/mongodb/tracing/package-info.java @@ -15,7 +15,9 @@ */ /** - * Contains classes related to sessions + * This package defines the API for MongoDB driver tracing. + * + * @since 5.6 */ @NonNullApi package com.mongodb.tracing; diff --git a/driver-core/src/test/functional/com/mongodb/ClusterFixture.java b/driver-core/src/test/functional/com/mongodb/ClusterFixture.java index d2916206a7d..30792bf0487 100644 --- a/driver-core/src/test/functional/com/mongodb/ClusterFixture.java +++ b/driver-core/src/test/functional/com/mongodb/ClusterFixture.java @@ -71,7 +71,6 @@ import com.mongodb.internal.operation.DropDatabaseOperation; import com.mongodb.internal.operation.ReadOperation; import com.mongodb.internal.operation.WriteOperation; -import com.mongodb.internal.tracing.TracingManager; import com.mongodb.lang.Nullable; import io.netty.handler.ssl.SslContext; import io.netty.handler.ssl.SslContextBuilder; diff --git a/driver-core/src/test/unit/com/mongodb/internal/connection/CommandHelperTest.java b/driver-core/src/test/unit/com/mongodb/internal/connection/CommandHelperTest.java index f40c7d17f20..447a1efb5dd 100644 --- a/driver-core/src/test/unit/com/mongodb/internal/connection/CommandHelperTest.java +++ b/driver-core/src/test/unit/com/mongodb/internal/connection/CommandHelperTest.java @@ -26,7 +26,6 @@ import com.mongodb.internal.IgnorableRequestContext; import com.mongodb.internal.TimeoutContext; import com.mongodb.internal.TimeoutSettings; -import com.mongodb.internal.tracing.TracingManager; import org.bson.BsonDocument; import org.bson.codecs.Decoder; import org.junit.jupiter.api.Test; @@ -121,6 +120,6 @@ void testIsCommandOk() { OperationContext createOperationContext() { return new OperationContext(IgnorableRequestContext.INSTANCE, NoOpSessionContext.INSTANCE, - new TimeoutContext(TimeoutSettings.DEFAULT), ServerApi.builder().version(ServerApiVersion.V1).build(), TracingManager.NO_OP); + new TimeoutContext(TimeoutSettings.DEFAULT), ServerApi.builder().version(ServerApiVersion.V1).build()); } } diff --git a/driver-core/src/test/unit/com/mongodb/internal/connection/CommandMessageTest.java b/driver-core/src/test/unit/com/mongodb/internal/connection/CommandMessageTest.java index 3ceb7567eef..533e74f0d23 100644 --- a/driver-core/src/test/unit/com/mongodb/internal/connection/CommandMessageTest.java +++ b/driver-core/src/test/unit/com/mongodb/internal/connection/CommandMessageTest.java @@ -32,7 +32,6 @@ import com.mongodb.internal.operation.ClientBulkWriteOperation; import com.mongodb.internal.operation.ClientBulkWriteOperation.ClientBulkWriteCommand.OpsAndNsInfo; import com.mongodb.internal.session.SessionContext; -import com.mongodb.internal.tracing.TracingManager; import com.mongodb.internal.validator.NoOpFieldNameValidator; import org.bson.BsonArray; import org.bson.BsonBoolean; @@ -164,7 +163,7 @@ void getCommandDocumentFromClientBulkWrite() { output, new OperationContext( IgnorableRequestContext.INSTANCE, NoOpSessionContext.INSTANCE, - new TimeoutContext(TimeoutSettings.DEFAULT), null, TracingManager.NO_OP)); + new TimeoutContext(TimeoutSettings.DEFAULT), null)); BsonDocument actualCommandDocument = commandMessage.getCommandDocument(output); assertEquals(expectedCommandDocument, actualCommandDocument); } diff --git a/driver-kotlin-coroutine/src/integrationTest/kotlin/com/mongodb/kotlin/client/coroutine/syncadapter/SyncClientSession.kt b/driver-kotlin-coroutine/src/integrationTest/kotlin/com/mongodb/kotlin/client/coroutine/syncadapter/SyncClientSession.kt index 83ba91df16b..3c66babd5d8 100644 --- a/driver-kotlin-coroutine/src/integrationTest/kotlin/com/mongodb/kotlin/client/coroutine/syncadapter/SyncClientSession.kt +++ b/driver-kotlin-coroutine/src/integrationTest/kotlin/com/mongodb/kotlin/client/coroutine/syncadapter/SyncClientSession.kt @@ -21,6 +21,7 @@ import com.mongodb.TransactionOptions import com.mongodb.client.ClientSession as JClientSession import com.mongodb.client.TransactionBody import com.mongodb.internal.TimeoutContext +import com.mongodb.internal.tracing.TransactionSpan import com.mongodb.kotlin.client.coroutine.ClientSession import com.mongodb.session.ServerSession import kotlinx.coroutines.runBlocking @@ -89,4 +90,6 @@ class SyncClientSession(internal val wrapped: ClientSession, private val origina throw UnsupportedOperationException() override fun getTimeoutContext(): TimeoutContext? = wrapped.getTimeoutContext() + + override fun getTransactionSpan(): TransactionSpan? = null } diff --git a/driver-kotlin-sync/src/integrationTest/kotlin/com/mongodb/kotlin/client/syncadapter/SyncClientSession.kt b/driver-kotlin-sync/src/integrationTest/kotlin/com/mongodb/kotlin/client/syncadapter/SyncClientSession.kt index 64cd27b776f..001198dbcd0 100644 --- a/driver-kotlin-sync/src/integrationTest/kotlin/com/mongodb/kotlin/client/syncadapter/SyncClientSession.kt +++ b/driver-kotlin-sync/src/integrationTest/kotlin/com/mongodb/kotlin/client/syncadapter/SyncClientSession.kt @@ -21,6 +21,7 @@ import com.mongodb.TransactionOptions import com.mongodb.client.ClientSession as JClientSession import com.mongodb.client.TransactionBody import com.mongodb.internal.TimeoutContext +import com.mongodb.internal.tracing.TransactionSpan import com.mongodb.kotlin.client.ClientSession import com.mongodb.session.ServerSession import org.bson.BsonDocument @@ -93,4 +94,6 @@ internal class SyncClientSession(internal val wrapped: ClientSession, private va throw UnsupportedOperationException() override fun getTimeoutContext(): TimeoutContext = throw UnsupportedOperationException() + + override fun getTransactionSpan(): TransactionSpan? = null } diff --git a/driver-legacy/src/main/com/mongodb/MongoClient.java b/driver-legacy/src/main/com/mongodb/MongoClient.java index 9478dc76177..09d58e1b493 100644 --- a/driver-legacy/src/main/com/mongodb/MongoClient.java +++ b/driver-legacy/src/main/com/mongodb/MongoClient.java @@ -43,7 +43,6 @@ import com.mongodb.internal.diagnostics.logging.Loggers; import com.mongodb.internal.session.ServerSessionPool; import com.mongodb.internal.thread.DaemonThreadFactory; -import com.mongodb.internal.tracing.TracingManager; import com.mongodb.internal.validator.NoOpFieldNameValidator; import com.mongodb.lang.Nullable; import org.bson.BsonArray; diff --git a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/OperationExecutorImpl.java b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/OperationExecutorImpl.java index 1689c9b31e9..250949549f2 100644 --- a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/OperationExecutorImpl.java +++ b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/OperationExecutorImpl.java @@ -205,7 +205,7 @@ private OperationContext getOperationContext(final RequestContext requestContext requestContext, new ReadConcernAwareNoOpSessionContext(readConcern), createTimeoutContext(session, timeoutSettings), - mongoClient.getSettings().getTracingManager(), + TracingManager.NO_OP, mongoClient.getSettings().getServerApi(), commandName); } diff --git a/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/syncadapter/SyncClientSession.java b/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/syncadapter/SyncClientSession.java index 494e5f8c74e..ab234ad6f3e 100644 --- a/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/syncadapter/SyncClientSession.java +++ b/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/syncadapter/SyncClientSession.java @@ -22,6 +22,7 @@ import com.mongodb.client.ClientSession; import com.mongodb.client.TransactionBody; import com.mongodb.internal.TimeoutContext; +import com.mongodb.internal.tracing.TransactionSpan; import com.mongodb.lang.Nullable; import com.mongodb.session.ServerSession; import org.bson.BsonDocument; @@ -188,6 +189,12 @@ public TimeoutContext getTimeoutContext() { return wrapped.getTimeoutContext(); } + @Override + @Nullable + public TransactionSpan getTransactionSpan() { + return null; + } + private static void sleep(final long millis) { try { Thread.sleep(millis); diff --git a/driver-scala/src/integrationTest/scala/org/mongodb/scala/syncadapter/SyncClientSession.scala b/driver-scala/src/integrationTest/scala/org/mongodb/scala/syncadapter/SyncClientSession.scala index 2866ce7427d..4c0cb19217d 100644 --- a/driver-scala/src/integrationTest/scala/org/mongodb/scala/syncadapter/SyncClientSession.scala +++ b/driver-scala/src/integrationTest/scala/org/mongodb/scala/syncadapter/SyncClientSession.scala @@ -19,6 +19,7 @@ package org.mongodb.scala.syncadapter import com.mongodb.{ ClientSessionOptions, MongoInterruptedException, ServerAddress, TransactionOptions } import com.mongodb.client.{ ClientSession => JClientSession, TransactionBody } import com.mongodb.internal.TimeoutContext +import com.mongodb.internal.tracing.TransactionSpan import com.mongodb.session.ServerSession import org.bson.{ BsonDocument, BsonTimestamp } import org.mongodb.scala._ @@ -96,4 +97,6 @@ case class SyncClientSession(wrapped: ClientSession, originator: Object) extends } override def getTimeoutContext: TimeoutContext = wrapped.getTimeoutContext + + override def getTransactionSpan: TransactionSpan = null } diff --git a/driver-sync/build.gradle.kts b/driver-sync/build.gradle.kts index 95cd0979973..b37d0226295 100644 --- a/driver-sync/build.gradle.kts +++ b/driver-sync/build.gradle.kts @@ -38,6 +38,9 @@ dependencies { // lambda testing testImplementation(libs.aws.lambda.core) + + // Tracing + testImplementation(libs.bundles.micrometer.test) } configureMavenPublication { diff --git a/driver-sync/src/main/com/mongodb/client/ClientSession.java b/driver-sync/src/main/com/mongodb/client/ClientSession.java index 5d994b863e8..6af2b4be664 100644 --- a/driver-sync/src/main/com/mongodb/client/ClientSession.java +++ b/driver-sync/src/main/com/mongodb/client/ClientSession.java @@ -18,6 +18,7 @@ import com.mongodb.ServerAddress; import com.mongodb.TransactionOptions; +import com.mongodb.internal.tracing.TransactionSpan; import com.mongodb.lang.Nullable; /** @@ -125,4 +126,13 @@ public interface ClientSession extends com.mongodb.session.ClientSession { * @since 3.11 */ T withTransaction(TransactionBody transactionBody, TransactionOptions options); + + /** + * Get the transaction span (if started). + * + * @return the transaction span + * @since 5.6 + */ + @Nullable + TransactionSpan getTransactionSpan(); } diff --git a/driver-sync/src/main/com/mongodb/client/internal/ClientSessionImpl.java b/driver-sync/src/main/com/mongodb/client/internal/ClientSessionImpl.java index b60fc90316a..c1937843a9d 100644 --- a/driver-sync/src/main/com/mongodb/client/internal/ClientSessionImpl.java +++ b/driver-sync/src/main/com/mongodb/client/internal/ClientSessionImpl.java @@ -36,6 +36,8 @@ import com.mongodb.internal.operation.WriteOperation; import com.mongodb.internal.session.BaseClientSessionImpl; import com.mongodb.internal.session.ServerSessionPool; +import com.mongodb.internal.tracing.TracingManager; +import com.mongodb.internal.tracing.TransactionSpan; import com.mongodb.lang.Nullable; import static com.mongodb.MongoException.TRANSIENT_TRANSACTION_ERROR_LABEL; @@ -54,11 +56,14 @@ final class ClientSessionImpl extends BaseClientSessionImpl implements ClientSes private boolean messageSentInCurrentTransaction; private boolean commitInProgress; private TransactionOptions transactionOptions; + private final TracingManager tracingManager; + private TransactionSpan transactionSpan = null; ClientSessionImpl(final ServerSessionPool serverSessionPool, final Object originator, final ClientSessionOptions options, - final OperationExecutor operationExecutor) { + final OperationExecutor operationExecutor, final TracingManager tracingManager) { super(serverSessionPool, originator, options); this.operationExecutor = operationExecutor; + this.tracingManager = tracingManager; } @Override @@ -141,6 +146,9 @@ public void abortTransaction() { } finally { clearTransactionContext(); cleanupTransaction(TransactionState.ABORTED); + if (transactionSpan != null) { + transactionSpan.finalizeTransactionSpan(TransactionState.ABORTED.name()); + } } } @@ -167,6 +175,10 @@ private void startTransaction(final TransactionOptions transactionOptions, final if (!writeConcern.isAcknowledged()) { throw new MongoClientException("Transactions do not support unacknowledged write concern"); } + + if (tracingManager.isEnabled()) { + transactionSpan = new TransactionSpan(tracingManager); + } clearTransactionContext(); setTimeoutContext(timeoutContext); } @@ -187,7 +199,7 @@ private void commitTransaction(final boolean resetTimeout) { if (transactionState == TransactionState.NONE) { throw new IllegalStateException("There is no transaction started"); } - + boolean exceptionThrown = false; try { if (messageSentInCurrentTransaction) { ReadConcern readConcern = transactionOptions.getReadConcern(); @@ -206,11 +218,20 @@ private void commitTransaction(final boolean resetTimeout) { .recoveryToken(getRecoveryToken()), readConcern, this); } } catch (MongoException e) { + exceptionThrown = true; clearTransactionContextOnError(e); + if (transactionSpan != null) { + transactionSpan.handleTransactionSpanError(e); + } throw e; } finally { transactionState = TransactionState.COMMITTED; commitInProgress = false; + if (!exceptionThrown) { + if (transactionSpan != null) { + transactionSpan.finalizeTransactionSpan(TransactionState.COMMITTED.name()); + } + } } } @@ -231,51 +252,72 @@ public T withTransaction(final TransactionBody transactionBody, final Tra long startTime = ClientSessionClock.INSTANCE.now(); TimeoutContext withTransactionTimeoutContext = createTimeoutContext(options); - outer: - while (true) { - T retVal; - try { - startTransaction(options, withTransactionTimeoutContext.copyTimeoutContext()); - retVal = transactionBody.execute(); - } catch (Throwable e) { - if (transactionState == TransactionState.IN) { - abortTransaction(); - } - if (e instanceof MongoException && !(e instanceof MongoOperationTimeoutException)) { - MongoException exceptionToHandle = OperationHelper.unwrap((MongoException) e); - if (exceptionToHandle.hasErrorLabel(TRANSIENT_TRANSACTION_ERROR_LABEL) - && ClientSessionClock.INSTANCE.now() - startTime < MAX_RETRY_TIME_LIMIT_MS) { - continue; + try { + outer: + while (true) { + T retVal; + try { + startTransaction(options, withTransactionTimeoutContext.copyTimeoutContext()); + if (transactionSpan != null) { + transactionSpan.setIsConvenientTransaction(); } - } - throw e; - } - if (transactionState == TransactionState.IN) { - while (true) { - try { - commitTransaction(false); - break; - } catch (MongoException e) { - clearTransactionContextOnError(e); - if (!(e instanceof MongoOperationTimeoutException) + retVal = transactionBody.execute(); + } catch (Throwable e) { + if (transactionState == TransactionState.IN) { + abortTransaction(); + } + if (e instanceof MongoException && !(e instanceof MongoOperationTimeoutException)) { + MongoException exceptionToHandle = OperationHelper.unwrap((MongoException) e); + if (exceptionToHandle.hasErrorLabel(TRANSIENT_TRANSACTION_ERROR_LABEL) && ClientSessionClock.INSTANCE.now() - startTime < MAX_RETRY_TIME_LIMIT_MS) { - applyMajorityWriteConcernToTransactionOptions(); + if (transactionSpan != null) { + transactionSpan.spanFinalizing(false); + } + continue; + } + } + throw e; + } + if (transactionState == TransactionState.IN) { + while (true) { + try { + commitTransaction(false); + break; + } catch (MongoException e) { + clearTransactionContextOnError(e); + if (!(e instanceof MongoOperationTimeoutException) + && ClientSessionClock.INSTANCE.now() - startTime < MAX_RETRY_TIME_LIMIT_MS) { + applyMajorityWriteConcernToTransactionOptions(); - if (!(e instanceof MongoExecutionTimeoutException) - && e.hasErrorLabel(UNKNOWN_TRANSACTION_COMMIT_RESULT_LABEL)) { - continue; - } else if (e.hasErrorLabel(TRANSIENT_TRANSACTION_ERROR_LABEL)) { - continue outer; + if (!(e instanceof MongoExecutionTimeoutException) + && e.hasErrorLabel(UNKNOWN_TRANSACTION_COMMIT_RESULT_LABEL)) { + continue; + } else if (e.hasErrorLabel(TRANSIENT_TRANSACTION_ERROR_LABEL)) { + if (transactionSpan != null) { + transactionSpan.spanFinalizing(true); + } + continue outer; + } } + throw e; } - throw e; } } + return retVal; + } + } finally { + if (transactionSpan != null) { + transactionSpan.spanFinalizing(true); } - return retVal; } } + @Override + @Nullable + public TransactionSpan getTransactionSpan() { + return transactionSpan; + } + @Override public void close() { try { diff --git a/driver-sync/src/main/com/mongodb/client/internal/MongoClientImpl.java b/driver-sync/src/main/com/mongodb/client/internal/MongoClientImpl.java index acb19fe12d9..b227539557f 100644 --- a/driver-sync/src/main/com/mongodb/client/internal/MongoClientImpl.java +++ b/driver-sync/src/main/com/mongodb/client/internal/MongoClientImpl.java @@ -48,6 +48,7 @@ import com.mongodb.internal.diagnostics.logging.Logger; import com.mongodb.internal.diagnostics.logging.Loggers; import com.mongodb.internal.session.ServerSessionPool; +import com.mongodb.internal.tracing.TracingManager; import com.mongodb.lang.Nullable; import org.bson.BsonDocument; import org.bson.Document; @@ -107,7 +108,7 @@ public MongoClientImpl(final Cluster cluster, settings.getRetryWrites(), settings.getServerApi(), new ServerSessionPool(cluster, TimeoutSettings.create(settings), settings.getServerApi()), TimeoutSettings.create(settings), settings.getUuidRepresentation(), - settings.getWriteConcern(), settings.getTracingManager()); + settings.getWriteConcern(), new TracingManager(settings.getTracer())); this.closed = new AtomicBoolean(); BsonDocument clientMetadataDocument = delegate.getCluster().getClientMetadata().getBsonDocument(); diff --git a/driver-sync/src/main/com/mongodb/client/internal/MongoClusterImpl.java b/driver-sync/src/main/com/mongodb/client/internal/MongoClusterImpl.java index 5944edae4e2..f1ea046b591 100644 --- a/driver-sync/src/main/com/mongodb/client/internal/MongoClusterImpl.java +++ b/driver-sync/src/main/com/mongodb/client/internal/MongoClusterImpl.java @@ -43,6 +43,7 @@ import com.mongodb.client.model.bulk.ClientBulkWriteResult; import com.mongodb.internal.IgnorableRequestContext; import com.mongodb.internal.TimeoutSettings; +import com.mongodb.internal.binding.BindingContext; import com.mongodb.internal.binding.ClusterAwareReadWriteBinding; import com.mongodb.internal.binding.ClusterBinding; import com.mongodb.internal.binding.ReadBinding; @@ -57,7 +58,11 @@ import com.mongodb.internal.operation.SyncOperations; import com.mongodb.internal.operation.WriteOperation; import com.mongodb.internal.session.ServerSessionPool; +import com.mongodb.internal.tracing.Span; +import com.mongodb.internal.tracing.Tags; +import com.mongodb.internal.tracing.TraceContext; import com.mongodb.internal.tracing.TracingManager; +import com.mongodb.internal.tracing.TransactionSpan; import com.mongodb.lang.Nullable; import org.bson.BsonDocument; import org.bson.Document; @@ -253,7 +258,7 @@ public ClientSession startSession(final ClientSessionOptions options) { .readPreference(readPreference) .build())) .build(); - return new ClientSessionImpl(serverSessionPool, originator, mergedOptions, operationExecutor); + return new ClientSessionImpl(serverSessionPool, originator, mergedOptions, operationExecutor, tracingManager); } @Override @@ -423,6 +428,8 @@ public T execute(final ReadOperation operation, final ReadPreference read ReadBinding binding = getReadBinding(readPreference, readConcern, actualClientSession, session == null, operation.getCommandName()); + Span span = createOperationSpan(actualClientSession, binding, operation.getCommandName()); + try { if (actualClientSession.hasActiveTransaction() && !binding.getReadPreference().equals(primary())) { throw new MongoClientException("Read preference in a transaction must be primary"); @@ -432,9 +439,15 @@ public T execute(final ReadOperation operation, final ReadPreference read MongoException exceptionToHandle = OperationHelper.unwrap(e); labelException(actualClientSession, exceptionToHandle); clearTransactionContextOnTransientTransactionError(session, exceptionToHandle); + if (span != null) { + span.error(e); + } throw e; } finally { binding.release(); + if (span != null) { + span.end(); + } } } @@ -448,15 +461,22 @@ public T execute(final WriteOperation operation, final ReadConcern readCo ClientSession actualClientSession = getClientSession(session); WriteBinding binding = getWriteBinding(readConcern, actualClientSession, session == null, operation.getCommandName()); + Span span = createOperationSpan(actualClientSession, binding, operation.getCommandName()); try { return operation.execute(binding); } catch (MongoException e) { MongoException exceptionToHandle = OperationHelper.unwrap(e); labelException(actualClientSession, exceptionToHandle); clearTransactionContextOnTransientTransactionError(session, exceptionToHandle); + if (span != null) { + span.error(e); + } throw e; } finally { binding.release(); + if (span != null) { + span.end(); + } } } @@ -503,6 +523,7 @@ private OperationContext getOperationContext(final ClientSession session, final getRequestContext(), new ReadConcernAwareNoOpSessionContext(readConcern), createTimeoutContext(session, executorTimeoutSettings), + tracingManager, serverApi, commandName); } @@ -560,5 +581,35 @@ ClientSession getClientSession(@Nullable final ClientSession clientSessionFromOp } return session; } + + /** + * Create a tracing span for the given operation, and set it on operation context. + * + * @param actualClientSession the session that the operation is part of + * @param binding the binding for the operation + * @param commandName the name of the command + */ + @Nullable + private Span createOperationSpan(ClientSession actualClientSession, BindingContext binding, String commandName) { + TracingManager tracingManager = binding.getOperationContext().getTracingManager(); + if (tracingManager.isEnabled()) { + TraceContext parentContext = null; + TransactionSpan transactionSpan = actualClientSession.getTransactionSpan(); + if (transactionSpan != null) { + parentContext = transactionSpan.getContext(); + } + + Span span = binding + .getOperationContext() + .getTracingManager() + .addSpan(commandName, parentContext); + binding.getOperationContext().setTracingContext(span.context()); + span.tag(Tags.SYSTEM, "mongodb"); + return span; + + } else { + return null; + } + } } } diff --git a/driver-sync/src/test/functional/com/mongodb/client/tracing/SpanTree.java b/driver-sync/src/test/functional/com/mongodb/client/tracing/SpanTree.java new file mode 100644 index 00000000000..bca04e6647a --- /dev/null +++ b/driver-sync/src/test/functional/com/mongodb/client/tracing/SpanTree.java @@ -0,0 +1,295 @@ +/* + * Copyright 2008-present MongoDB, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.mongodb.client.tracing; + +import com.mongodb.internal.tracing.Tags; +import com.mongodb.lang.Nullable; +import io.micrometer.tracing.test.simple.SimpleSpan; +import org.bson.BsonArray; +import org.bson.BsonBinary; +import org.bson.BsonDocument; +import org.bson.BsonString; +import org.bson.BsonValue; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.Deque; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.UUID; +import java.util.function.BiConsumer; + +import static org.bson.assertions.Assertions.notNull; +import static org.junit.jupiter.api.Assertions.fail; + +/** + * Represents a tree structure of spans, where each span can have nested spans as children. + * This class provides methods to create a span tree from various sources and to validate the spans against expected values. + */ +public class SpanTree { + private final List roots = new ArrayList<>(); + + /** + * Creates a SpanTree from a BsonArray of spans. + * + * @param spans the BsonArray containing span documents + * @return a SpanTree constructed from the provided spans + */ + public static SpanTree from(final BsonArray spans) { + SpanTree spanTree = new SpanTree(); + for (final BsonValue span : spans) { + if (span.isDocument()) { + final BsonDocument spanDoc = span.asDocument(); + final String name = spanDoc.getString("name").getValue(); + final SpanNode rootNode = new SpanNode(name); + spanTree.roots.add(rootNode); + + if (spanDoc.containsKey("tags")) { + rootNode.tags = spanDoc.getDocument("tags"); + } + + if (spanDoc.containsKey("nested")) { + for (final BsonValue nestedSpan : spanDoc.getArray("nested")) { + addNestedSpans(rootNode, nestedSpan.asDocument()); + } + } + } + } + + return spanTree; + } + + /** + * Creates a SpanTree from a JSON string representation of spans. + * + * @param spansAsJson the JSON string containing span documents + * @return a SpanTree constructed from the provided JSON spans + */ + public static SpanTree from(final String spansAsJson) { + BsonArray spans = BsonArray.parse(spansAsJson); + return from(spans); + } + + /** + * Creates a SpanTree from a Deque of SimpleSpan objects. + * This method is typically used to build a tree based on the actual collected tracing spans. + * + * @param spans the Deque containing SimpleSpan objects + * @return a SpanTree constructed from the provided spans + */ + public static SpanTree from(final Deque spans) { + final SpanTree spanTree = new SpanTree(); + final Map idToSpanNode = new HashMap<>(); + for (final SimpleSpan span : spans) { + final SpanNode spanNode = new SpanNode(span.getName()); + for (final Map.Entry tag : span.getTags().entrySet()) { + // handle special case of session id (needs to be parsed into a BsonBinary) + // this is needed because the SimpleTracer reports all the collected tags as strings + if (tag.getKey().equals(Tags.SESSION_ID)) { + spanNode.tags.append(tag.getKey(), new BsonDocument().append("id", new BsonBinary(UUID.fromString(tag.getValue())))); + } else { + spanNode.tags.append(tag.getKey(), new BsonString(tag.getValue())); + } + } + idToSpanNode.put(span.context().spanId(), spanNode); + } + + for (final SimpleSpan span : spans) { + final String parentId = span.context().parentId(); + final SpanNode node = idToSpanNode.get(span.context().spanId()); + + if (!parentId.isEmpty() && idToSpanNode.containsKey(parentId)) { + idToSpanNode.get(parentId).children.add(node); + } else { // doesn't have a parent, so it is a root node + spanTree.roots.add(node); + } + } + return spanTree; + } + + /** + * Adds nested spans to the parent node based on the provided BsonDocument. + * This method recursively adds child spans to the parent span node. + * + * @param parentNode the parent span node to which nested spans will be added + * @param nestedSpan the BsonDocument representing a nested span + */ + private static void addNestedSpans(final SpanNode parentNode, final BsonDocument nestedSpan) { + final String name = nestedSpan.getString("name").getValue(); + final SpanNode childNode = new SpanNode(name, parentNode); + + if (nestedSpan.containsKey("tags")) { + childNode.tags = nestedSpan.getDocument("tags"); + } + + if (nestedSpan.containsKey("nested")) { + for (final BsonValue nested : nestedSpan.getArray("nested")) { + addNestedSpans(childNode, nested.asDocument()); + } + } + } + + /** + * Asserts that the reported spans are valid against the expected spans. + * This method checks that the reported spans match the expected spans in terms of names, tags, and structure. + * + * @param reportedSpans the SpanTree containing the reported spans + * @param expectedSpans the SpanTree containing the expected spans + * @param valueMatcher a BiConsumer to match values of tags between reported and expected spans + * @param ignoreExtraSpans if true, allows reported spans to contain extra spans not present in expected spans + */ + public static void assertValid(final SpanTree reportedSpans, final SpanTree expectedSpans, + final BiConsumer valueMatcher, + final boolean ignoreExtraSpans) { + if (ignoreExtraSpans) { + // remove from the reported spans all the nodes that are not expected + reportedSpans.roots.removeIf(node -> !expectedSpans.roots.contains(node)); + + } + + // check that we have the same root spans + if (reportedSpans.roots.size() != expectedSpans.roots.size()) { + fail("The number of reported spans does not match expected spans size. " + + "Reported: " + reportedSpans.roots.size() + + ", Expected: " + expectedSpans.roots.size() + + " ignoreExtraSpans: " + ignoreExtraSpans); + } + + for (int i = 0; i < reportedSpans.roots.size(); i++) { + assertValid(reportedSpans.roots.get(i), expectedSpans.roots.get(i), valueMatcher); + } + } + + /** + * Asserts that a reported span node is valid against an expected span node. + * This method checks that the reported span's name, tags, and children match the expected span. + * + * @param reportedNode the reported span node to validate + * @param expectedNode the expected span node to validate against + * @param valueMatcher a BiConsumer to match values of tags between reported and expected spans + */ + private static void assertValid(final SpanNode reportedNode, final SpanNode expectedNode, + final BiConsumer valueMatcher) { + // Check that the span names match + if (!reportedNode.getName().equalsIgnoreCase(expectedNode.getName())) { + fail("Reported span name " + + reportedNode.getName() + + " does not match expected span name " + + expectedNode.getName()); + } + + valueMatcher.accept(expectedNode.tags, reportedNode.tags); + + // Spans should have the same number of children + if (reportedNode.children.size() != expectedNode.children.size()) { + fail("Reported span " + reportedNode.getName() + + " has " + reportedNode.children.size() + + " children, but expected " + expectedNode.children.size()); + } + + // For every reported child span make sure it is valid against the expected child span + for (int i = 0; i < reportedNode.children.size(); i++) { + assertValid(reportedNode.children.get(i), expectedNode.children.get(i), valueMatcher); + } + } + + @Override + public String toString() { + return "SpanTree{" + + "roots=" + roots + + '}'; + } + + @Override + public boolean equals(final Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + final SpanTree spanTree = (SpanTree) o; + return Objects.deepEquals(roots, spanTree.roots); + } + + @Override + public int hashCode() { + return Objects.hash(roots); + } + + /** + * Represents a node in the span tree, which can have nested child spans. + * Each span node contains a name, tags, and a list of child span nodes. + */ + public static class SpanNode { + private final String name; + private BsonDocument tags = new BsonDocument(); + private final List children = new ArrayList<>(); + + public SpanNode(final String name) { + this.name = notNull("name", name); + } + + public SpanNode(final String name, @Nullable final SpanNode parent) { + this.name = notNull("name", name); + if (parent != null) { + parent.children.add(this); + } + } + + public String getName() { + return name; + } + + public List getChildren() { + return Collections.unmodifiableList(children); + } + + @Override + public String toString() { + return "SpanNode{" + + "name='" + name + '\'' + + ", tags=" + tags + + ", children=" + children + + '}'; + } + + @Override + public boolean equals(final Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + final SpanNode spanNode = (SpanNode) o; + return name.equalsIgnoreCase(spanNode.name) + && Objects.equals(tags, spanNode.tags) + && Objects.equals(children, spanNode.children); + } + + @Override + public int hashCode() { + int result = name.hashCode(); + result = 31 * result + tags.hashCode(); + result = 31 * result + children.hashCode(); + return result; + } + } +} diff --git a/driver-sync/src/test/functional/com/mongodb/client/tracing/ZipkinTracer.java b/driver-sync/src/test/functional/com/mongodb/client/tracing/ZipkinTracer.java new file mode 100644 index 00000000000..305e916d213 --- /dev/null +++ b/driver-sync/src/test/functional/com/mongodb/client/tracing/ZipkinTracer.java @@ -0,0 +1,95 @@ +/* + * Copyright 2008-present MongoDB, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.mongodb.client.tracing; + +import io.micrometer.tracing.Tracer; +import io.micrometer.tracing.otel.bridge.OtelCurrentTraceContext; +import io.micrometer.tracing.otel.bridge.OtelTracer; +import io.opentelemetry.api.OpenTelemetry; +import io.opentelemetry.api.common.Attributes; +import io.opentelemetry.context.propagation.ContextPropagators; +import io.opentelemetry.exporter.zipkin.ZipkinSpanExporter; +import io.opentelemetry.extension.trace.propagation.B3Propagator; +import io.opentelemetry.sdk.OpenTelemetrySdk; +import io.opentelemetry.sdk.resources.Resource; +import io.opentelemetry.sdk.trace.SdkTracerProvider; +import io.opentelemetry.sdk.trace.SpanProcessor; +import io.opentelemetry.sdk.trace.export.SimpleSpanProcessor; +import io.opentelemetry.semconv.ResourceAttributes; + +/** + * A utility class to create a Zipkin tracer using OpenTelemetry protocol, useful for visualizing spans in Zipkin UI + * This tracer can be used to send spans to a Zipkin server. + *

+ * Spans are visible in the Zipkin UI at .... + *

+ * To Start Zipkin server, you can use the following command: + * 

{@code
+ * docker run -d -p 9411:9411 openzipkin/zipkin
+ * }
+ */ +public final class ZipkinTracer { + private static final String ENDPOINT = "http://localhost:9411/api/v2/spans"; + + private ZipkinTracer() { + } + + /** + * Creates a Zipkin tracer with the specified service name. + * + * @param serviceName the name of the service to be used in the tracer + * @return a Tracer instance configured to send spans to Zipkin + */ + public static Tracer getTracer(final String serviceName) { + ZipkinSpanExporter zipkinExporter = ZipkinSpanExporter.builder() + .setEndpoint(ENDPOINT) + .build(); + + Resource resource = Resource.getDefault() + .merge(Resource.create( + Attributes.of( + ResourceAttributes.SERVICE_NAME, serviceName, + ResourceAttributes.SERVICE_VERSION, "1.0.0" + ) + )); + + SpanProcessor spanProcessor = SimpleSpanProcessor.create(zipkinExporter); + + SdkTracerProvider tracerProvider = SdkTracerProvider.builder() + .addSpanProcessor(spanProcessor) + .setResource(resource) + .build(); + + OpenTelemetry openTelemetry = OpenTelemetrySdk.builder() + .setTracerProvider(tracerProvider) + .setPropagators(ContextPropagators.create( + B3Propagator.injectingSingleHeader() + )) + .build(); + + io.opentelemetry.api.trace.Tracer otelTracer = openTelemetry.getTracer("my-java-service", "1.0.0"); + + OtelCurrentTraceContext otelCurrentTraceContext = new OtelCurrentTraceContext(); + + return new OtelTracer( + otelTracer, + otelCurrentTraceContext, + null // EventPublisher can be null for basic usage + ); + } + +} diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 90aec4c1c38..38805b02353 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -25,6 +25,8 @@ snappy = "1.1.10.3" zstd = "1.5.5-3" jetbrains-annotations = "26.0.2" micrometer = "1.4.5" +zipkin-reporter = "2.16.3" +opentelemetry-exporter-zipkin = "1.30.0" kotlin = "1.8.10" kotlinx-coroutines-bom = "1.6.4" @@ -174,6 +176,12 @@ project-reactor-test = { module = "io.projectreactor:reactor-test" } reactive-streams-tck = { module = " org.reactivestreams:reactive-streams-tck", version.ref = "reactive-streams" } reflections = { module = "org.reflections:reflections", version.ref = "reflections" } +micrometer-tracing-test = { module = " io.micrometer:micrometer-tracing-test", version.ref = "micrometer" } +micrometer-tracing-bridge-brave = { module = " io.micrometer:micrometer-tracing-bridge-brave", version.ref = "micrometer" } +micrometer-tracing = { module = " io.micrometer:micrometer-tracing", version.ref = "micrometer" } +micrometer-tracing-bridge-otel = { module = " io.micrometer:micrometer-tracing-bridge-otel", version.ref = "micrometer" } +zipkin-reporter = { module = " io.zipkin.reporter2:zipkin-reporter", version.ref = "zipkin-reporter" } +opentelemetry-exporter-zipkin = { module = " io.opentelemetry:opentelemetry-exporter-zipkin", version.ref = "opentelemetry-exporter-zipkin" } [bundles] aws-java-sdk-v1 = ["aws-java-sdk-v1-core", "aws-java-sdk-v1-sts"] @@ -200,6 +208,9 @@ scala-test-v2-v12 = ["scala-test-flatspec-v2-v12", "scala-test-shouldmatchers-v2 scala-test-v2-v11 = ["scala-test-flatspec-v2-v11", "scala-test-shouldmatchers-v2-v11", "scala-test-mockito-v2-v11", "scala-test-junit-runner-v2-v11", "reflections"] +micrometer-test = ["micrometer-tracing-test", "micrometer-tracing-bridge-brave", "micrometer-tracing-bridge-otel", + "micrometer-tracing", "zipkin-reporter", "opentelemetry-exporter-zipkin"] + [plugins] kotlin-gradle = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } bnd = { id = "biz.aQute.bnd.builder", version.ref = "plugin-bnd" } From 33d46e8ca5f87a7f5ad96318930ab3bfe2aa8e48 Mon Sep 17 00:00:00 2001 From: Nabil Hachicha Date: Mon, 4 Aug 2025 13:00:02 +0100 Subject: [PATCH 07/36] Merging back missing changes after rebase --- .../AsyncCommandBatchCursorTest.java | 2 ++ .../MongoClientSettingsSpecification.groovy | 4 +-- ...hangeStreamBatchCursorSpecification.groovy | 4 +++ ...syncCommandBatchCursorSpecification.groovy | 2 ++ .../ChangeStreamBatchCursorTest.java | 2 ++ .../CommandBatchCursorSpecification.groovy | 2 ++ .../operation/CommandBatchCursorTest.java | 3 +++ driver-kotlin-coroutine/build.gradle.kts | 1 + driver-kotlin-sync/build.gradle.kts | 1 + .../scala/ApiAliasAndCompanionSpec.scala | 3 ++- .../mongodb/client/tracing/ZipkinTracer.java | 2 +- .../com/mongodb/client/unified/Entities.java | 26 +++++++++++++++++- .../client/unified/MicrometerTracingTest.java | 27 +++++++++++++++++++ .../internal/MongoClusterSpecification.groovy | 4 ++- 14 files changed, 77 insertions(+), 6 deletions(-) create mode 100644 driver-sync/src/test/functional/com/mongodb/client/unified/MicrometerTracingTest.java diff --git a/driver-core/src/test/functional/com/mongodb/internal/operation/AsyncCommandBatchCursorTest.java b/driver-core/src/test/functional/com/mongodb/internal/operation/AsyncCommandBatchCursorTest.java index e9a30686d5f..3708081fc26 100644 --- a/driver-core/src/test/functional/com/mongodb/internal/operation/AsyncCommandBatchCursorTest.java +++ b/driver-core/src/test/functional/com/mongodb/internal/operation/AsyncCommandBatchCursorTest.java @@ -32,6 +32,7 @@ import com.mongodb.internal.binding.AsyncConnectionSource; import com.mongodb.internal.connection.AsyncConnection; import com.mongodb.internal.connection.OperationContext; +import com.mongodb.internal.tracing.TracingManager; import org.bson.BsonArray; import org.bson.BsonDocument; import org.bson.BsonInt32; @@ -96,6 +97,7 @@ void setUp() { connectionSource = mock(AsyncConnectionSource.class); operationContext = mock(OperationContext.class); + when(operationContext.getTracingManager()).thenReturn(TracingManager.NO_OP); timeoutContext = new TimeoutContext(TimeoutSettings.create( MongoClientSettings.builder().timeout(TIMEOUT.toMillis(), MILLISECONDS).build())); serverDescription = mock(ServerDescription.class); diff --git a/driver-core/src/test/unit/com/mongodb/MongoClientSettingsSpecification.groovy b/driver-core/src/test/unit/com/mongodb/MongoClientSettingsSpecification.groovy index ec5d92b1e49..02b33aa8d27 100644 --- a/driver-core/src/test/unit/com/mongodb/MongoClientSettingsSpecification.groovy +++ b/driver-core/src/test/unit/com/mongodb/MongoClientSettingsSpecification.groovy @@ -555,7 +555,7 @@ class MongoClientSettingsSpecification extends Specification { 'heartbeatConnectTimeoutMS', 'heartbeatSocketTimeoutMS', 'inetAddressResolver', 'loggerSettingsBuilder', 'readConcern', 'readPreference', 'retryReads', 'retryWrites', 'serverApi', 'serverSettingsBuilder', 'socketSettingsBuilder', 'sslSettingsBuilder', - 'timeoutMS', 'transportSettings', 'uuidRepresentation', 'writeConcern'] + 'timeoutMS', 'tracer', 'transportSettings', 'uuidRepresentation', 'writeConcern'] then: actual == expected @@ -570,7 +570,7 @@ class MongoClientSettingsSpecification extends Specification { 'applyToSslSettings', 'autoEncryptionSettings', 'build', 'codecRegistry', 'commandListenerList', 'compressorList', 'contextProvider', 'credential', 'dnsClient', 'heartbeatConnectTimeoutMS', 'heartbeatSocketTimeoutMS', 'inetAddressResolver', 'readConcern', 'readPreference', 'retryReads', 'retryWrites', - 'serverApi', 'timeout', 'transportSettings', 'uuidRepresentation', 'writeConcern'] + 'serverApi', 'timeout', 'tracer', 'transportSettings', 'uuidRepresentation', 'writeConcern'] then: actual == expected diff --git a/driver-core/src/test/unit/com/mongodb/internal/operation/AsyncChangeStreamBatchCursorSpecification.groovy b/driver-core/src/test/unit/com/mongodb/internal/operation/AsyncChangeStreamBatchCursorSpecification.groovy index 998c0a28b6e..b7f8f0e9408 100644 --- a/driver-core/src/test/unit/com/mongodb/internal/operation/AsyncChangeStreamBatchCursorSpecification.groovy +++ b/driver-core/src/test/unit/com/mongodb/internal/operation/AsyncChangeStreamBatchCursorSpecification.groovy @@ -22,6 +22,7 @@ import com.mongodb.internal.TimeoutContext import com.mongodb.internal.async.SingleResultCallback import com.mongodb.internal.binding.AsyncReadBinding import com.mongodb.internal.connection.OperationContext +import com.mongodb.internal.tracing.TracingManager import org.bson.Document import spock.lang.Specification @@ -34,6 +35,7 @@ class AsyncChangeStreamBatchCursorSpecification extends Specification { def changeStreamOpertation = Stub(ChangeStreamOperation) def binding = Mock(AsyncReadBinding) def operationContext = Mock(OperationContext) + operationContext.getTracingManager() >> TracingManager.NO_OP def timeoutContext = Mock(TimeoutContext) binding.getOperationContext() >> operationContext operationContext.getTimeoutContext() >> timeoutContext @@ -78,6 +80,7 @@ class AsyncChangeStreamBatchCursorSpecification extends Specification { def changeStreamOpertation = Stub(ChangeStreamOperation) def binding = Mock(AsyncReadBinding) def operationContext = Mock(OperationContext) + operationContext.getTracingManager() >> TracingManager.NO_OP def timeoutContext = Mock(TimeoutContext) binding.getOperationContext() >> operationContext operationContext.getTimeoutContext() >> timeoutContext @@ -111,6 +114,7 @@ class AsyncChangeStreamBatchCursorSpecification extends Specification { def changeStreamOpertation = Stub(ChangeStreamOperation) def binding = Mock(AsyncReadBinding) def operationContext = Mock(OperationContext) + operationContext.getTracingManager() >> TracingManager.NO_OP def timeoutContext = Mock(TimeoutContext) binding.getOperationContext() >> operationContext operationContext.getTimeoutContext() >> timeoutContext diff --git a/driver-core/src/test/unit/com/mongodb/internal/operation/AsyncCommandBatchCursorSpecification.groovy b/driver-core/src/test/unit/com/mongodb/internal/operation/AsyncCommandBatchCursorSpecification.groovy index d2bcd0804bb..e3f2e525146 100644 --- a/driver-core/src/test/unit/com/mongodb/internal/operation/AsyncCommandBatchCursorSpecification.groovy +++ b/driver-core/src/test/unit/com/mongodb/internal/operation/AsyncCommandBatchCursorSpecification.groovy @@ -35,6 +35,7 @@ import com.mongodb.internal.async.SingleResultCallback import com.mongodb.internal.binding.AsyncConnectionSource import com.mongodb.internal.connection.AsyncConnection import com.mongodb.internal.connection.OperationContext +import com.mongodb.internal.tracing.TracingManager import org.bson.BsonArray import org.bson.BsonDocument import org.bson.BsonInt32 @@ -524,6 +525,7 @@ class AsyncCommandBatchCursorSpecification extends Specification { .build() } OperationContext operationContext = Mock(OperationContext) + operationContext.getTracingManager() >> TracingManager.NO_OP def timeoutContext = Spy(new TimeoutContext(TimeoutSettings.create( MongoClientSettings.builder().timeout(3, TimeUnit.SECONDS).build()))) operationContext.getTimeoutContext() >> timeoutContext diff --git a/driver-core/src/test/unit/com/mongodb/internal/operation/ChangeStreamBatchCursorTest.java b/driver-core/src/test/unit/com/mongodb/internal/operation/ChangeStreamBatchCursorTest.java index 48c3a50e79a..552afaea95b 100644 --- a/driver-core/src/test/unit/com/mongodb/internal/operation/ChangeStreamBatchCursorTest.java +++ b/driver-core/src/test/unit/com/mongodb/internal/operation/ChangeStreamBatchCursorTest.java @@ -25,6 +25,7 @@ import com.mongodb.internal.binding.ReadBinding; import com.mongodb.internal.connection.Connection; import com.mongodb.internal.connection.OperationContext; +import com.mongodb.internal.tracing.TracingManager; import org.bson.BsonDocument; import org.bson.BsonInt32; import org.bson.Document; @@ -296,6 +297,7 @@ void setUp() { doNothing().when(timeoutContext).resetTimeoutIfPresent(); operationContext = mock(OperationContext.class); + when(operationContext.getTracingManager()).thenReturn(TracingManager.NO_OP); when(operationContext.getTimeoutContext()).thenReturn(timeoutContext); connection = mock(Connection.class); when(connection.command(any(), any(), any(), any(), any(), any())).thenReturn(null); diff --git a/driver-core/src/test/unit/com/mongodb/internal/operation/CommandBatchCursorSpecification.groovy b/driver-core/src/test/unit/com/mongodb/internal/operation/CommandBatchCursorSpecification.groovy index c95a119134a..3190c1f6289 100644 --- a/driver-core/src/test/unit/com/mongodb/internal/operation/CommandBatchCursorSpecification.groovy +++ b/driver-core/src/test/unit/com/mongodb/internal/operation/CommandBatchCursorSpecification.groovy @@ -35,6 +35,7 @@ import com.mongodb.internal.TimeoutSettings import com.mongodb.internal.binding.ConnectionSource import com.mongodb.internal.connection.Connection import com.mongodb.internal.connection.OperationContext +import com.mongodb.internal.tracing.TracingManager import org.bson.BsonArray import org.bson.BsonDocument import org.bson.BsonInt32 @@ -574,6 +575,7 @@ class CommandBatchCursorSpecification extends Specification { .build() } OperationContext operationContext = Mock(OperationContext) + operationContext.getTracingManager() >> TracingManager.NO_OP def timeoutContext = Spy(new TimeoutContext(TimeoutSettings.create( MongoClientSettings.builder().timeout(3, TimeUnit.SECONDS).build()))) operationContext.getTimeoutContext() >> timeoutContext diff --git a/driver-core/src/test/unit/com/mongodb/internal/operation/CommandBatchCursorTest.java b/driver-core/src/test/unit/com/mongodb/internal/operation/CommandBatchCursorTest.java index c3bec291432..b4b4101bd56 100644 --- a/driver-core/src/test/unit/com/mongodb/internal/operation/CommandBatchCursorTest.java +++ b/driver-core/src/test/unit/com/mongodb/internal/operation/CommandBatchCursorTest.java @@ -31,6 +31,7 @@ import com.mongodb.internal.binding.ConnectionSource; import com.mongodb.internal.connection.Connection; import com.mongodb.internal.connection.OperationContext; +import com.mongodb.internal.tracing.TracingManager; import org.bson.BsonArray; import org.bson.BsonDocument; import org.bson.BsonInt32; @@ -94,6 +95,8 @@ void setUp() { connectionSource = mock(ConnectionSource.class); operationContext = mock(OperationContext.class); + when(operationContext.getTracingManager()).thenReturn(TracingManager.NO_OP); + timeoutContext = new TimeoutContext(TimeoutSettings.create( MongoClientSettings.builder().timeout(TIMEOUT.toMillis(), MILLISECONDS).build())); serverDescription = mock(ServerDescription.class); diff --git a/driver-kotlin-coroutine/build.gradle.kts b/driver-kotlin-coroutine/build.gradle.kts index 02a2bf047aa..dd127a4dd6a 100644 --- a/driver-kotlin-coroutine/build.gradle.kts +++ b/driver-kotlin-coroutine/build.gradle.kts @@ -38,6 +38,7 @@ dependencies { integrationTestImplementation(project(path = ":bson", configuration = "testArtifacts")) integrationTestImplementation(project(path = ":driver-sync", configuration = "testArtifacts")) integrationTestImplementation(project(path = ":driver-core", configuration = "testArtifacts")) + integrationTestImplementation(libs.micrometer) } configureMavenPublication { diff --git a/driver-kotlin-sync/build.gradle.kts b/driver-kotlin-sync/build.gradle.kts index 5da1a5eec26..b6113200628 100644 --- a/driver-kotlin-sync/build.gradle.kts +++ b/driver-kotlin-sync/build.gradle.kts @@ -32,6 +32,7 @@ dependencies { integrationTestImplementation(project(path = ":bson", configuration = "testArtifacts")) integrationTestImplementation(project(path = ":driver-sync", configuration = "testArtifacts")) integrationTestImplementation(project(path = ":driver-core", configuration = "testArtifacts")) + integrationTestImplementation(libs.micrometer) } configureMavenPublication { diff --git a/driver-scala/src/test/scala/org/mongodb/scala/ApiAliasAndCompanionSpec.scala b/driver-scala/src/test/scala/org/mongodb/scala/ApiAliasAndCompanionSpec.scala index a5b76965651..4e93a331776 100644 --- a/driver-scala/src/test/scala/org/mongodb/scala/ApiAliasAndCompanionSpec.scala +++ b/driver-scala/src/test/scala/org/mongodb/scala/ApiAliasAndCompanionSpec.scala @@ -94,7 +94,8 @@ class ApiAliasAndCompanionSpec extends BaseSpec { "SyncClientEncryption", "BaseClientUpdateOptions", "BaseClientDeleteOptions", - "MongoBaseInterfaceAssertions" + "MongoBaseInterfaceAssertions", + "MicrometerTracer" ) val scalaExclusions = Set( "BuildInfo", diff --git a/driver-sync/src/test/functional/com/mongodb/client/tracing/ZipkinTracer.java b/driver-sync/src/test/functional/com/mongodb/client/tracing/ZipkinTracer.java index 305e916d213..186835c6ca2 100644 --- a/driver-sync/src/test/functional/com/mongodb/client/tracing/ZipkinTracer.java +++ b/driver-sync/src/test/functional/com/mongodb/client/tracing/ZipkinTracer.java @@ -35,7 +35,7 @@ * A utility class to create a Zipkin tracer using OpenTelemetry protocol, useful for visualizing spans in Zipkin UI * This tracer can be used to send spans to a Zipkin server. *

- * Spans are visible in the Zipkin UI at .... + * Spans are visible in the Zipkin UI at http://localhost:9411. *

* To Start Zipkin server, you can use the following command: * 

{@code
diff --git a/driver-sync/src/test/functional/com/mongodb/client/unified/Entities.java b/driver-sync/src/test/functional/com/mongodb/client/unified/Entities.java
index f1429431690..4dfedf0a8d5 100644
--- a/driver-sync/src/test/functional/com/mongodb/client/unified/Entities.java
+++ b/driver-sync/src/test/functional/com/mongodb/client/unified/Entities.java
@@ -66,6 +66,9 @@
 import com.mongodb.lang.NonNull;
 import com.mongodb.lang.Nullable;
 import com.mongodb.logging.TestLoggingInterceptor;
+import com.mongodb.tracing.MicrometerTracer;
+import io.micrometer.tracing.Tracer;
+import io.micrometer.tracing.test.simple.SimpleTracer;
 import org.bson.BsonArray;
 import org.bson.BsonBoolean;
 import org.bson.BsonDocument;
@@ -112,7 +115,7 @@ public final class Entities {
     private static final Set SUPPORTED_CLIENT_ENTITY_OPTIONS = new HashSet<>(
             asList(
                     "id", "uriOptions", "serverApi", "useMultipleMongoses", "storeEventsAsEntities",
-                    "observeEvents", "observeLogMessages", "observeSensitiveCommands", "ignoreCommandMonitoringEvents"));
+                    "observeEvents", "observeLogMessages", "observeSensitiveCommands", "ignoreCommandMonitoringEvents", "tracing"));
     private final Set entityNames = new HashSet<>();
     private final Map threads = new HashMap<>();
     private final Map>> tasks = new HashMap<>();
@@ -126,6 +129,7 @@ public final class Entities {
     private final Map clientEncryptions = new HashMap<>();
     private final Map clientCommandListeners = new HashMap<>();
     private final Map clientLoggingInterceptors = new HashMap<>();
+    private final Map clientTracing = new HashMap<>();
     private final Map clientConnectionPoolListeners = new HashMap<>();
     private final Map clientServerListeners = new HashMap<>();
     private final Map clientClusterListeners = new HashMap<>();
@@ -294,6 +298,10 @@ public TestLoggingInterceptor getClientLoggingInterceptor(final String id) {
         return getEntity(id + "-logging-interceptor", clientLoggingInterceptors, "logging interceptor");
     }
 
+    public Tracer getClientTracer(final String id) {
+        return getEntity(id + "-tracing", clientTracing, "micrometer tracing");
+    }
+
     public TestConnectionPoolListener getConnectionPoolListener(final String id) {
         return getEntity(id + "-connection-pool-listener", clientConnectionPoolListeners, "connection pool listener");
     }
@@ -604,6 +612,22 @@ private void initClient(final BsonDocument entity, final String id,
             }
             clientSettingsBuilder.serverApi(serverApiBuilder.build());
         }
+
+        if (entity.containsKey("tracing")) {
+            boolean enableCommandPayload = entity.getDocument("tracing").get("enableCommandPayload", BsonBoolean.FALSE).asBoolean().getValue();
+            /* To enable Zipkin backend, uncomment the following lines and ensure you have the server started
+            (docker run -d -p 9411:9411 openzipkin/zipkin). The tests will fail but the captured spans will be
+             visible in the Zipkin UI at http://localhost:9411 for debugging purpose.
+             *
+             * Tracer tracer = ZipkinTracer.getTracer("UTR");
+             * putEntity(id + "-tracing", new SimpleTracer(), clientTracing);
+             */
+            Tracer tracer = new SimpleTracer();
+            putEntity(id + "-tracing", tracer, clientTracing);
+
+            clientSettingsBuilder.tracer(new MicrometerTracer(tracer, enableCommandPayload));
+        }
+
         MongoClientSettings clientSettings = clientSettingsBuilder.build();
 
         if (entity.containsKey("observeLogMessages")) {
diff --git a/driver-sync/src/test/functional/com/mongodb/client/unified/MicrometerTracingTest.java b/driver-sync/src/test/functional/com/mongodb/client/unified/MicrometerTracingTest.java
new file mode 100644
index 00000000000..84bc0734c5f
--- /dev/null
+++ b/driver-sync/src/test/functional/com/mongodb/client/unified/MicrometerTracingTest.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.unified;
+
+import org.junit.jupiter.params.provider.Arguments;
+
+import java.util.Collection;
+
+final class MicrometerTracingTest extends UnifiedSyncTest {
+    private static Collection data() {
+        return getTestData("tracing/tests");
+    }
+}
diff --git a/driver-sync/src/test/unit/com/mongodb/client/internal/MongoClusterSpecification.groovy b/driver-sync/src/test/unit/com/mongodb/client/internal/MongoClusterSpecification.groovy
index 62c16330950..f7b099a604d 100644
--- a/driver-sync/src/test/unit/com/mongodb/client/internal/MongoClusterSpecification.groovy
+++ b/driver-sync/src/test/unit/com/mongodb/client/internal/MongoClusterSpecification.groovy
@@ -28,6 +28,7 @@ import com.mongodb.internal.TimeoutSettings
 import com.mongodb.internal.client.model.changestream.ChangeStreamLevel
 import com.mongodb.internal.connection.Cluster
 import com.mongodb.internal.session.ServerSessionPool
+import com.mongodb.internal.tracing.TracingManager
 import org.bson.BsonDocument
 import org.bson.Document
 import org.bson.codecs.UuidCodec
@@ -258,6 +259,7 @@ class MongoClusterSpecification extends Specification {
     MongoClusterImpl createMongoCluster(final MongoClientSettings settings, final OperationExecutor operationExecutor) {
         new MongoClusterImpl(null, cluster, settings.codecRegistry, null, null,
                 originator, operationExecutor, settings.readConcern, settings.readPreference, settings.retryReads, settings.retryWrites,
-                null, serverSessionPool, TimeoutSettings.create(settings), settings.uuidRepresentation, settings.writeConcern)
+                null, serverSessionPool, TimeoutSettings.create(settings), settings.uuidRepresentation,
+                settings.writeConcern, TracingManager.NO_OP)
     }
 }

From 86f179171381bcb432db45926afcad675133e02f Mon Sep 17 00:00:00 2001
From: Nabil Hachicha 
Date: Tue, 5 Aug 2025 00:27:55 +0100
Subject: [PATCH 08/36] Fixing tests

---
 .../internal/connection/InternalStreamConnection.java  | 10 +++++-----
 .../mongodb/internal/connection/CommandHelperTest.java |  1 +
 .../LoggingCommandEventSenderSpecification.groovy      | 10 ++++++----
 .../kotlin/com/mongodb/kotlin/client/ClientSession.kt  |  4 ++++
 driver-reactive-streams/build.gradle.kts               |  3 +++
 .../com/mongodb/client/internal/MongoClusterImpl.java  |  2 +-
 6 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/driver-core/src/main/com/mongodb/internal/connection/InternalStreamConnection.java b/driver-core/src/main/com/mongodb/internal/connection/InternalStreamConnection.java
index bd3008cf927..56bcc48ce34 100644
--- a/driver-core/src/main/com/mongodb/internal/connection/InternalStreamConnection.java
+++ b/driver-core/src/main/com/mongodb/internal/connection/InternalStreamConnection.java
@@ -390,7 +390,7 @@ public  T sendAndReceive(final CommandMessage message, final Decoder decod
                 message, decoder, operationContext);
         try {
             return sendAndReceiveInternal.get();
-        } catch (Throwable e) {
+        } catch (MongoCommandException e) {
             if (reauthenticationIsTriggered(e)) {
                 return reauthenticateAndRetry(sendAndReceiveInternal, operationContext);
             }
@@ -405,8 +405,9 @@ public  void sendAndReceiveAsync(final CommandMessage message, final Decoder<
 
         AsyncSupplier sendAndReceiveAsyncInternal = c -> sendAndReceiveAsyncInternal(
                 message, decoder, operationContext, c);
-
-        beginAsync().thenSupply(sendAndReceiveAsyncInternal::getAsync).onErrorIf(this::reauthenticationIsTriggered, (t, c) -> {
+        beginAsync().thenSupply(c -> {
+            sendAndReceiveAsyncInternal.getAsync(c);
+        }).onErrorIf(e -> reauthenticationIsTriggered(e), (t, c) -> {
             reauthenticateAndRetryAsync(sendAndReceiveAsyncInternal, operationContext, c);
         }).finish(callback);
     }
@@ -1034,9 +1035,8 @@ private Span createTracingSpan(final CommandMessage message, final OperationCont
         TracingManager tracingManager = operationContext.getTracingManager();
         BsonDocument command = message.getCommandDocument(bsonOutput);
 
-//        BsonDocument command = message.getCommand();
         String commandName = command.getFirstKey();
-//        Span newSpan = tracingManager.addSpan("_____Command_____[ " + commandName + " ]", myparentContext);
+
         if (!tracingManager.isEnabled()
                 || SECURITY_SENSITIVE_COMMANDS.contains(commandName)
                 || SECURITY_SENSITIVE_HELLO_COMMANDS.contains(commandName)) {
diff --git a/driver-core/src/test/unit/com/mongodb/internal/connection/CommandHelperTest.java b/driver-core/src/test/unit/com/mongodb/internal/connection/CommandHelperTest.java
index 447a1efb5dd..f7873379c3b 100644
--- a/driver-core/src/test/unit/com/mongodb/internal/connection/CommandHelperTest.java
+++ b/driver-core/src/test/unit/com/mongodb/internal/connection/CommandHelperTest.java
@@ -118,6 +118,7 @@ void testIsCommandOk() {
         assertFalse(CommandHelper.isCommandOk(new BsonDocument()));
     }
 
+
     OperationContext createOperationContext() {
         return new OperationContext(IgnorableRequestContext.INSTANCE, NoOpSessionContext.INSTANCE,
                 new TimeoutContext(TimeoutSettings.DEFAULT), ServerApi.builder().version(ServerApiVersion.V1).build());
diff --git a/driver-core/src/test/unit/com/mongodb/internal/connection/LoggingCommandEventSenderSpecification.groovy b/driver-core/src/test/unit/com/mongodb/internal/connection/LoggingCommandEventSenderSpecification.groovy
index 6f8eaf33314..35bced971fa 100644
--- a/driver-core/src/test/unit/com/mongodb/internal/connection/LoggingCommandEventSenderSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/internal/connection/LoggingCommandEventSenderSpecification.groovy
@@ -66,7 +66,8 @@ class LoggingCommandEventSenderSpecification extends Specification {
         }
         def operationContext = OPERATION_CONTEXT
         def sender = new LoggingCommandEventSender([] as Set, [] as Set, connectionDescription, commandListener,
-                operationContext, message, bsonOutput, new StructuredLogger(logger), LoggerSettings.builder().build())
+                operationContext, message, message.getCommandDocument(bsonOutput),
+                new StructuredLogger(logger), LoggerSettings.builder().build())
 
         when:
         sender.sendStartedEvent()
@@ -111,7 +112,7 @@ class LoggingCommandEventSenderSpecification extends Specification {
         }
         def operationContext = OPERATION_CONTEXT
         def sender = new LoggingCommandEventSender([] as Set, [] as Set, connectionDescription, commandListener,
-                operationContext, message, bsonOutput, new StructuredLogger(logger),
+                operationContext, message, message.getCommandDocument(bsonOutput), new StructuredLogger(logger),
                 LoggerSettings.builder().build())
         when:
         sender.sendStartedEvent()
@@ -169,7 +170,7 @@ class LoggingCommandEventSenderSpecification extends Specification {
         def operationContext = OPERATION_CONTEXT
 
         def sender = new LoggingCommandEventSender([] as Set, [] as Set, connectionDescription, null, operationContext,
-                message, bsonOutput, new StructuredLogger(logger), LoggerSettings.builder().build())
+                message, message.getCommandDocument(bsonOutput), new StructuredLogger(logger), LoggerSettings.builder().build())
 
         when:
         sender.sendStartedEvent()
@@ -202,7 +203,8 @@ class LoggingCommandEventSenderSpecification extends Specification {
         }
         def operationContext = OPERATION_CONTEXT
         def sender = new LoggingCommandEventSender(['createUser'] as Set, [] as Set, connectionDescription, null,
-                operationContext, message, bsonOutput, new StructuredLogger(logger), LoggerSettings.builder().build())
+                operationContext, message, message.getCommandDocument(bsonOutput), new StructuredLogger(logger),
+                LoggerSettings.builder().build())
 
         when:
         sender.sendStartedEvent()
diff --git a/driver-kotlin-sync/src/main/kotlin/com/mongodb/kotlin/client/ClientSession.kt b/driver-kotlin-sync/src/main/kotlin/com/mongodb/kotlin/client/ClientSession.kt
index 9103689b251..9786f5592e6 100644
--- a/driver-kotlin-sync/src/main/kotlin/com/mongodb/kotlin/client/ClientSession.kt
+++ b/driver-kotlin-sync/src/main/kotlin/com/mongodb/kotlin/client/ClientSession.kt
@@ -18,6 +18,7 @@ package com.mongodb.kotlin.client
 import com.mongodb.ClientSessionOptions
 import com.mongodb.TransactionOptions
 import com.mongodb.client.ClientSession as JClientSession
+import com.mongodb.internal.tracing.TransactionSpan
 import java.io.Closeable
 import java.util.concurrent.TimeUnit
 
@@ -86,6 +87,9 @@ public class ClientSession(public val wrapped: JClientSession) : Closeable {
         transactionBody: () -> T,
         options: TransactionOptions = TransactionOptions.builder().build()
     ): T = wrapped.withTransaction(transactionBody, options)
+
+    /** Get the transaction span (if started). */
+    public fun getTransactionSpan(): TransactionSpan? = wrapped.getTransactionSpan()
 }
 
 /**
diff --git a/driver-reactive-streams/build.gradle.kts b/driver-reactive-streams/build.gradle.kts
index f1c758b31da..f9ac5301625 100644
--- a/driver-reactive-streams/build.gradle.kts
+++ b/driver-reactive-streams/build.gradle.kts
@@ -44,6 +44,9 @@ dependencies {
 
     // Reactive Streams TCK testing
     testImplementation(libs.reactive.streams.tck)
+
+    // Tracing
+    testImplementation(libs.micrometer)
 }
 
 configureMavenPublication {
diff --git a/driver-sync/src/main/com/mongodb/client/internal/MongoClusterImpl.java b/driver-sync/src/main/com/mongodb/client/internal/MongoClusterImpl.java
index f1ea046b591..ec2fbb5c759 100644
--- a/driver-sync/src/main/com/mongodb/client/internal/MongoClusterImpl.java
+++ b/driver-sync/src/main/com/mongodb/client/internal/MongoClusterImpl.java
@@ -590,7 +590,7 @@ ClientSession getClientSession(@Nullable final ClientSession clientSessionFromOp
          * @param commandName the name of the command
          */
         @Nullable
-        private Span createOperationSpan(ClientSession actualClientSession, BindingContext binding, String commandName) {
+        private Span createOperationSpan(final ClientSession actualClientSession, final BindingContext binding, final String commandName) {
             TracingManager tracingManager = binding.getOperationContext().getTracingManager();
             if (tracingManager.isEnabled()) {
                 TraceContext parentContext = null;

From ad5937c10ea1f0135ce97ba581e10fb74275945d Mon Sep 17 00:00:00 2001
From: "slav.babanin" 
Date: Wed, 16 Jul 2025 12:26:35 -0700
Subject: [PATCH 09/36] Decouple OperationContext from BindingContext. Make
 TimeoutContext immutable.

---
 .../com/mongodb/internal/TimeoutContext.java  | 226 +++++++----
 .../internal/async/SingleResultCallback.java  |   2 +-
 .../function/AsyncCallbackTriFunction.java    |  40 ++
 .../AsyncClusterAwareReadWriteBinding.java    |   3 +-
 .../internal/binding/AsyncClusterBinding.java |  56 ++-
 .../binding/AsyncConnectionSource.java        |   8 +-
 .../internal/binding/AsyncReadBinding.java    |   4 +-
 .../internal/binding/AsyncWriteBinding.java   |   3 +-
 .../internal/binding/BindingContext.java      |   5 +-
 .../binding/ClusterAwareReadWriteBinding.java |   3 +-
 .../internal/binding/ClusterBinding.java      |  58 ++-
 .../internal/binding/ConnectionSource.java    |   5 +-
 .../mongodb/internal/binding/ReadBinding.java |   5 +-
 .../internal/binding/SingleServerBinding.java |  35 +-
 .../internal/binding/WriteBinding.java        |   4 +-
 .../internal/connection/CommandHelper.java    |   1 -
 .../connection/DefaultConnectionPool.java     |   2 +-
 .../connection/InternalStreamConnection.java  |  21 +-
 .../InternalStreamConnectionInitializer.java  |   2 -
 .../internal/connection/OperationContext.java |  10 +
 .../connection/SaslAuthenticator.java         |  46 +--
 .../operation/AbortTransactionOperation.java  |   5 +-
 .../AbstractWriteSearchIndexOperation.java    |  24 +-
 .../operation/AggregateOperation.java         |  11 +-
 .../operation/AggregateOperationImpl.java     |  27 +-
 .../AggregateToCollectionOperation.java       |  64 ++-
 .../AsyncChangeStreamBatchCursor.java         |  75 ++--
 .../operation/AsyncCommandBatchCursor.java    | 335 ++--------------
 .../operation/AsyncCommandCoreCursor.java     | 348 +++++++++++++++++
 .../internal/operation/AsyncCoreCursor.java   |  68 ++++
 .../operation/AsyncOperationHelper.java       | 188 +++++----
 .../operation/AsyncReadOperation.java         |   3 +-
 .../operation/AsyncWriteOperation.java        |   3 +-
 .../operation/BaseFindAndModifyOperation.java |   9 +-
 .../operation/ChangeStreamBatchCursor.java    |  47 ++-
 .../operation/ChangeStreamOperation.java      |  35 +-
 .../operation/ClientBulkWriteOperation.java   |  55 +--
 .../operation/CommandBatchCursor.java         | 330 ++--------------
 .../internal/operation/CommandCoreCursor.java | 364 ++++++++++++++++++
 .../operation/CommandReadOperation.java       |  25 +-
 .../operation/CommitTransactionOperation.java |  15 +-
 .../internal/operation/CoreCursor.java        |  78 ++++
 .../operation/CountDocumentsOperation.java    |  10 +-
 .../internal/operation/CountOperation.java    |  13 +-
 .../operation/CreateCollectionOperation.java  |  23 +-
 .../operation/CreateIndexesOperation.java     |  12 +-
 .../operation/CreateViewOperation.java        |  17 +-
 .../operation/CursorResourceManagerNew.java   | 262 +++++++++++++
 .../internal/operation/DistinctOperation.java |   9 +-
 .../operation/DropCollectionOperation.java    |  38 +-
 .../operation/DropDatabaseOperation.java      |  15 +-
 .../operation/DropIndexOperation.java         |  15 +-
 .../EstimatedDocumentCountOperation.java      |  13 +-
 .../operation/ExplainCommandOperation.java    |  63 +++
 .../internal/operation/FindOperation.java     |  72 ++--
 .../operation/ListCollectionsOperation.java   |  45 ++-
 .../operation/ListDatabasesOperation.java     |  11 +-
 .../operation/ListIndexesOperation.java       |  44 ++-
 .../operation/ListSearchIndexesOperation.java |   9 +-
 .../MapReduceToCollectionOperation.java       |  21 +-
 .../MapReduceWithInlineResultsOperation.java  |  16 +-
 .../operation/MixedBulkWriteOperation.java    |  49 +--
 .../internal/operation/OperationHelper.java   |   7 +-
 .../internal/operation/ReadOperation.java     |   3 +-
 .../operation/RenameCollectionOperation.java  |  17 +-
 .../operation/SyncOperationHelper.java        | 168 ++++----
 .../operation/TransactionOperation.java       |  17 +-
 .../internal/operation/WriteOperation.java    |   3 +-
 .../session/BaseClientSessionImpl.java        |   2 +-
 .../com/mongodb/ClusterFixture.java           |  75 ++--
 .../OperationFunctionalSpecification.groovy   |  58 +--
 .../mongodb/client/test/CollectionHelper.java |  58 +--
 .../connection/ConnectionSpecification.groovy |  14 +-
 .../binding/AsyncOperationContextBinding.java |  30 +-
 .../internal/binding/AsyncSessionBinding.java |  29 +-
 .../AsyncSessionBindingSpecification.groovy   |  16 +-
 .../binding/AsyncSingleConnectionBinding.java |  22 +-
 .../binding/OperationContextBinding.java      |  22 +-
 .../internal/binding/SessionBinding.java      |  29 +-
 .../binding/SingleConnectionBinding.java      |  24 +-
 ...amSha256AuthenticationSpecification.groovy |  24 +-
 .../AggregateOperationSpecification.groovy    |  58 +--
 ...eToCollectionOperationSpecification.groovy |   6 +-
 ...AsyncCommandBatchCursorFunctionalTest.java | 101 ++---
 .../AsyncCommandBatchCursorTest.java          | 243 ++----------
 .../operation/AsyncCommandCoreCursorTest.java | 211 ++++++++++
 .../ChangeStreamOperationSpecification.groovy |  25 +-
 .../CommandBatchCursorFunctionalTest.java     | 108 +++---
 ...ountDocumentsOperationSpecification.groovy |  26 +-
 ...ateCollectionOperationSpecification.groovy |  23 +-
 ...CreateIndexesOperationSpecification.groovy |   7 +-
 .../CreateViewOperationSpecification.groovy   |   4 +-
 .../DistinctOperationSpecification.groovy     |  27 +-
 ...ropCollectionOperationSpecification.groovy |  14 +-
 .../DropDatabaseOperationSpecification.groovy |   9 +-
 .../DropIndexOperationSpecification.groovy    |   5 +-
 .../FindOperationSpecification.groovy         |  90 +++--
 ...stCollectionsOperationSpecification.groovy |  94 +++--
 ...ListDatabasesOperationSpecification.groovy |  16 +-
 .../ListIndexesOperationSpecification.groovy  |  47 ++-
 ...eToCollectionOperationSpecification.groovy |   8 +-
 ...InlineResultsOperationSpecification.groovy |  22 +-
 ...ameCollectionOperationSpecification.groovy |  13 +-
 .../src/test/resources/logback-test.xml       |   2 +-
 .../mongodb/internal/TimeoutContextTest.java  |  12 +-
 .../SingleServerBindingSpecification.groovy   |  18 +-
 .../AbstractConnectionPoolTest.java           |   3 +-
 .../DefaultServerSpecification.groovy         |   3 +-
 .../InsufficientStubbingDetectorDemoTest.java |  10 +-
 ...hangeStreamBatchCursorSpecification.groovy |  64 +--
 ...syncCommandBatchCursorSpecification.groovy |  73 ++--
 .../AsyncOperationHelperSpecification.groovy  |  23 +-
 ...hangeStreamBatchCursorSpecification.groovy |  32 +-
 .../ChangeStreamBatchCursorTest.java          | 264 +++++++++----
 .../CommandBatchCursorSpecification.groovy    |  85 ++--
 .../operation/CommandBatchCursorTest.java     | 259 +++++--------
 .../operation/CommandCoreCursorTest.java      | 177 +++++++++
 ...ansactionOperationUnitSpecification.groovy |  14 +-
 .../ListCollectionsOperationTest.java         |   8 +-
 .../OperationUnitSpecification.groovy         |  26 +-
 .../SyncOperationHelperSpecification.groovy   |  30 +-
 .../LegacyMixedBulkWriteOperation.java        |   5 +-
 .../src/main/com/mongodb/MongoClient.java     |  14 +-
 .../test/functional/com/mongodb/DBTest.java   |   3 +-
 ...ixedBulkWriteOperationSpecification.groovy |   3 +-
 .../client/internal/ClientSessionBinding.java |  61 +--
 .../internal/MapReducePublisherImpl.java      |   9 +-
 .../internal/OperationExecutorImpl.java       |  41 +-
 ...dReadOperationThenCursorReadOperation.java |   7 +-
 ...WriteOperationThenCursorReadOperation.java |   7 +-
 .../client/internal/crypt/CryptBinding.java   |  32 +-
 .../ClientSideOperationTimeoutProseTest.java  |   2 +-
 .../src/test/resources/logback-test.xml       |   2 +-
 .../ClientSessionBindingSpecification.groovy  |  79 ++--
 .../client/internal/ClientSessionBinding.java |  73 ++--
 .../mongodb/client/internal/CryptBinding.java |  30 +-
 .../internal/MapReduceIterableImpl.java       |   5 +-
 .../client/internal/MongoClusterImpl.java     |  33 +-
 ...tClientSideOperationsTimeoutProseTest.java |  31 ++
 .../src/test/resources/logback-test.xml       |   2 +-
 .../ClientSessionBindingSpecification.groovy  |  70 ++--
 141 files changed, 4089 insertions(+), 2703 deletions(-)
 create mode 100644 driver-core/src/main/com/mongodb/internal/async/function/AsyncCallbackTriFunction.java
 create mode 100644 driver-core/src/main/com/mongodb/internal/operation/AsyncCommandCoreCursor.java
 create mode 100644 driver-core/src/main/com/mongodb/internal/operation/AsyncCoreCursor.java
 create mode 100644 driver-core/src/main/com/mongodb/internal/operation/CommandCoreCursor.java
 create mode 100644 driver-core/src/main/com/mongodb/internal/operation/CoreCursor.java
 create mode 100644 driver-core/src/main/com/mongodb/internal/operation/CursorResourceManagerNew.java
 create mode 100644 driver-core/src/main/com/mongodb/internal/operation/ExplainCommandOperation.java
 create mode 100644 driver-core/src/test/functional/com/mongodb/internal/operation/AsyncCommandCoreCursorTest.java
 create mode 100644 driver-core/src/test/unit/com/mongodb/internal/operation/CommandCoreCursorTest.java

diff --git a/driver-core/src/main/com/mongodb/internal/TimeoutContext.java b/driver-core/src/main/com/mongodb/internal/TimeoutContext.java
index b4561e6fdc6..b3bdc65a9f7 100644
--- a/driver-core/src/main/com/mongodb/internal/TimeoutContext.java
+++ b/driver-core/src/main/com/mongodb/internal/TimeoutContext.java
@@ -32,7 +32,6 @@
 import static com.mongodb.internal.VisibleForTesting.AccessModifier.PRIVATE;
 import static com.mongodb.internal.time.Timeout.ZeroSemantics.ZERO_DURATION_MEANS_INFINITE;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import static java.util.concurrent.TimeUnit.NANOSECONDS;
 
 /**
  * Timeout Context.
@@ -40,18 +39,15 @@
  * 
The context for handling timeouts in relation to the Client Side Operation Timeout specification.

  */
 public class TimeoutContext {
-
-    private final boolean isMaintenanceContext;
     private final TimeoutSettings timeoutSettings;
-
     @Nullable
-    private Timeout timeout;
+    private final Timeout timeout;
     @Nullable
-    private Timeout computedServerSelectionTimeout;
-    private long minRoundTripTimeMS = 0;
-
+    private final Timeout computedServerSelectionTimeout;
     @Nullable
-    private MaxTimeSupplier maxTimeSupplier = null;
+    private final MaxTimeSupplier maxTimeSupplier;
+    private final boolean isMaintenanceContext;
+    private final long minRoundTripTimeMS;
 
     public static MongoOperationTimeoutException createMongoRoundTripTimeoutException() {
         return createMongoTimeoutException("Remaining timeoutMS is less than or equal to the server's minimum round trip time.");
@@ -110,17 +106,6 @@ public static TimeoutContext createTimeoutContext(final ClientSession session, f
        return new TimeoutContext(timeoutSettings);
     }
 
-    // Creates a copy of the timeout context that can be reset without resetting the original.
-    public TimeoutContext copyTimeoutContext() {
-        return new TimeoutContext(getTimeoutSettings(), getTimeout());
-    }
-
-    public TimeoutContext withNewlyStartedTimeout() {
-        TimeoutContext newContext = copyTimeoutContext();
-        newContext.timeout = startTimeout(newContext.timeoutSettings.getTimeoutMS());
-        return newContext;
-    }
-
     public TimeoutContext(final TimeoutSettings timeoutSettings) {
         this(false, timeoutSettings, startTimeout(timeoutSettings.getTimeoutMS()));
     }
@@ -129,9 +114,41 @@ private TimeoutContext(final TimeoutSettings timeoutSettings, @Nullable final Ti
         this(false, timeoutSettings, timeout);
     }
 
-    private TimeoutContext(final boolean isMaintenanceContext, final TimeoutSettings timeoutSettings, @Nullable final Timeout timeout) {
+    private TimeoutContext(final boolean isMaintenanceContext,
+                           final TimeoutSettings timeoutSettings,
+                           @Nullable final Timeout timeout) {
+        this(isMaintenanceContext,
+                null,
+                0,
+                timeoutSettings,
+                null,
+                timeout);
+    }
+
+    private TimeoutContext(final boolean isMaintenanceContext,
+                           @Nullable final Timeout computedServerSelectionTimeout,
+                           final long minRoundTripTimeMS,
+                           final TimeoutSettings timeoutSettings,
+                           @Nullable final MaxTimeSupplier maxTimeSupplier) {
+        this(isMaintenanceContext,
+                computedServerSelectionTimeout,
+                minRoundTripTimeMS,
+                timeoutSettings,
+                maxTimeSupplier,
+                startTimeout(timeoutSettings.getTimeoutMS()));
+    }
+
+    private TimeoutContext(final boolean isMaintenanceContext,
+                           @Nullable final Timeout computedServerSelectionTimeout,
+                           final long minRoundTripTimeMS,
+                           final TimeoutSettings timeoutSettings,
+                           @Nullable final MaxTimeSupplier maxTimeSupplier,
+                           @Nullable final Timeout timeout) {
         this.isMaintenanceContext = isMaintenanceContext;
         this.timeoutSettings = timeoutSettings;
+        this.computedServerSelectionTimeout = computedServerSelectionTimeout;
+        this.minRoundTripTimeMS = minRoundTripTimeMS;
+        this.maxTimeSupplier = maxTimeSupplier;
         this.timeout = timeout;
     }
 
@@ -152,17 +169,6 @@ public void onExpired(final Runnable onExpired) {
         Timeout.nullAsInfinite(timeout).onExpired(onExpired);
     }
 
-    /**
-     * Sets the recent min round trip time
-     * @param minRoundTripTimeMS the min round trip time
-     * @return this
-     */
-    public TimeoutContext minRoundTripTimeMS(final long minRoundTripTimeMS) {
-        isTrue("'minRoundTripTimeMS' must be a positive number", minRoundTripTimeMS >= 0);
-        this.minRoundTripTimeMS = minRoundTripTimeMS;
-        return this;
-    }
-
     @Nullable
     public Timeout timeoutIncludingRoundTrip() {
         return timeout == null ? null : timeout.shortenBy(minRoundTripTimeMS, MILLISECONDS);
@@ -237,8 +243,19 @@ private static void runWithFixedTimeout(final long ms, final LongConsumer onRema
         }
     }
 
-    public void resetToDefaultMaxTime() {
-        this.maxTimeSupplier = null;
+    /**
+     * Creates a new {@link TimeoutContext} with the same settings, but with the
+     * {@link TimeoutSettings#getMaxAwaitTimeMS()} as the maxTimeMS override which will be used
+     * in {@link #runMaxTimeMS(LongConsumer)}.
+     */
+    public TimeoutContext withMaxTimeAsMaxAwaitTimeOverride() {
+        return new TimeoutContext(
+                isMaintenanceContext,
+                computedServerSelectionTimeout,
+                minRoundTripTimeMS,
+                timeoutSettings,
+                timeoutSettings::getMaxAwaitTimeMS,
+                timeout);
     }
 
     /**
@@ -253,26 +270,77 @@ public void resetToDefaultMaxTime() {
      * If remaining CSOT timeout is less than this static timeout, then CSOT timeout will be used.
      *
      */
-    public void setMaxTimeOverride(final long maxTimeMS) {
-        this.maxTimeSupplier = () -> maxTimeMS;
+    public TimeoutContext withMaxTimeOverride(final long maxTimeMS) {
+        return new TimeoutContext(
+                isMaintenanceContext,
+                computedServerSelectionTimeout,
+                minRoundTripTimeMS,
+                timeoutSettings,
+                () -> maxTimeMS,
+                timeout);
+    }
+
+    /**
+     * Creates {@link TimeoutContext} with the default maxTimeMS behaviour in {@link #runMaxTimeMS(LongConsumer)}:
+     * - if timeoutMS is set, the remaining timeoutMS will be used as the maxTimeMS.
+     * - if timeoutMS is not set, the {@link TimeoutSettings#getMaxTimeMS()} will be used.
+     */
+    public TimeoutContext withDefaultMaxTime() {
+        return new TimeoutContext(
+                isMaintenanceContext,
+                computedServerSelectionTimeout,
+                minRoundTripTimeMS,
+                timeoutSettings,
+                null,
+                timeout);
     }
 
     /**
      * Disable the maxTimeMS override. This way the maxTimeMS will not
      * be appended to the command in the {@link CommandMessage}.
      */
-    public void disableMaxTimeOverride() {
-        this.maxTimeSupplier = () -> 0;
+    public TimeoutContext withDisabledMaxTimeOverride() {
+        return new TimeoutContext(
+                isMaintenanceContext,
+                computedServerSelectionTimeout,
+                minRoundTripTimeMS,
+                timeoutSettings,
+                () -> 0,
+                timeout);
     }
 
     /**
      * The override will be provided as the remaining value in
      * {@link #runMaxTimeMS}, where 0 is ignored.
      */
-    public void setMaxTimeOverrideToMaxCommitTime() {
-        this.maxTimeSupplier = () -> getMaxCommitTimeMS();
+    public TimeoutContext withMaxTimeOverrideAsMaxCommitTime() {
+        return new TimeoutContext(
+                isMaintenanceContext,
+                computedServerSelectionTimeout,
+                minRoundTripTimeMS,
+                timeoutSettings,
+                () -> getMaxCommitTimeMS(),
+                timeout);
+    }
+
+
+    /**
+     * Creates {@link TimeoutContext} with the recent min round trip time.
+     *
+     * @param minRoundTripTimeMS the min round trip time
+     * @return this
+     */
+    public TimeoutContext withMinRoundTripTime(final long minRoundTripTimeMS) {
+        return new TimeoutContext(
+                isMaintenanceContext,
+                computedServerSelectionTimeout,
+                minRoundTripTimeMS,
+                timeoutSettings,
+                maxTimeSupplier,
+                timeout);
     }
 
+
     @VisibleForTesting(otherwise = PRIVATE)
     public long getMaxCommitTimeMS() {
         Long maxCommitTimeMS = timeoutSettings.getMaxCommitTimeMS();
@@ -295,28 +363,45 @@ public int getConnectTimeoutMs() {
                 () -> throwMongoTimeoutException("The operation exceeded the timeout limit.")));
     }
 
-    /**
-     * @see #hasTimeoutMS()
-     */
-    @Deprecated // TODO-JAVA-5640 REMOVE method
-    public void resetTimeoutIfPresent() {
-        if (hasTimeoutMS()) {
-            timeout = startTimeout(timeoutSettings.getTimeoutMS());
-        }
-    }
-
     /**
      * Resets the timeout if this timeout context is being used by pool maintenance
      */
-    @Deprecated // TODO-JAVA-5640 REMOVE method
-    public void resetMaintenanceTimeout() {
+    public TimeoutContext withNewlyStartedTimeoutMaintenanceTimeout() {
         if (!isMaintenanceContext) {
-            return;
+            return this;
         }
-        timeout = Timeout.nullAsInfinite(timeout).call(NANOSECONDS,
-                () -> timeout,
-                (ms) -> startTimeout(timeoutSettings.getTimeoutMS()),
-                () -> startTimeout(timeoutSettings.getTimeoutMS()));
+
+        return new TimeoutContext(
+                true,
+                computedServerSelectionTimeout,
+                minRoundTripTimeMS,
+                timeoutSettings,
+                maxTimeSupplier);
+    }
+
+
+    public TimeoutContext withMinRoundTripTimeMS(final long minRoundTripTimeMS) {
+        isTrue("'minRoundTripTimeMS' must be a positive number", minRoundTripTimeMS >= 0);
+        return new TimeoutContext(isMaintenanceContext,
+                computedServerSelectionTimeout,
+                minRoundTripTimeMS,
+                timeoutSettings,
+                maxTimeSupplier,
+                timeout);
+    }
+
+    // Creates a copy of the timeout context that can be reset without resetting the original.
+    public TimeoutContext copyTimeoutContext() {
+        return new TimeoutContext(getTimeoutSettings(), getTimeout());
+    }
+
+    public TimeoutContext withNewlyStartedTimeout() {
+        return new TimeoutContext(
+                isMaintenanceContext,
+                computedServerSelectionTimeout,
+                minRoundTripTimeMS,
+                timeoutSettings,
+                maxTimeSupplier);
     }
 
     public TimeoutContext withAdditionalReadTimeout(final int additionalReadTimeout) {
@@ -383,20 +468,11 @@ public static Timeout startTimeout(@Nullable final Long timeoutMS) {
      * @return the timeout context
      */
     public Timeout computeServerSelectionTimeout() {
-        Timeout serverSelectionTimeout = StartTime.now()
-                .timeoutAfterOrInfiniteIfNegative(getTimeoutSettings().getServerSelectionTimeoutMS(), MILLISECONDS);
-
-
-        if (isMaintenanceContext || !hasTimeoutMS()) {
-            return serverSelectionTimeout;
-        }
-
-        if (timeout != null && Timeout.earliest(serverSelectionTimeout, timeout) == timeout) {
-            return timeout;
+        if (hasTimeoutMS()) {
+            return assertNotNull(timeout);
         }
 
-        computedServerSelectionTimeout = serverSelectionTimeout;
-        return computedServerSelectionTimeout;
+        return StartTime.now().timeoutAfterOrInfiniteIfNegative(getTimeoutSettings().getServerSelectionTimeoutMS(), MILLISECONDS);
     }
 
     /**
@@ -404,10 +480,16 @@ public Timeout computeServerSelectionTimeout() {
      *
      * @return a new timeout context with the cached computed server selection timeout if available or this
      */
-    public TimeoutContext withComputedServerSelectionTimeoutContext() {
-        if (this.hasTimeoutMS() && computedServerSelectionTimeout != null) {
-            return new TimeoutContext(false, timeoutSettings, computedServerSelectionTimeout);
+    public TimeoutContext withComputedServerSelectionTimeoutContextNew() {
+        if (this.hasTimeoutMS()) {
+            Timeout serverSelectionTimeout = StartTime.now()
+                    .timeoutAfterOrInfiniteIfNegative(getTimeoutSettings().getServerSelectionTimeoutMS(), MILLISECONDS);
+            if (isMaintenanceContext) {
+                return new TimeoutContext(false, timeoutSettings, serverSelectionTimeout);
+            }
+            return new TimeoutContext(false, timeoutSettings, Timeout.earliest(serverSelectionTimeout, timeout));
         }
+
         return this;
     }
 
diff --git a/driver-core/src/main/com/mongodb/internal/async/SingleResultCallback.java b/driver-core/src/main/com/mongodb/internal/async/SingleResultCallback.java
index de0771f4b57..11da1c97f75 100644
--- a/driver-core/src/main/com/mongodb/internal/async/SingleResultCallback.java
+++ b/driver-core/src/main/com/mongodb/internal/async/SingleResultCallback.java
@@ -29,7 +29,7 @@
  *
This class is not part of the public API and may be removed or changed at any time

  */
 public interface SingleResultCallback {
-    public static SingleResultCallback THEN_DO_NOTHING = (r, t) -> {};
+    SingleResultCallback THEN_DO_NOTHING = (r, t) -> {};
 
     /**
      * Called when the function completes. This method must not complete abruptly, see {@link AsyncCallbackFunction} for more details.
diff --git a/driver-core/src/main/com/mongodb/internal/async/function/AsyncCallbackTriFunction.java b/driver-core/src/main/com/mongodb/internal/async/function/AsyncCallbackTriFunction.java
new file mode 100644
index 00000000000..0df5ff8c358
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/async/function/AsyncCallbackTriFunction.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.mongodb.internal.async.function;
+
+import com.mongodb.internal.async.SingleResultCallback;
+import com.mongodb.lang.Nullable;
+
+/**
+ * An {@linkplain AsyncCallbackFunction asynchronous callback-based function} of three parameters.
+ * This class is a callback-based.
+ *
+ * 
This class is not part of the public API and may be removed or changed at any time

+ *
+ * @param  The type of the first parameter to the function.
+ * @param  The type of the second parameter to the function.
+ * @param  See {@link AsyncCallbackFunction}
+ * @see AsyncCallbackFunction
+ */
+@FunctionalInterface
+public interface AsyncCallbackTriFunction {
+    /**
+     * @param p1 The first {@code @}{@link Nullable} argument of the asynchronous function.
+     * @param p2 The second {@code @}{@link Nullable} argument of the asynchronous function.
+     * @see AsyncCallbackFunction#apply(Object, SingleResultCallback)
+     */
+    void apply(P1 p1, P2 p2, P3 p3, SingleResultCallback callback);
+}
diff --git a/driver-core/src/main/com/mongodb/internal/binding/AsyncClusterAwareReadWriteBinding.java b/driver-core/src/main/com/mongodb/internal/binding/AsyncClusterAwareReadWriteBinding.java
index c66dc321513..5de9df43174 100644
--- a/driver-core/src/main/com/mongodb/internal/binding/AsyncClusterAwareReadWriteBinding.java
+++ b/driver-core/src/main/com/mongodb/internal/binding/AsyncClusterAwareReadWriteBinding.java
@@ -18,6 +18,7 @@
 
 import com.mongodb.ServerAddress;
 import com.mongodb.internal.async.SingleResultCallback;
+import com.mongodb.internal.connection.OperationContext;
 
 /**
  * 
This class is not part of the public API and may be removed or changed at any time

@@ -30,7 +31,7 @@ public interface AsyncClusterAwareReadWriteBinding extends AsyncReadWriteBinding
      * @param serverAddress the server address
      * @param callback the to be passed the connection source
      */
-    void getConnectionSource(ServerAddress serverAddress, SingleResultCallback callback);
+    void getConnectionSource(ServerAddress serverAddress, OperationContext operationContext, SingleResultCallback callback);
 
     @Override
     AsyncClusterAwareReadWriteBinding retain();
diff --git a/driver-core/src/main/com/mongodb/internal/binding/AsyncClusterBinding.java b/driver-core/src/main/com/mongodb/internal/binding/AsyncClusterBinding.java
index fd46261a6df..322ef374381 100644
--- a/driver-core/src/main/com/mongodb/internal/binding/AsyncClusterBinding.java
+++ b/driver-core/src/main/com/mongodb/internal/binding/AsyncClusterBinding.java
@@ -25,6 +25,7 @@
 import com.mongodb.internal.connection.AsyncConnection;
 import com.mongodb.internal.connection.Cluster;
 import com.mongodb.internal.connection.OperationContext;
+import com.mongodb.internal.connection.ReadConcernAwareNoOpSessionContext;
 import com.mongodb.internal.connection.Server;
 import com.mongodb.internal.selector.ReadPreferenceServerSelector;
 import com.mongodb.internal.selector.ReadPreferenceWithFallbackServerSelector;
@@ -33,7 +34,6 @@
 import com.mongodb.selector.ServerSelector;
 
 import static com.mongodb.assertions.Assertions.notNull;
-import static java.util.concurrent.TimeUnit.NANOSECONDS;
 
 /**
  * A simple ReadWriteBinding implementation that supplies write connection sources bound to a possibly different primary each time, and a
@@ -44,24 +44,17 @@
 public class AsyncClusterBinding extends AbstractReferenceCounted implements AsyncClusterAwareReadWriteBinding {
     private final Cluster cluster;
     private final ReadPreference readPreference;
-    private final ReadConcern readConcern;
-    private final OperationContext operationContext;
 
     /**
      * Creates an instance.
      *
      * @param cluster        a non-null Cluster which will be used to select a server to bind to
      * @param readPreference a non-null ReadPreference for read operations
-     * @param readConcern    a non-null read concern
-     * @param operationContext the operation context
      * 
This class is not part of the public API and may be removed or changed at any time

      */
-    public AsyncClusterBinding(final Cluster cluster, final ReadPreference readPreference, final ReadConcern readConcern,
-            final OperationContext operationContext) {
+    public AsyncClusterBinding(final Cluster cluster, final ReadPreference readPreference) {
         this.cluster = notNull("cluster", cluster);
         this.readPreference = notNull("readPreference", readPreference);
-        this.readConcern = notNull("readConcern", readConcern);
-        this.operationContext = notNull("operationContext", operationContext);
     }
 
     @Override
@@ -76,21 +69,18 @@ public ReadPreference getReadPreference() {
     }
 
     @Override
-    public OperationContext getOperationContext() {
-        return operationContext;
-    }
-
-    @Override
-    public void getReadConnectionSource(final SingleResultCallback callback) {
-        getAsyncClusterBindingConnectionSource(new ReadPreferenceServerSelector(readPreference), callback);
+    public void getReadConnectionSource(final OperationContext operationContext,
+                                        final SingleResultCallback callback) {
+        getAsyncClusterBindingConnectionSource(new ReadPreferenceServerSelector(readPreference), operationContext, callback);
     }
 
     @Override
     public void getReadConnectionSource(final int minWireVersion, final ReadPreference fallbackReadPreference,
+                                        final OperationContext operationContext,
             final SingleResultCallback callback) {
         // Assume 5.0+ for load-balanced mode
         if (cluster.getSettings().getMode() == ClusterConnectionMode.LOAD_BALANCED) {
-            getReadConnectionSource(callback);
+            getReadConnectionSource(operationContext, callback);
         } else {
             ReadPreferenceWithFallbackServerSelector readPreferenceWithFallbackServerSelector
                     = new ReadPreferenceWithFallbackServerSelector(readPreference, minWireVersion, fallbackReadPreference);
@@ -106,16 +96,19 @@ public void getReadConnectionSource(final int minWireVersion, final ReadPreferen
     }
 
     @Override
-    public void getWriteConnectionSource(final SingleResultCallback callback) {
-        getAsyncClusterBindingConnectionSource(new WritableServerSelector(), callback);
+    public void getWriteConnectionSource(final OperationContext operationContext,
+                                         final SingleResultCallback callback) {
+        getAsyncClusterBindingConnectionSource(new WritableServerSelector(), operationContext, callback);
     }
 
     @Override
-    public void getConnectionSource(final ServerAddress serverAddress, final SingleResultCallback callback) {
-        getAsyncClusterBindingConnectionSource(new ServerAddressSelector(serverAddress), callback);
+    public void getConnectionSource(final ServerAddress serverAddress, final OperationContext operationContext,
+                                    final SingleResultCallback callback) {
+        getAsyncClusterBindingConnectionSource(new ServerAddressSelector(serverAddress), operationContext, callback);
     }
 
     private void getAsyncClusterBindingConnectionSource(final ServerSelector serverSelector,
+                                                        final OperationContext operationContext,
                                                         final SingleResultCallback callback) {
         cluster.selectServerAsync(serverSelector, operationContext, (result, t) -> {
             if (t != null) {
@@ -132,12 +125,14 @@ private final class AsyncClusterBindingConnectionSource extends AbstractReferenc
         private final ServerDescription serverDescription;
         private final ReadPreference appliedReadPreference;
 
-        private AsyncClusterBindingConnectionSource(final Server server, final ServerDescription serverDescription,
-                final ReadPreference appliedReadPreference) {
+        private AsyncClusterBindingConnectionSource(final Server server,
+                                                    final ServerDescription serverDescription,
+                                                    final ReadPreference appliedReadPreference) {
             this.server = server;
             this.serverDescription = serverDescription;
             this.appliedReadPreference = appliedReadPreference;
-            operationContext.getTimeoutContext().minRoundTripTimeMS(NANOSECONDS.toMillis(serverDescription.getMinRoundTripTimeNanos()));
+            // TODO should be calculated externaly
+            // operationContext.getTimeoutContext().minRoundTripTimeMS(NANOSECONDS.toMillis(serverDescription.getMinRoundTripTimeNanos()));
             AsyncClusterBinding.this.retain();
         }
 
@@ -146,19 +141,18 @@ public ServerDescription getServerDescription() {
             return serverDescription;
         }
 
-        @Override
-        public OperationContext getOperationContext() {
-            return operationContext;
-        }
-
         @Override
         public ReadPreference getReadPreference() {
             return appliedReadPreference;
         }
 
         @Override
-        public void getConnection(final SingleResultCallback callback) {
-            server.getConnectionAsync(operationContext, callback);
+        public void getConnection(final OperationContext operationContext, final SingleResultCallback callback) {
+            // The first read in a causally consistent session MUST not send afterClusterTime to the server
+            // (because the operationTime has not yet been determined). Therefore, we use ReadConcernAwareNoOpSessionContext to
+            // so that we do not advance clusterTime on ClientSession in given operationContext because it might not be yet set.
+            ReadConcern readConcern = operationContext.getSessionContext().getReadConcern();
+            server.getConnectionAsync(operationContext.withSessionContext(new ReadConcernAwareNoOpSessionContext(readConcern)), callback);
         }
 
         public AsyncConnectionSource retain() {
diff --git a/driver-core/src/main/com/mongodb/internal/binding/AsyncConnectionSource.java b/driver-core/src/main/com/mongodb/internal/binding/AsyncConnectionSource.java
index 5d70faf598e..aae7d6b7419 100644
--- a/driver-core/src/main/com/mongodb/internal/binding/AsyncConnectionSource.java
+++ b/driver-core/src/main/com/mongodb/internal/binding/AsyncConnectionSource.java
@@ -20,6 +20,7 @@
 import com.mongodb.connection.ServerDescription;
 import com.mongodb.internal.async.SingleResultCallback;
 import com.mongodb.internal.connection.AsyncConnection;
+import com.mongodb.internal.connection.OperationContext;
 
 /**
  * A source of connections to a single MongoDB server.
@@ -42,12 +43,7 @@ public interface AsyncConnectionSource extends BindingContext, ReferenceCounted
      */
     ReadPreference getReadPreference();
 
-    /**
-     * Gets a connection from this source.
-     *
-     * @param callback the to be passed the connection
-     */
-    void getConnection(SingleResultCallback callback);
+    void getConnection(OperationContext operationContext, SingleResultCallback callback);
 
     @Override
     AsyncConnectionSource retain();
diff --git a/driver-core/src/main/com/mongodb/internal/binding/AsyncReadBinding.java b/driver-core/src/main/com/mongodb/internal/binding/AsyncReadBinding.java
index 633091b3efb..e6d5cdfbbcf 100644
--- a/driver-core/src/main/com/mongodb/internal/binding/AsyncReadBinding.java
+++ b/driver-core/src/main/com/mongodb/internal/binding/AsyncReadBinding.java
@@ -18,6 +18,7 @@
 
 import com.mongodb.ReadPreference;
 import com.mongodb.internal.async.SingleResultCallback;
+import com.mongodb.internal.connection.OperationContext;
 
 /**
  * An asynchronous factory of connection sources to servers that can be read from and that satisfy the specified read preference.
@@ -35,7 +36,7 @@ public interface AsyncReadBinding extends BindingContext, ReferenceCounted {
      * Returns a connection source to a server that satisfies the read preference with which this instance is configured.
      * @param callback the to be passed the connection source
      */
-    void getReadConnectionSource(SingleResultCallback callback);
+    void getReadConnectionSource(OperationContext operationContext, SingleResultCallback callback);
 
     /**
      * Return a connection source that satisfies the read preference with which this instance is configured, if all connected servers have
@@ -48,6 +49,7 @@ public interface AsyncReadBinding extends BindingContext, ReferenceCounted {
      * @see com.mongodb.internal.operation.AggregateToCollectionOperation
      */
     void getReadConnectionSource(int minWireVersion, ReadPreference fallbackReadPreference,
+            OperationContext operationContext,
             SingleResultCallback callback);
 
     @Override
diff --git a/driver-core/src/main/com/mongodb/internal/binding/AsyncWriteBinding.java b/driver-core/src/main/com/mongodb/internal/binding/AsyncWriteBinding.java
index 39bdf4729c2..1dba1c245e6 100644
--- a/driver-core/src/main/com/mongodb/internal/binding/AsyncWriteBinding.java
+++ b/driver-core/src/main/com/mongodb/internal/binding/AsyncWriteBinding.java
@@ -17,6 +17,7 @@
 package com.mongodb.internal.binding;
 
 import com.mongodb.internal.async.SingleResultCallback;
+import com.mongodb.internal.connection.OperationContext;
 
 /**
  * An asynchronous factory of connection sources to servers that can be written to, e.g, a standalone, a mongos, or a replica set primary.
@@ -30,7 +31,7 @@ public interface AsyncWriteBinding extends BindingContext, ReferenceCounted {
      *
      * @param callback the to be passed the connection source
      */
-    void getWriteConnectionSource(SingleResultCallback callback);
+    void getWriteConnectionSource(OperationContext operationContext, SingleResultCallback callback);
 
     @Override
     AsyncWriteBinding retain();
diff --git a/driver-core/src/main/com/mongodb/internal/binding/BindingContext.java b/driver-core/src/main/com/mongodb/internal/binding/BindingContext.java
index c10f0fb16ac..289d9070c5e 100644
--- a/driver-core/src/main/com/mongodb/internal/binding/BindingContext.java
+++ b/driver-core/src/main/com/mongodb/internal/binding/BindingContext.java
@@ -16,9 +16,6 @@
 
 package com.mongodb.internal.binding;
 
-import com.mongodb.internal.connection.OperationContext;
-
-
 /**
  * 
This class is not part of the public API and may be removed or changed at any time

  */
@@ -29,5 +26,5 @@ public interface BindingContext {
      *
      * @return the operation context for the binding context.
      */
-    OperationContext getOperationContext();
+    // OperationContext getOperationContext();
 }
diff --git a/driver-core/src/main/com/mongodb/internal/binding/ClusterAwareReadWriteBinding.java b/driver-core/src/main/com/mongodb/internal/binding/ClusterAwareReadWriteBinding.java
index 8f7552341a7..b97b22c3a06 100644
--- a/driver-core/src/main/com/mongodb/internal/binding/ClusterAwareReadWriteBinding.java
+++ b/driver-core/src/main/com/mongodb/internal/binding/ClusterAwareReadWriteBinding.java
@@ -17,6 +17,7 @@
 package com.mongodb.internal.binding;
 
 import com.mongodb.ServerAddress;
+import com.mongodb.internal.connection.OperationContext;
 
 /**
  * This interface is not part of the public API and may be removed or changed at any time.
@@ -27,5 +28,5 @@ public interface ClusterAwareReadWriteBinding extends ReadWriteBinding {
      * Returns a connection source to the specified server address.
      * @return the connection source
      */
-    ConnectionSource getConnectionSource(ServerAddress serverAddress);
+    ConnectionSource getConnectionSource(ServerAddress serverAddress, OperationContext operationContext);
 }
diff --git a/driver-core/src/main/com/mongodb/internal/binding/ClusterBinding.java b/driver-core/src/main/com/mongodb/internal/binding/ClusterBinding.java
index cd3f8473bbb..d6f39d308ea 100644
--- a/driver-core/src/main/com/mongodb/internal/binding/ClusterBinding.java
+++ b/driver-core/src/main/com/mongodb/internal/binding/ClusterBinding.java
@@ -24,6 +24,7 @@
 import com.mongodb.internal.connection.Cluster;
 import com.mongodb.internal.connection.Connection;
 import com.mongodb.internal.connection.OperationContext;
+import com.mongodb.internal.connection.ReadConcernAwareNoOpSessionContext;
 import com.mongodb.internal.connection.Server;
 import com.mongodb.internal.connection.ServerTuple;
 import com.mongodb.internal.selector.ReadPreferenceServerSelector;
@@ -32,7 +33,6 @@
 import com.mongodb.internal.selector.WritableServerSelector;
 
 import static com.mongodb.assertions.Assertions.notNull;
-import static java.util.concurrent.TimeUnit.NANOSECONDS;
 
 /**
  * A simple ReadWriteBinding implementation that supplies write connection sources bound to a possibly different primary each time, and a
@@ -43,22 +43,15 @@
 public class ClusterBinding extends AbstractReferenceCounted implements ClusterAwareReadWriteBinding {
     private final Cluster cluster;
     private final ReadPreference readPreference;
-    private final ReadConcern readConcern;
-    private final OperationContext operationContext;
 
     /**
      * Creates an instance.
      * @param cluster          a non-null Cluster which will be used to select a server to bind to
      * @param readPreference   a non-null ReadPreference for read operations
-     * @param readConcern      a non-null read concern
-     * @param operationContext the operation context
      */
-    public ClusterBinding(final Cluster cluster, final ReadPreference readPreference, final ReadConcern readConcern,
-                          final OperationContext operationContext) {
+    public ClusterBinding(final Cluster cluster, final ReadPreference readPreference) {
         this.cluster = notNull("cluster", cluster);
         this.readPreference = notNull("readPreference", readPreference);
-        this.readConcern = notNull("readConcern", readConcern);
-        this.operationContext = notNull("operationContext", operationContext);
     }
 
     @Override
@@ -73,36 +66,39 @@ public ReadPreference getReadPreference() {
     }
 
     @Override
-    public OperationContext getOperationContext() {
-        return operationContext;
+    public ConnectionSource getReadConnectionSource(final OperationContext operationContext) {
+        return new ClusterBindingConnectionSource(
+                cluster.selectServer(new ReadPreferenceServerSelector(readPreference), operationContext),
+                readPreference);
     }
 
     @Override
-    public ConnectionSource getReadConnectionSource() {
-        return new ClusterBindingConnectionSource(cluster.selectServer(new ReadPreferenceServerSelector(readPreference), operationContext), readPreference);
-    }
-
-    @Override
-    public ConnectionSource getReadConnectionSource(final int minWireVersion, final ReadPreference fallbackReadPreference) {
+    public ConnectionSource getReadConnectionSource(final int minWireVersion, final ReadPreference fallbackReadPreference,
+                                                    final OperationContext operationContext) {
         // Assume 5.0+ for load-balanced mode
         if (cluster.getSettings().getMode() == ClusterConnectionMode.LOAD_BALANCED) {
-            return getReadConnectionSource();
+            return getReadConnectionSource(operationContext);
         } else {
             ReadPreferenceWithFallbackServerSelector readPreferenceWithFallbackServerSelector
                     = new ReadPreferenceWithFallbackServerSelector(readPreference, minWireVersion, fallbackReadPreference);
             ServerTuple serverTuple = cluster.selectServer(readPreferenceWithFallbackServerSelector, operationContext);
-            return new ClusterBindingConnectionSource(serverTuple, readPreferenceWithFallbackServerSelector.getAppliedReadPreference());
+            return new ClusterBindingConnectionSource(serverTuple,
+                    readPreferenceWithFallbackServerSelector.getAppliedReadPreference());
         }
     }
 
     @Override
-    public ConnectionSource getWriteConnectionSource() {
-        return new ClusterBindingConnectionSource(cluster.selectServer(new WritableServerSelector(), operationContext), readPreference);
+    public ConnectionSource getWriteConnectionSource(final OperationContext operationContext) {
+        return new ClusterBindingConnectionSource(
+                cluster.selectServer(new WritableServerSelector(), operationContext),
+                readPreference);
     }
 
     @Override
-    public ConnectionSource getConnectionSource(final ServerAddress serverAddress) {
-        return new ClusterBindingConnectionSource(cluster.selectServer(new ServerAddressSelector(serverAddress), operationContext), readPreference);
+    public ConnectionSource getConnectionSource(final ServerAddress serverAddress, final OperationContext operationContext) {
+        return new ClusterBindingConnectionSource(
+                cluster.selectServer(new ServerAddressSelector(serverAddress), operationContext),
+                readPreference);
     }
 
     private final class ClusterBindingConnectionSource extends AbstractReferenceCounted implements ConnectionSource {
@@ -114,7 +110,8 @@ private ClusterBindingConnectionSource(final ServerTuple serverTuple, final Read
             this.server = serverTuple.getServer();
             this.serverDescription = serverTuple.getServerDescription();
             this.appliedReadPreference = appliedReadPreference;
-            operationContext.getTimeoutContext().minRoundTripTimeMS(NANOSECONDS.toMillis(serverDescription.getMinRoundTripTimeNanos()));
+            //TODO THis has to be moved outside of the consutructor to the place where getConnectionSource is called to create a new OperationContet to use further
+            // operationContext.getTimeoutContext().minRoundTripTimeMS(NANOSECONDS.toMillis(serverDescription.getMinRoundTripTimeNanos()));
             ClusterBinding.this.retain();
         }
 
@@ -123,19 +120,18 @@ public ServerDescription getServerDescription() {
             return serverDescription;
         }
 
-        @Override
-        public OperationContext getOperationContext() {
-            return operationContext;
-        }
-
         @Override
         public ReadPreference getReadPreference() {
             return appliedReadPreference;
         }
 
         @Override
-        public Connection getConnection() {
-            return server.getConnection(operationContext);
+        public Connection getConnection(final OperationContext operationContext) {
+            // The first read in a causally consistent session MUST not send afterClusterTime to the server
+            // (because the operationTime has not yet been determined). Therefore, we use ReadConcernAwareNoOpSessionContext to
+            // so that we do not advance clusterTime on ClientSession in given operationContext because it might not be yet set.
+            ReadConcern readConcern = operationContext.getSessionContext().getReadConcern();
+            return server.getConnection(operationContext.withSessionContext(new ReadConcernAwareNoOpSessionContext(readConcern)));
         }
 
         public ConnectionSource retain() {
diff --git a/driver-core/src/main/com/mongodb/internal/binding/ConnectionSource.java b/driver-core/src/main/com/mongodb/internal/binding/ConnectionSource.java
index 90c8b85cf16..5ba3c562895 100644
--- a/driver-core/src/main/com/mongodb/internal/binding/ConnectionSource.java
+++ b/driver-core/src/main/com/mongodb/internal/binding/ConnectionSource.java
@@ -19,19 +19,20 @@
 import com.mongodb.ReadPreference;
 import com.mongodb.connection.ServerDescription;
 import com.mongodb.internal.connection.Connection;
+import com.mongodb.internal.connection.OperationContext;
 
 /**
  * A source of connections to a single MongoDB server.
  *
  * 
This class is not part of the public API and may be removed or changed at any time

  */
-public interface ConnectionSource extends BindingContext, ReferenceCounted {
+public interface ConnectionSource extends ReferenceCounted {
 
     ServerDescription getServerDescription();
 
     ReadPreference getReadPreference();
 
-    Connection getConnection();
+    Connection getConnection(OperationContext operationContext);
 
     @Override
     ConnectionSource retain();
diff --git a/driver-core/src/main/com/mongodb/internal/binding/ReadBinding.java b/driver-core/src/main/com/mongodb/internal/binding/ReadBinding.java
index ffdde848382..67c10ccbc5c 100644
--- a/driver-core/src/main/com/mongodb/internal/binding/ReadBinding.java
+++ b/driver-core/src/main/com/mongodb/internal/binding/ReadBinding.java
@@ -17,6 +17,7 @@
 package com.mongodb.internal.binding;
 
 import com.mongodb.ReadPreference;
+import com.mongodb.internal.connection.OperationContext;
 
 /**
  * A factory of connection sources to servers that can be read from and that satisfy the specified read preference.
@@ -30,7 +31,7 @@ public interface ReadBinding extends BindingContext, ReferenceCounted {
      * Returns a connection source to a server that satisfies the read preference with which this instance is configured.
      * @return the connection source
      */
-    ConnectionSource getReadConnectionSource();
+    ConnectionSource getReadConnectionSource(OperationContext operationContext);
 
     /**
      * Return a connection source that satisfies the read preference with which this instance is configured, if all connected servers have
@@ -42,7 +43,7 @@ public interface ReadBinding extends BindingContext, ReferenceCounted {
      *
      * @see com.mongodb.internal.operation.AggregateToCollectionOperation
      */
-    ConnectionSource getReadConnectionSource(int minWireVersion, ReadPreference fallbackReadPreference);
+    ConnectionSource getReadConnectionSource(int minWireVersion, ReadPreference fallbackReadPreference, OperationContext operationContext);
 
     @Override
     ReadBinding retain();
diff --git a/driver-core/src/main/com/mongodb/internal/binding/SingleServerBinding.java b/driver-core/src/main/com/mongodb/internal/binding/SingleServerBinding.java
index 7d7e948c344..50497ae2526 100644
--- a/driver-core/src/main/com/mongodb/internal/binding/SingleServerBinding.java
+++ b/driver-core/src/main/com/mongodb/internal/binding/SingleServerBinding.java
@@ -35,23 +35,21 @@
 public class SingleServerBinding extends AbstractReferenceCounted implements ReadWriteBinding {
     private final Cluster cluster;
     private final ServerAddress serverAddress;
-    private final OperationContext operationContext;
 
     /**
      * Creates an instance, defaulting to {@link com.mongodb.ReadPreference#primary()} for reads.
      * @param cluster       a non-null  Cluster which will be used to select a server to bind to
      * @param serverAddress a non-null  address of the server to bind to
-     * @param operationContext the operation context
      */
-    public SingleServerBinding(final Cluster cluster, final ServerAddress serverAddress, final OperationContext operationContext) {
+    public SingleServerBinding(final Cluster cluster, final ServerAddress serverAddress) {
         this.cluster = notNull("cluster", cluster);
         this.serverAddress = notNull("serverAddress", serverAddress);
-        this.operationContext = notNull("operationContext", operationContext);
     }
 
     @Override
-    public ConnectionSource getWriteConnectionSource() {
-        return new SingleServerBindingConnectionSource();
+    public ConnectionSource getWriteConnectionSource(final OperationContext operationContext) {
+        ServerTuple serverTuple = cluster.selectServer(new ServerAddressSelector(serverAddress), operationContext);
+        return new SingleServerBindingConnectionSource(serverTuple);
     }
 
     @Override
@@ -60,20 +58,17 @@ public ReadPreference getReadPreference() {
     }
 
     @Override
-    public ConnectionSource getReadConnectionSource() {
-        return new SingleServerBindingConnectionSource();
+    public ConnectionSource getReadConnectionSource(final OperationContext operationContext) {
+        ServerTuple serverTuple = cluster.selectServer(new ServerAddressSelector(serverAddress), operationContext);
+        return new SingleServerBindingConnectionSource(serverTuple);
     }
 
     @Override
-    public ConnectionSource getReadConnectionSource(final int minWireVersion, final ReadPreference fallbackReadPreference) {
+    public ConnectionSource getReadConnectionSource(final int minWireVersion, final ReadPreference fallbackReadPreference,
+                                                    final OperationContext operationContext) {
         throw new UnsupportedOperationException();
     }
 
-    @Override
-    public OperationContext getOperationContext() {
-        return operationContext;
-    }
-
     @Override
     public SingleServerBinding retain() {
         super.retain();
@@ -83,10 +78,9 @@ public SingleServerBinding retain() {
     private final class SingleServerBindingConnectionSource extends AbstractReferenceCounted implements ConnectionSource {
         private final ServerDescription serverDescription;
 
-        private SingleServerBindingConnectionSource() {
+        private SingleServerBindingConnectionSource(final ServerTuple serverTuple) {
             SingleServerBinding.this.retain();
-            ServerTuple serverTuple = cluster.selectServer(new ServerAddressSelector(serverAddress), operationContext);
-            serverDescription = serverTuple.getServerDescription();
+            this.serverDescription = serverTuple.getServerDescription();
         }
 
         @Override
@@ -94,18 +88,13 @@ public ServerDescription getServerDescription() {
             return serverDescription;
         }
 
-        @Override
-        public OperationContext getOperationContext() {
-            return operationContext;
-        }
-
         @Override
         public ReadPreference getReadPreference() {
             return ReadPreference.primary();
         }
 
         @Override
-        public Connection getConnection() {
+        public Connection getConnection(final OperationContext operationContext) {
             return cluster
                     .selectServer(new ServerAddressSelector(serverAddress), operationContext)
                     .getServer()
diff --git a/driver-core/src/main/com/mongodb/internal/binding/WriteBinding.java b/driver-core/src/main/com/mongodb/internal/binding/WriteBinding.java
index b0ac674489c..beeee4c3bf2 100644
--- a/driver-core/src/main/com/mongodb/internal/binding/WriteBinding.java
+++ b/driver-core/src/main/com/mongodb/internal/binding/WriteBinding.java
@@ -16,6 +16,8 @@
 
 package com.mongodb.internal.binding;
 
+import com.mongodb.internal.connection.OperationContext;
+
 /**
  * A factory of connection sources to servers that can be written to, e.g, a standalone, a mongos, or a replica set primary.
  *
@@ -27,7 +29,7 @@ public interface WriteBinding extends BindingContext, ReferenceCounted {
      *
      * @return a connection source
      */
-    ConnectionSource getWriteConnectionSource();
+    ConnectionSource getWriteConnectionSource(OperationContext operationContext);
 
     @Override
     WriteBinding retain();
diff --git a/driver-core/src/main/com/mongodb/internal/connection/CommandHelper.java b/driver-core/src/main/com/mongodb/internal/connection/CommandHelper.java
index fa7c1f0739d..9670db5af2c 100644
--- a/driver-core/src/main/com/mongodb/internal/connection/CommandHelper.java
+++ b/driver-core/src/main/com/mongodb/internal/connection/CommandHelper.java
@@ -129,7 +129,6 @@ private static CommandMessage getCommandMessage(final String database, final Bso
     public static void applyMaxTimeMS(final TimeoutContext timeoutContext, final BsonDocument command) {
         if (!timeoutContext.hasTimeoutMS()) {
             command.append("maxTimeMS", new BsonInt64(timeoutContext.getTimeoutSettings().getMaxTimeMS()));
-            timeoutContext.disableMaxTimeOverride();
         }
     }
 
diff --git a/driver-core/src/main/com/mongodb/internal/connection/DefaultConnectionPool.java b/driver-core/src/main/com/mongodb/internal/connection/DefaultConnectionPool.java
index 0ef94d559c9..ba2ed0da1de 100644
--- a/driver-core/src/main/com/mongodb/internal/connection/DefaultConnectionPool.java
+++ b/driver-core/src/main/com/mongodb/internal/connection/DefaultConnectionPool.java
@@ -449,7 +449,7 @@ void doMaintenance() {
     }
 
     private boolean shouldEnsureMinSize() {
-        return settings.getMinSize() > 0;
+        return settings.getMinSize() > -1;
     }
 
     private boolean shouldPrune(final UsageTrackingInternalConnection connection) {
diff --git a/driver-core/src/main/com/mongodb/internal/connection/InternalStreamConnection.java b/driver-core/src/main/com/mongodb/internal/connection/InternalStreamConnection.java
index c1b12f9f18a..0e9c2681e4f 100644
--- a/driver-core/src/main/com/mongodb/internal/connection/InternalStreamConnection.java
+++ b/driver-core/src/main/com/mongodb/internal/connection/InternalStreamConnection.java
@@ -75,8 +75,8 @@
 import static com.mongodb.assertions.Assertions.assertNull;
 import static com.mongodb.assertions.Assertions.isTrue;
 import static com.mongodb.assertions.Assertions.notNull;
-import static com.mongodb.internal.async.AsyncRunnable.beginAsync;
 import static com.mongodb.internal.TimeoutContext.createMongoTimeoutException;
+import static com.mongodb.internal.async.AsyncRunnable.beginAsync;
 import static com.mongodb.internal.async.ErrorHandlingResultCallback.errorHandlingCallback;
 import static com.mongodb.internal.connection.Authenticator.shouldAuthenticate;
 import static com.mongodb.internal.connection.CommandHelper.HELLO;
@@ -226,13 +226,15 @@ public int getGeneration() {
     public void open(final OperationContext originalOperationContext) {
         isTrue("Open already called", stream == null);
         stream = streamFactory.create(serverId.getAddress());
+        OperationContext operationContext = originalOperationContext;
         try {
-            OperationContext operationContext = originalOperationContext
-                    .withTimeoutContext(originalOperationContext.getTimeoutContext().withComputedServerSelectionTimeoutContext());
-
+            //COMMENT given that we already use serverSelection timeout in SyncOperationHelper, this step is not needed.
+//            OperationContext operationContext = originalOperationContext
+//                    .withTimeoutContext(originalOperationContext.getTimeoutContext().withComputedServerSelectionTimeoutContext());
             stream.open(operationContext);
-
             InternalConnectionInitializationDescription initializationDescription = connectionInitializer.startHandshake(this, operationContext);
+
+            operationContext = operationContext.withTimeoutContextOverride(TimeoutContext::withNewlyStartedTimeoutMaintenanceTimeout);
             initAfterHandshakeStart(initializationDescription);
 
             initializationDescription = connectionInitializer.finishHandshake(this, initializationDescription, operationContext);
@@ -250,9 +252,11 @@ public void open(final OperationContext originalOperationContext) {
     @Override
     public void openAsync(final OperationContext originalOperationContext, final SingleResultCallback callback) {
         assertNull(stream);
+        OperationContext operationContext = originalOperationContext;
         try {
-            OperationContext operationContext = originalOperationContext
-                    .withTimeoutContext(originalOperationContext.getTimeoutContext().withComputedServerSelectionTimeoutContext());
+            //COMMENT given that we already use serverSelection timeout in SyncOperationHelper, this step is not needed.
+//            OperationContext operationContext = originalOperationContext
+//                    .withTimeoutContext(originalOperationContext.getTimeoutContext().withComputedServerSelectionTimeoutContext());
 
             stream = streamFactory.create(serverId.getAddress());
             stream.openAsync(operationContext, new AsyncCompletionHandler() {
@@ -268,7 +272,8 @@ public void completed(@Nullable final Void aVoid) {
                                         assertNotNull(initialResult);
                                         initAfterHandshakeStart(initialResult);
                                         connectionInitializer.finishHandshakeAsync(InternalStreamConnection.this,
-                                                initialResult, operationContext, (completedResult, completedException) ->  {
+                                                initialResult, operationContext.withTimeoutContextOverride(TimeoutContext::withNewlyStartedTimeoutMaintenanceTimeout),
+                                                (completedResult, completedException) ->  {
                                                         if (completedException != null) {
                                                             close();
                                                             callback.onResult(null, completedException);
diff --git a/driver-core/src/main/com/mongodb/internal/connection/InternalStreamConnectionInitializer.java b/driver-core/src/main/com/mongodb/internal/connection/InternalStreamConnectionInitializer.java
index 79c21f33356..574a85669d0 100644
--- a/driver-core/src/main/com/mongodb/internal/connection/InternalStreamConnectionInitializer.java
+++ b/driver-core/src/main/com/mongodb/internal/connection/InternalStreamConnectionInitializer.java
@@ -144,8 +144,6 @@ private InternalConnectionInitializationDescription initializeConnectionDescript
             helloResult = executeCommand("admin", helloCommandDocument, clusterConnectionMode, serverApi, internalConnection, operationContext);
         } catch (MongoException e) {
             throw mapHelloException(e);
-        } finally {
-            operationContext.getTimeoutContext().resetMaintenanceTimeout();
         }
         setSpeculativeAuthenticateResponse(helloResult);
         return createInitializationDescription(helloResult, internalConnection, start);
diff --git a/driver-core/src/main/com/mongodb/internal/connection/OperationContext.java b/driver-core/src/main/com/mongodb/internal/connection/OperationContext.java
index 5e6adeff530..14723559f2b 100644
--- a/driver-core/src/main/com/mongodb/internal/connection/OperationContext.java
+++ b/driver-core/src/main/com/mongodb/internal/connection/OperationContext.java
@@ -15,6 +15,7 @@
  */
 package com.mongodb.internal.connection;
 
+import com.mongodb.Function;
 import com.mongodb.MongoConnectionPoolClearedException;
 import com.mongodb.RequestContext;
 import com.mongodb.ServerAddress;
@@ -33,6 +34,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
 
 import static java.util.stream.Collectors.toList;
@@ -142,6 +144,14 @@ public OperationContext withNewlyStartedTimeout() {
         return this.withTimeoutContext(tc);
     }
 
+    public OperationContext withMinRoundTripTime(final ServerDescription serverDescription) {
+        return this.withTimeoutContext(this.timeoutContext.withMinRoundTripTime(TimeUnit.NANOSECONDS.toMillis(serverDescription.getMinRoundTripTimeNanos())));
+    }
+
+    public OperationContext withTimeoutContextOverride(final Function timeoutContextOverrideFunction) {
+        return this.withTimeoutContext(timeoutContextOverrideFunction.apply(timeoutContext));
+    }
+
     public static final class ServerDeprioritization {
         @Nullable
         private ServerAddress candidate;
diff --git a/driver-core/src/main/com/mongodb/internal/connection/SaslAuthenticator.java b/driver-core/src/main/com/mongodb/internal/connection/SaslAuthenticator.java
index eeee3a31abd..059f810c611 100644
--- a/driver-core/src/main/com/mongodb/internal/connection/SaslAuthenticator.java
+++ b/driver-core/src/main/com/mongodb/internal/connection/SaslAuthenticator.java
@@ -27,6 +27,7 @@
 import com.mongodb.SubjectProvider;
 import com.mongodb.connection.ClusterConnectionMode;
 import com.mongodb.connection.ConnectionDescription;
+import com.mongodb.internal.TimeoutContext;
 import com.mongodb.internal.async.SingleResultCallback;
 import com.mongodb.internal.diagnostics.logging.Logger;
 import com.mongodb.internal.diagnostics.logging.Loggers;
@@ -63,12 +64,18 @@ abstract class SaslAuthenticator extends Authenticator implements SpeculativeAut
     }
 
     public void authenticate(final InternalConnection connection, final ConnectionDescription connectionDescription,
-                             final OperationContext operationContext) {
+                             final OperationContext originalOperationContext) {
         doAsSubject(() -> {
+            OperationContext operationContext = originalOperationContext;
             SaslClient saslClient = createSaslClient(connection.getDescription().getServerAddress(), operationContext);
             throwIfSaslClientIsNull(saslClient);
             try {
-                BsonDocument responseDocument = getNextSaslResponse(saslClient, connection, operationContext);
+                BsonDocument responseDocument = connection.opened() ? null : getSpeculativeAuthenticateResponse();
+                if (responseDocument == null) {
+                    responseDocument = getNextSaslResponse(saslClient, connection, operationContext);
+                    operationContext = operationContext.withTimeoutContextOverride(TimeoutContext::withNewlyStartedTimeoutMaintenanceTimeout);
+                }
+
                 BsonInt32 conversationId = responseDocument.getInt32("conversationId");
 
                 while (!(responseDocument.getBoolean("done")).getValue()) {
@@ -81,7 +88,7 @@ public void authenticate(final InternalConnection connection, final ConnectionDe
                     }
 
                     responseDocument = sendSaslContinue(conversationId, response, connection, operationContext);
-                    operationContext.getTimeoutContext().resetMaintenanceTimeout();
+                    operationContext = operationContext.withTimeoutContextOverride(TimeoutContext::withNewlyStartedTimeoutMaintenanceTimeout);
                 }
                 if (!saslClient.isComplete()) {
                     saslClient.evaluateChallenge((responseDocument.getBinary("payload")).getData());
@@ -117,6 +124,9 @@ void authenticateAsync(final InternalConnection connection, final ConnectionDesc
 
     public abstract String getMechanismName();
 
+    /**
+     * Does not send any commands to the server
+     */
     protected abstract SaslClient createSaslClient(ServerAddress serverAddress, OperationContext operationContext);
 
     protected void appendSaslStartOptions(final BsonDocument saslStartCommand) {
@@ -131,11 +141,6 @@ private void throwIfSaslClientIsNull(@Nullable final SaslClient saslClient) {
 
     private BsonDocument getNextSaslResponse(final SaslClient saslClient, final InternalConnection connection,
                                              final OperationContext operationContext) {
-        BsonDocument response = connection.opened() ? null : getSpeculativeAuthenticateResponse();
-        if (response != null) {
-            return response;
-        }
-
         try {
             byte[] serverResponse = saslClient.hasInitialResponse() ? saslClient.evaluateChallenge(new byte[0]) : null;
             return sendSaslStart(serverResponse, connection, operationContext);
@@ -160,7 +165,9 @@ private void getNextSaslResponseAsync(final SaslClient saslClient, final Interna
                     if (result.getBoolean("done").getValue()) {
                         verifySaslClientComplete(saslClient, result, errHandlingCallback);
                     } else {
-                        new Continuator(saslClient, result, connection, operationContext, errHandlingCallback).start();
+                        OperationContext saslContinueOperationContext =
+                                operationContext.withTimeoutContextOverride(TimeoutContext::withNewlyStartedTimeoutMaintenanceTimeout);
+                        new Continuator(saslClient, result, connection, saslContinueOperationContext, errHandlingCallback).start();
                     }
                 });
             } else if (response.getBoolean("done").getValue()) {
@@ -232,22 +239,14 @@ private BsonDocument sendSaslStart(@Nullable final byte[] outToken, final Intern
             final OperationContext operationContext) {
         BsonDocument startDocument = createSaslStartCommandDocument(outToken);
         appendSaslStartOptions(startDocument);
-        try {
             return executeCommand(getMongoCredential().getSource(), startDocument, getClusterConnectionMode(), getServerApi(), connection,
                     operationContext);
-        } finally {
-            operationContext.getTimeoutContext().resetMaintenanceTimeout();
-        }
     }
 
     private BsonDocument sendSaslContinue(final BsonInt32 conversationId, final byte[] outToken, final InternalConnection connection,
             final OperationContext operationContext) {
-        try {
             return executeCommand(getMongoCredential().getSource(), createSaslContinueDocument(conversationId, outToken),
                     getClusterConnectionMode(), getServerApi(), connection, operationContext);
-        } finally {
-            operationContext.getTimeoutContext().resetMaintenanceTimeout();
-        }
     }
 
     private void sendSaslStartAsync(@Nullable final byte[] outToken, final InternalConnection connection,
@@ -256,19 +255,13 @@ private void sendSaslStartAsync(@Nullable final byte[] outToken, final InternalC
         appendSaslStartOptions(startDocument);
 
         executeCommandAsync(getMongoCredential().getSource(), startDocument, getClusterConnectionMode(), getServerApi(), connection,
-                operationContext, (r, t) -> {
-                    operationContext.getTimeoutContext().resetMaintenanceTimeout();
-                    callback.onResult(r, t);
-                });
+                operationContext, callback::onResult);
     }
 
     private void sendSaslContinueAsync(final BsonInt32 conversationId, final byte[] outToken, final InternalConnection connection,
             final OperationContext operationContext, final SingleResultCallback callback) {
         executeCommandAsync(getMongoCredential().getSource(), createSaslContinueDocument(conversationId, outToken),
-                getClusterConnectionMode(), getServerApi(), connection, operationContext, (r, t) -> {
-                    operationContext.getTimeoutContext().resetMaintenanceTimeout();
-                    callback.onResult(r, t);
-                });
+                getClusterConnectionMode(), getServerApi(), connection, operationContext, callback::onResult);
     }
 
     protected BsonDocument createSaslStartCommandDocument(@Nullable final byte[] outToken) {
@@ -323,7 +316,7 @@ private final class Continuator implements SingleResultCallback {
         private final SaslClient saslClient;
         private final BsonDocument saslStartDocument;
         private final InternalConnection connection;
-        private final OperationContext operationContext;
+        private OperationContext operationContext;
         private final SingleResultCallback callback;
 
         Continuator(final SaslClient saslClient, final BsonDocument saslStartDocument, final InternalConnection connection,
@@ -347,6 +340,7 @@ public void onResult(@Nullable final BsonDocument result, @Nullable final Throwa
                 verifySaslClientComplete(saslClient, result, callback);
                 disposeOfSaslClient(saslClient);
             } else {
+                operationContext = operationContext.withTimeoutContextOverride(TimeoutContext::withNewlyStartedTimeoutMaintenanceTimeout);
                 continueConversation(result);
             }
         }
diff --git a/driver-core/src/main/com/mongodb/internal/operation/AbortTransactionOperation.java b/driver-core/src/main/com/mongodb/internal/operation/AbortTransactionOperation.java
index bbd7ce7300e..f440fc4f293 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/AbortTransactionOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/AbortTransactionOperation.java
@@ -50,9 +50,10 @@ protected String getCommandName() {
     @Override
     CommandCreator getCommandCreator() {
         return (operationContext, serverDescription, connectionDescription) -> {
-            operationContext.getTimeoutContext().resetToDefaultMaxTime();
             BsonDocument command = AbortTransactionOperation.super.getCommandCreator()
-                    .create(operationContext, serverDescription, connectionDescription);
+                    .create(operationContext.withTimeoutContextOverride(TimeoutContext::withDefaultMaxTime),
+                            serverDescription,
+                            connectionDescription);
             putIfNotNull(command, "recoveryToken", recoveryToken);
             return command;
         };
diff --git a/driver-core/src/main/com/mongodb/internal/operation/AbstractWriteSearchIndexOperation.java b/driver-core/src/main/com/mongodb/internal/operation/AbstractWriteSearchIndexOperation.java
index 8410a030185..e976a1f0de7 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/AbstractWriteSearchIndexOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/AbstractWriteSearchIndexOperation.java
@@ -22,6 +22,7 @@
 import com.mongodb.internal.async.SingleResultCallback;
 import com.mongodb.internal.binding.AsyncWriteBinding;
 import com.mongodb.internal.binding.WriteBinding;
+import com.mongodb.internal.connection.OperationContext;
 import com.mongodb.lang.Nullable;
 import org.bson.BsonDocument;
 
@@ -45,12 +46,12 @@ abstract class AbstractWriteSearchIndexOperation implements AsyncWriteOperation<
     }
 
     @Override
-    public Void execute(final WriteBinding binding) {
-        return withConnection(binding, connection -> {
+    public Void execute(final WriteBinding binding, final OperationContext operationContext) {
+        return withConnection(binding, operationContext, (connection, operationContextWithMinRtt) -> {
             try {
-                executeCommand(binding, namespace.getDatabaseName(), buildCommand(),
+                executeCommand(binding, operationContextWithMinRtt, namespace.getDatabaseName(), buildCommand(),
                         connection,
-                        writeConcernErrorTransformer(binding.getOperationContext().getTimeoutContext()));
+                        writeConcernErrorTransformer(operationContextWithMinRtt.getTimeoutContext()));
             } catch (MongoCommandException mongoCommandException) {
                 swallowOrThrow(mongoCommandException);
             }
@@ -59,20 +60,21 @@ public Void execute(final WriteBinding binding) {
     }
 
     @Override
-    public void executeAsync(final AsyncWriteBinding binding, final SingleResultCallback callback) {
-        withAsyncSourceAndConnection(binding::getWriteConnectionSource, false, callback,
-                (connectionSource, connection, cb) ->
-                        executeCommandAsync(binding, namespace.getDatabaseName(), buildCommand(), connection,
-                                writeConcernErrorTransformerAsync(binding.getOperationContext().getTimeoutContext()), (result, commandExecutionError) -> {
+    public void executeAsync(final AsyncWriteBinding binding, final OperationContext operationContext, final SingleResultCallback callback) {
+        withAsyncSourceAndConnection(binding::getWriteConnectionSource, false, operationContext, callback,
+                (connectionSource, connection, operationContextWithMinRtt, cb) ->
+                        executeCommandAsync(binding, operationContextWithMinRtt,  namespace.getDatabaseName(), buildCommand(), connection,
+                                writeConcernErrorTransformerAsync(operationContextWithMinRtt.getTimeoutContext()), (result, commandExecutionError) -> {
                                     try {
                                         swallowOrThrow(commandExecutionError);
+                                        //TODO why call callback and not cb?
                                         callback.onResult(result, null);
                                     } catch (Throwable mongoCommandException) {
+                                        //TODO why call callback and not cb?
                                         callback.onResult(null, mongoCommandException);
                                     }
                                 }
-                        )
-        );
+                        ));
     }
 
     /**
diff --git a/driver-core/src/main/com/mongodb/internal/operation/AggregateOperation.java b/driver-core/src/main/com/mongodb/internal/operation/AggregateOperation.java
index 1f25bc87bf9..aea1a9c3610 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/AggregateOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/AggregateOperation.java
@@ -25,6 +25,7 @@
 import com.mongodb.internal.binding.AsyncReadBinding;
 import com.mongodb.internal.binding.ReadBinding;
 import com.mongodb.internal.client.model.AggregationLevel;
+import com.mongodb.internal.connection.OperationContext;
 import com.mongodb.lang.Nullable;
 import org.bson.BsonDocument;
 import org.bson.BsonValue;
@@ -136,13 +137,13 @@ public AggregateOperation timeoutMode(@Nullable final TimeoutMode timeoutMode
     }
 
     @Override
-    public BatchCursor execute(final ReadBinding binding) {
-        return wrapped.execute(binding);
+    public BatchCursor execute(final ReadBinding binding, final OperationContext operationContext) {
+        return wrapped.execute(binding, operationContext);
     }
 
     @Override
-    public void executeAsync(final AsyncReadBinding binding, final SingleResultCallback> callback) {
-        wrapped.executeAsync(binding, callback);
+    public void executeAsync(final AsyncReadBinding binding, final OperationContext operationContext, final SingleResultCallback> callback) {
+        wrapped.executeAsync(binding, operationContext, callback);
     }
 
     public  ReadOperation asExplainableOperation(@Nullable final ExplainVerbosity verbosity, final Decoder resultDecoder) {
@@ -155,7 +156,7 @@ public  AsyncReadOperation asAsyncExplainableOperation(@Nullable final Exp
     }
 
      CommandReadOperation createExplainableOperation(@Nullable final ExplainVerbosity verbosity, final Decoder resultDecoder) {
-        return new CommandReadOperation<>(getNamespace().getDatabaseName(),
+        return new ExplainCommandOperation<>(getNamespace().getDatabaseName(),
                 (operationContext, serverDescription, connectionDescription) -> {
                     BsonDocument command = wrapped.getCommand(operationContext, UNKNOWN_WIRE_VERSION);
                     applyMaxTimeMS(operationContext.getTimeoutContext(), command);
diff --git a/driver-core/src/main/com/mongodb/internal/operation/AggregateOperationImpl.java b/driver-core/src/main/com/mongodb/internal/operation/AggregateOperationImpl.java
index 7ba2c56b874..d9c83667b00 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/AggregateOperationImpl.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/AggregateOperationImpl.java
@@ -47,7 +47,7 @@
 import static com.mongodb.internal.operation.AsyncOperationHelper.executeRetryableReadAsync;
 import static com.mongodb.internal.operation.CommandOperationHelper.CommandCreator;
 import static com.mongodb.internal.operation.OperationHelper.LOGGER;
-import static com.mongodb.internal.operation.OperationHelper.setNonTailableCursorMaxTimeSupplier;
+import static com.mongodb.internal.operation.OperationHelper.applyTimeoutModeToOperationContext;
 import static com.mongodb.internal.operation.OperationReadConcernHelper.appendReadConcernToCommand;
 import static com.mongodb.internal.operation.SyncOperationHelper.CommandReadTransformer;
 import static com.mongodb.internal.operation.SyncOperationHelper.executeRetryableRead;
@@ -186,16 +186,16 @@ AggregateOperationImpl hint(@Nullable final BsonValue hint) {
     }
 
     @Override
-    public BatchCursor execute(final ReadBinding binding) {
-        return executeRetryableRead(binding, namespace.getDatabaseName(),
+    public BatchCursor execute(final ReadBinding binding, final OperationContext operationContext) {
+        return executeRetryableRead(binding, applyTimeoutModeToOperationContext(timeoutMode, operationContext), namespace.getDatabaseName(),
                 getCommandCreator(), CommandResultDocumentCodec.create(decoder, FIELD_NAMES_WITH_RESULT),
                 transformer(), retryReads);
     }
 
     @Override
-    public void executeAsync(final AsyncReadBinding binding, final SingleResultCallback> callback) {
+    public void executeAsync(final AsyncReadBinding binding, final OperationContext operationContext, final SingleResultCallback> callback) {
         SingleResultCallback> errHandlingCallback = errorHandlingCallback(callback, LOGGER);
-        executeRetryableReadAsync(binding, namespace.getDatabaseName(),
+        executeRetryableReadAsync(binding, applyTimeoutModeToOperationContext(timeoutMode, operationContext),  namespace.getDatabaseName(),
                 getCommandCreator(), CommandResultDocumentCodec.create(decoder, FIELD_NAMES_WITH_RESULT),
                 asyncTransformer(), retryReads,
                 errHandlingCallback);
@@ -210,7 +210,6 @@ BsonDocument getCommand(final OperationContext operationContext, final int maxWi
         BsonDocument commandDocument = new BsonDocument("aggregate", aggregateTarget.create());
         appendReadConcernToCommand(operationContext.getSessionContext(), maxWireVersion, commandDocument);
         commandDocument.put("pipeline", pipelineCreator.create());
-        setNonTailableCursorMaxTimeSupplier(timeoutMode, operationContext);
         BsonDocument cursor = new BsonDocument();
         if (batchSize != null) {
             cursor.put("batchSize", new BsonInt32(batchSize));
@@ -236,15 +235,19 @@ BsonDocument getCommand(final OperationContext operationContext, final int maxWi
     }
 
     private CommandReadTransformer> transformer() {
-        return (result, source, connection) ->
-                new CommandBatchCursor<>(getTimeoutMode(), result, batchSize != null ? batchSize : 0,
-                        getMaxTimeForCursor(source.getOperationContext().getTimeoutContext()), decoder, comment, source, connection);
+        return (result, source, connection, operationContext) ->
+                new CommandBatchCursor<>(getTimeoutMode(), getMaxTimeForCursor(operationContext.getTimeoutContext()), operationContext, new CommandCoreCursor<>(
+                        result, batchSize != null ? batchSize : 0,
+                        decoder, comment, source, connection
+                ));
     }
 
     private CommandReadTransformerAsync> asyncTransformer() {
-        return (result, source, connection) ->
-            new AsyncCommandBatchCursor<>(getTimeoutMode(), result, batchSize != null ? batchSize : 0,
-                    getMaxTimeForCursor(source.getOperationContext().getTimeoutContext()), decoder, comment, source, connection);
+        return (result, source, connection, operationContext) ->
+            new AsyncCommandBatchCursor<>(getTimeoutMode(), getMaxTimeForCursor(operationContext.getTimeoutContext()),
+                    operationContext, new AsyncCommandCoreCursor<>(
+                    result, batchSize != null ? batchSize : 0, decoder, comment, source, connection
+            ));
     }
 
     private TimeoutMode getTimeoutMode() {
diff --git a/driver-core/src/main/com/mongodb/internal/operation/AggregateToCollectionOperation.java b/driver-core/src/main/com/mongodb/internal/operation/AggregateToCollectionOperation.java
index 904f85042ac..ce429fdd5b0 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/AggregateToCollectionOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/AggregateToCollectionOperation.java
@@ -26,6 +26,7 @@
 import com.mongodb.internal.binding.AsyncReadBinding;
 import com.mongodb.internal.binding.ReadBinding;
 import com.mongodb.internal.client.model.AggregationLevel;
+import com.mongodb.internal.connection.OperationContext;
 import com.mongodb.lang.Nullable;
 import org.bson.BsonArray;
 import org.bson.BsonBoolean;
@@ -39,8 +40,10 @@
 
 import static com.mongodb.assertions.Assertions.isTrueArgument;
 import static com.mongodb.assertions.Assertions.notNull;
+import static com.mongodb.internal.operation.AsyncOperationHelper.CommandReadTransformerAsync;
 import static com.mongodb.internal.operation.AsyncOperationHelper.executeRetryableReadAsync;
 import static com.mongodb.internal.operation.ServerVersionHelper.FIVE_DOT_ZERO_WIRE_VERSION;
+import static com.mongodb.internal.operation.SyncOperationHelper.CommandReadTransformer;
 import static com.mongodb.internal.operation.SyncOperationHelper.executeRetryableRead;
 import static com.mongodb.internal.operation.WriteConcernHelper.appendWriteConcernToCommand;
 import static com.mongodb.internal.operation.WriteConcernHelper.throwOnWriteConcernError;
@@ -152,30 +155,33 @@ public AggregateToCollectionOperation timeoutMode(@Nullable final TimeoutMode ti
     }
 
     @Override
-    public Void execute(final ReadBinding binding) {
-        return executeRetryableRead(binding,
-                                    () -> binding.getReadConnectionSource(FIVE_DOT_ZERO_WIRE_VERSION, ReadPreference.primary()),
-                                    namespace.getDatabaseName(),
-                                    getCommandCreator(),
-                                    new BsonDocumentCodec(), (result, source, connection) -> {
-                    throwOnWriteConcernError(result, connection.getDescription().getServerAddress(),
-                            connection.getDescription().getMaxWireVersion(), binding.getOperationContext().getTimeoutContext());
-                    return null;
-                }, false);
+    public Void execute(final ReadBinding binding, final OperationContext operationContext) {
+        return executeRetryableRead(
+                operationContext,
+                (serverSelectionOperationContext) ->
+                        binding.getReadConnectionSource(
+                                FIVE_DOT_ZERO_WIRE_VERSION,
+                                ReadPreference.primary(),
+                                serverSelectionOperationContext),
+                namespace.getDatabaseName(),
+                getCommandCreator(),
+                new BsonDocumentCodec(), transformer(), false);
     }
 
     @Override
-    public void executeAsync(final AsyncReadBinding binding, final SingleResultCallback callback) {
-        executeRetryableReadAsync(binding,
-                                  (connectionSourceCallback) ->
-                        binding.getReadConnectionSource(FIVE_DOT_ZERO_WIRE_VERSION, ReadPreference.primary(), connectionSourceCallback),
-                                  namespace.getDatabaseName(),
-                                  getCommandCreator(),
-                                  new BsonDocumentCodec(), (result, source, connection) -> {
-                    throwOnWriteConcernError(result, connection.getDescription().getServerAddress(),
-                            connection.getDescription().getMaxWireVersion(), binding.getOperationContext().getTimeoutContext());
-                    return null;
-                }, false, callback);
+    public void executeAsync(final AsyncReadBinding binding, final OperationContext operationContext,
+                             final SingleResultCallback callback) {
+        executeRetryableReadAsync(
+                binding,
+                operationContext,
+                (serverSelectionOperationContext, connectionSourceCallback) ->
+                        binding.getReadConnectionSource(FIVE_DOT_ZERO_WIRE_VERSION, ReadPreference.primary(), serverSelectionOperationContext, connectionSourceCallback),
+                namespace.getDatabaseName(),
+                getCommandCreator(),
+                new BsonDocumentCodec(),
+                asyncTransformer(),
+                false,
+                callback);
     }
 
     private CommandOperationHelper.CommandCreator getCommandCreator() {
@@ -214,4 +220,20 @@ private CommandOperationHelper.CommandCreator getCommandCreator() {
             return commandDocument;
         };
     }
+
+    private static CommandReadTransformer transformer() {
+        return (result, source, connection, operationContext) -> {
+            throwOnWriteConcernError(result, connection.getDescription().getServerAddress(),
+                    connection.getDescription().getMaxWireVersion(), operationContext.getTimeoutContext());
+            return null;
+        };
+    }
+
+    private static CommandReadTransformerAsync asyncTransformer() {
+        return (result, source, connection, operationContext) -> {
+            throwOnWriteConcernError(result, connection.getDescription().getServerAddress(),
+                    connection.getDescription().getMaxWireVersion(), operationContext.getTimeoutContext());
+            return null;
+        };
+    }
 }
diff --git a/driver-core/src/main/com/mongodb/internal/operation/AsyncChangeStreamBatchCursor.java b/driver-core/src/main/com/mongodb/internal/operation/AsyncChangeStreamBatchCursor.java
index a4cfbafedb6..78b09c36539 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/AsyncChangeStreamBatchCursor.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/AsyncChangeStreamBatchCursor.java
@@ -1,3 +1,5 @@
+package com.mongodb.internal.operation;
+
 /*
  * Copyright 2008-present MongoDB, Inc.
  *
@@ -14,14 +16,13 @@
  * limitations under the License.
  */
 
-package com.mongodb.internal.operation;
 
 import com.mongodb.MongoException;
 import com.mongodb.internal.TimeoutContext;
 import com.mongodb.internal.async.AsyncAggregateResponseBatchCursor;
-import com.mongodb.internal.async.AsyncBatchCursor;
 import com.mongodb.internal.async.SingleResultCallback;
 import com.mongodb.internal.binding.AsyncReadBinding;
+import com.mongodb.internal.connection.OperationContext;
 import com.mongodb.lang.NonNull;
 import com.mongodb.lang.Nullable;
 import org.bson.BsonDocument;
@@ -43,7 +44,7 @@
 
 final class AsyncChangeStreamBatchCursor implements AsyncAggregateResponseBatchCursor {
     private final AsyncReadBinding binding;
-    private final TimeoutContext timeoutContext;
+    private OperationContext operationContext;
     private final ChangeStreamOperation changeStreamOperation;
     private final int maxWireVersion;
 
@@ -53,40 +54,41 @@ final class AsyncChangeStreamBatchCursor implements AsyncAggregateResponseBat
      * {@code wrapped} containing {@code null} and {@link #isClosed} being {@code false}.
      * This represents a situation in which the wrapped object was closed by {@code this} but {@code this} remained open.
      */
-    private final AtomicReference> wrapped;
+    private final AtomicReference> wrapped;
     private final AtomicBoolean isClosed;
 
     AsyncChangeStreamBatchCursor(final ChangeStreamOperation changeStreamOperation,
-                                 final AsyncCommandBatchCursor wrapped,
+                                 final AsyncCoreCursor wrapped,
                                  final AsyncReadBinding binding,
+                                 final OperationContext operationContext,
                                  @Nullable final BsonDocument resumeToken,
                                  final int maxWireVersion) {
         this.changeStreamOperation = changeStreamOperation;
         this.wrapped = new AtomicReference<>(assertNotNull(wrapped));
         this.binding = binding;
         binding.retain();
-        this.timeoutContext = binding.getOperationContext().getTimeoutContext();
+        this.operationContext = operationContext.withTimeoutContextOverride(TimeoutContext::withMaxTimeAsMaxAwaitTimeOverride);
         this.resumeToken = resumeToken;
         this.maxWireVersion = maxWireVersion;
         isClosed = new AtomicBoolean();
     }
 
     @NonNull
-    AsyncCommandBatchCursor getWrapped() {
+    AsyncCoreCursor getWrapped() {
         return assertNotNull(wrapped.get());
     }
 
     @Override
     public void next(final SingleResultCallback> callback) {
-        resumeableOperation(AsyncBatchCursor::next, callback, false);
+        OperationContext operationContext = resetTimeout();
+        resumeableOperation(AsyncCoreCursor::next, callback, operationContext, false);
     }
 
     @Override
     public void close() {
-        timeoutContext.resetTimeoutIfPresent();
         if (isClosed.compareAndSet(false, true)) {
             try {
-                nullifyAndCloseWrapped();
+                nullifyAndCloseWrapped(operationContext.withNewlyStartedTimeout());
             } finally {
                 binding.release();
             }
@@ -116,7 +118,7 @@ public boolean isClosed() {
     }
 
     private boolean wrappedClosedItself() {
-        AsyncAggregateResponseBatchCursor observedWrapped = wrapped.get();
+        AsyncCoreCursor observedWrapped = wrapped.get();
         return observedWrapped != null && observedWrapped.isClosed();
     }
 
@@ -125,10 +127,10 @@ private boolean wrappedClosedItself() {
      * if {@link #wrappedClosedItself()} observes a {@linkplain AsyncAggregateResponseBatchCursor#isClosed() closed} wrapped object,
      * then it closed itself as opposed to being closed by {@code this}.
      */
-    private void nullifyAndCloseWrapped() {
-        AsyncAggregateResponseBatchCursor observedWrapped = wrapped.getAndSet(null);
+    private void nullifyAndCloseWrapped(final OperationContext operationContext) {
+        AsyncCoreCursor observedWrapped = wrapped.getAndSet(null);
         if (observedWrapped != null) {
-            observedWrapped.close();
+            observedWrapped.close(operationContext);
         }
     }
 
@@ -137,14 +139,14 @@ private void nullifyAndCloseWrapped() {
      * {@code setWrappedOrCloseIt(AsyncCommandBatchCursor)} is called concurrently with or after (in the happens-before order)
      * the method {@link #close()}.
      */
-    private void setWrappedOrCloseIt(final AsyncCommandBatchCursor newValue) {
+    private void setWrappedOrCloseIt(final AsyncCoreCursor newValue, final OperationContext operationContext) {
         if (isClosed()) {
             assertNull(wrapped.get());
-            newValue.close();
+            newValue.close(operationContext);
         } else {
             assertNull(wrapped.getAndSet(newValue));
             if (isClosed()) {
-                nullifyAndCloseWrapped();
+                nullifyAndCloseWrapped(operationContext);
             }
         }
     }
@@ -169,7 +171,7 @@ public int getMaxWireVersion() {
         return maxWireVersion;
     }
 
-    private void cachePostBatchResumeToken(final AsyncCommandBatchCursor cursor) {
+    private void cachePostBatchResumeToken(final AsyncCoreCursor cursor) {
         BsonDocument resumeToken = cursor.getPostBatchResumeToken();
         if (resumeToken != null) {
             this.resumeToken = resumeToken;
@@ -177,19 +179,23 @@ private void cachePostBatchResumeToken(final AsyncCommandBatchCursor cursor, SingleResultCallback> callback);
+        void apply(AsyncCoreCursor cursor, OperationContext operationContext,
+                   SingleResultCallback> callback);
     }
 
-    private void resumeableOperation(final AsyncBlock asyncBlock, final SingleResultCallback> callback, final boolean tryNext) {
-        timeoutContext.resetTimeoutIfPresent();
+    private void resumeableOperation(final AsyncBlock asyncBlock,
+                                     final SingleResultCallback> callback,
+                                     final OperationContext operationContext,
+                                     final boolean tryNext) {
+        //timeoutContext.resetTimeoutIfPresent(); //FIXme it was a bug, we reset timeout on retry which is against the spec. Moved to next() method.
         SingleResultCallback> errHandlingCallback = errorHandlingCallback(callback, LOGGER);
         if (isClosed()) {
             errHandlingCallback.onResult(null, new MongoException(format("%s called after the cursor was closed.",
                     tryNext ? "tryNext()" : "next()")));
             return;
         }
-        AsyncCommandBatchCursor wrappedCursor = getWrapped();
-        asyncBlock.apply(wrappedCursor, (result, t) -> {
+        AsyncCoreCursor wrappedCursor = getWrapped();
+        asyncBlock.apply(wrappedCursor, operationContext, (result, t) -> {
             if (t == null) {
                 try {
                     List convertedResults;
@@ -206,8 +212,8 @@ private void resumeableOperation(final AsyncBlock asyncBlock, final SingleResult
             } else {
                 cachePostBatchResumeToken(wrappedCursor);
                 if (isResumableError(t, maxWireVersion)) {
-                    nullifyAndCloseWrapped();
-                    retryOperation(asyncBlock, errHandlingCallback, tryNext);
+                    nullifyAndCloseWrapped(operationContext);
+                    retryOperation(asyncBlock, errHandlingCallback, operationContext, tryNext);
                 } else {
                     errHandlingCallback.onResult(null, t);
                 }
@@ -215,26 +221,29 @@ private void resumeableOperation(final AsyncBlock asyncBlock, final SingleResult
         });
     }
 
-    private void retryOperation(final AsyncBlock asyncBlock, final SingleResultCallback> callback,
+    private void retryOperation(final AsyncBlock asyncBlock,
+                                final SingleResultCallback> callback,
+                                final OperationContext operationContext,
                                 final boolean tryNext) {
-        withAsyncReadConnectionSource(binding, (source, t) -> {
+        withAsyncReadConnectionSource(binding, operationContext, (source, t) -> {
             if (t != null) {
                 callback.onResult(null, t);
             } else {
                 changeStreamOperation.setChangeStreamOptionsForResume(resumeToken,
                         assertNotNull(source).getServerDescription().getMaxWireVersion());
                 source.release();
-                changeStreamOperation.executeAsync(binding, (asyncBatchCursor, t1) -> {
+                changeStreamOperation.executeAsync(binding, operationContext, (asyncBatchCursor, t1) -> {
                     if (t1 != null) {
                         callback.onResult(null, t1);
                     } else {
                         try {
-                            setWrappedOrCloseIt(assertNotNull((AsyncChangeStreamBatchCursor) asyncBatchCursor).getWrapped());
+                            setWrappedOrCloseIt(assertNotNull((AsyncChangeStreamBatchCursor) asyncBatchCursor).getWrapped(),
+                                    operationContext);
                         } finally {
                             try {
                                 binding.release(); // release the new change stream batch cursor's reference to the binding
                             } finally {
-                                resumeableOperation(asyncBlock, callback, tryNext);
+                                resumeableOperation(asyncBlock, callback, operationContext, tryNext);
                             }
                         }
                     }
@@ -242,4 +251,10 @@ private void retryOperation(final AsyncBlock asyncBlock, final SingleResultCallb
             }
         });
     }
+
+    private OperationContext resetTimeout() {
+        operationContext = operationContext.withNewlyStartedTimeout();
+        return operationContext;
+    }
 }
+
diff --git a/driver-core/src/main/com/mongodb/internal/operation/AsyncCommandBatchCursor.java b/driver-core/src/main/com/mongodb/internal/operation/AsyncCommandBatchCursor.java
index a391458ce6f..036d91e1530 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/AsyncCommandBatchCursor.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/AsyncCommandBatchCursor.java
@@ -16,367 +16,94 @@
 
 package com.mongodb.internal.operation;
 
-import com.mongodb.MongoCommandException;
-import com.mongodb.MongoException;
-import com.mongodb.MongoNamespace;
-import com.mongodb.MongoOperationTimeoutException;
-import com.mongodb.MongoSocketException;
-import com.mongodb.ReadPreference;
-import com.mongodb.ServerAddress;
-import com.mongodb.ServerCursor;
-import com.mongodb.annotations.ThreadSafe;
 import com.mongodb.client.cursor.TimeoutMode;
-import com.mongodb.connection.ConnectionDescription;
-import com.mongodb.connection.ServerType;
-import com.mongodb.internal.TimeoutContext;
-import com.mongodb.internal.VisibleForTesting;
 import com.mongodb.internal.async.AsyncAggregateResponseBatchCursor;
 import com.mongodb.internal.async.SingleResultCallback;
-import com.mongodb.internal.async.function.AsyncCallbackSupplier;
-import com.mongodb.internal.binding.AsyncConnectionSource;
-import com.mongodb.internal.connection.AsyncConnection;
-import com.mongodb.internal.connection.Connection;
 import com.mongodb.internal.connection.OperationContext;
-import com.mongodb.internal.operation.AsyncOperationHelper.AsyncCallableConnectionWithCallback;
-import com.mongodb.internal.validator.NoOpFieldNameValidator;
 import com.mongodb.lang.Nullable;
 import org.bson.BsonDocument;
 import org.bson.BsonTimestamp;
-import org.bson.BsonValue;
-import org.bson.codecs.BsonDocumentCodec;
-import org.bson.codecs.Decoder;
 
 import java.util.List;
-import java.util.concurrent.atomic.AtomicBoolean;
 
-import static com.mongodb.assertions.Assertions.assertNotNull;
-import static com.mongodb.assertions.Assertions.assertTrue;
-import static com.mongodb.assertions.Assertions.doesNotThrow;
-import static com.mongodb.internal.async.AsyncRunnable.beginAsync;
-import static com.mongodb.internal.async.SingleResultCallback.THEN_DO_NOTHING;
-import static com.mongodb.internal.operation.CommandBatchCursorHelper.FIRST_BATCH;
-import static com.mongodb.internal.operation.CommandBatchCursorHelper.MESSAGE_IF_CLOSED_AS_CURSOR;
-import static com.mongodb.internal.operation.CommandBatchCursorHelper.NEXT_BATCH;
-import static com.mongodb.internal.operation.CommandBatchCursorHelper.getKillCursorsCommand;
-import static com.mongodb.internal.operation.CommandBatchCursorHelper.getMoreCommandDocument;
-import static com.mongodb.internal.operation.CommandBatchCursorHelper.logCommandCursorResult;
-import static com.mongodb.internal.operation.CommandBatchCursorHelper.translateCommandException;
-import static java.util.Collections.emptyList;
+public class AsyncCommandBatchCursor implements AsyncAggregateResponseBatchCursor {
 
-class AsyncCommandBatchCursor implements AsyncAggregateResponseBatchCursor {
-
-    private final MongoNamespace namespace;
-    private final Decoder decoder;
-    @Nullable
-    private final BsonValue comment;
-    private final int maxWireVersion;
-    private final boolean firstBatchEmpty;
-    private final ResourceManager resourceManager;
     private final TimeoutMode timeoutMode;
     private OperationContext operationContext;
-    private final AtomicBoolean processedInitial = new AtomicBoolean();
-    private int batchSize;
-    private volatile CommandCursorResult commandCursorResult;
-    private boolean resetTimeoutWhenClosing;
+
+    private AsyncCoreCursor wrapped;
 
     AsyncCommandBatchCursor(
             final TimeoutMode timeoutMode,
-            final BsonDocument commandCursorDocument,
-            final int batchSize, final long maxTimeMS,
-            final Decoder decoder,
-            @Nullable final BsonValue comment,
-            final AsyncConnectionSource connectionSource,
-            final AsyncConnection connection) {
-        ConnectionDescription connectionDescription = connection.getDescription();
-        this.commandCursorResult = toCommandCursorResult(connectionDescription.getServerAddress(), FIRST_BATCH, commandCursorDocument);
-        this.namespace = commandCursorResult.getNamespace();
-        this.batchSize = batchSize;
-        this.decoder = decoder;
-        this.comment = comment;
-        this.maxWireVersion = connectionDescription.getMaxWireVersion();
-        this.firstBatchEmpty = commandCursorResult.getResults().isEmpty();
+            final long maxTimeMs,
+            final OperationContext operationContext,
+            final AsyncCoreCursor wrapped) {
+        this.operationContext = operationContext.withTimeoutContextOverride(timeoutContext ->
+                timeoutContext.withMaxTimeOverride(maxTimeMs));
         this.timeoutMode = timeoutMode;
-
-        operationContext = connectionSource.getOperationContext();
-        operationContext.getTimeoutContext().setMaxTimeOverride(maxTimeMS); // TODO-JAVA-5640 with?
-
-        AsyncConnection connectionToPin = connectionSource.getServerDescription().getType() == ServerType.LOAD_BALANCER
-                ? connection : null;
-        resourceManager = new ResourceManager(namespace, connectionSource, connectionToPin, commandCursorResult.getServerCursor());
-        resetTimeoutWhenClosing = true;
+        this.wrapped = wrapped;
     }
 
     @Override
     public void next(final SingleResultCallback> callback) {
-        resourceManager.execute(funcCallback -> {
-            checkTimeoutModeAndResetTimeoutContextIfIteration();
-            ServerCursor localServerCursor = resourceManager.getServerCursor();
-            boolean serverCursorIsNull = localServerCursor == null;
-            List batchResults = emptyList();
-            if (!processedInitial.getAndSet(true) && !firstBatchEmpty) {
-                batchResults = commandCursorResult.getResults();
-            }
-
-            if (serverCursorIsNull || !batchResults.isEmpty()) {
-                funcCallback.onResult(batchResults, null);
-            } else {
-                getMore(localServerCursor, funcCallback);
-            }
-        }, callback);
+        resetTimeout();
+        wrapped.next(operationContext, callback);
     }
 
     @Override
-    public boolean isClosed() {
-        return !resourceManager.operable();
+    public void setBatchSize(final int batchSize) {
+        wrapped.setBatchSize(batchSize);
     }
 
     @Override
-    public void setBatchSize(final int batchSize) {
-        this.batchSize = batchSize;
+    public int getBatchSize() {
+        return wrapped.getBatchSize();
     }
 
     @Override
-    public int getBatchSize() {
-        return batchSize;
+    public boolean isClosed() {
+        return wrapped.isClosed();
     }
 
     @Override
     public void close() {
-        resourceManager.close();
+        wrapped.close(operationContext
+                .withTimeoutContextOverride(timeoutContext -> timeoutContext
+                        .withNewlyStartedTimeout()
+                        .withDefaultMaxTime()
+                ));
     }
 
     @Nullable
-    @VisibleForTesting(otherwise = VisibleForTesting.AccessModifier.PRIVATE)
-    ServerCursor getServerCursor() {
-        if (!resourceManager.operable()) {
-            return null;
-        }
-        return resourceManager.getServerCursor();
-    }
-
     @Override
     public BsonDocument getPostBatchResumeToken() {
-        return commandCursorResult.getPostBatchResumeToken();
+        return wrapped.getPostBatchResumeToken();
     }
 
+    @Nullable
     @Override
     public BsonTimestamp getOperationTime() {
-        return commandCursorResult.getOperationTime();
+        return wrapped.getOperationTime();
     }
 
     @Override
     public boolean isFirstBatchEmpty() {
-        return firstBatchEmpty;
+        return wrapped.isFirstBatchEmpty();
     }
 
     @Override
     public int getMaxWireVersion() {
-        return maxWireVersion;
+        return wrapped.getMaxWireVersion();
     }
 
-    void checkTimeoutModeAndResetTimeoutContextIfIteration() {
+    private void resetTimeout() {
         if (timeoutMode == TimeoutMode.ITERATION) {
             operationContext = operationContext.withNewlyStartedTimeout();
         }
     }
 
-    private void getMore(final ServerCursor cursor, final SingleResultCallback> callback) {
-        resourceManager.executeWithConnection((connection, wrappedCallback) ->
-                getMoreLoop(assertNotNull(connection), cursor, wrappedCallback), callback);
-    }
-
-    private void getMoreLoop(final AsyncConnection connection, final ServerCursor serverCursor,
-            final SingleResultCallback> callback) {
-        connection.commandAsync(namespace.getDatabaseName(),
-                getMoreCommandDocument(serverCursor.getId(), connection.getDescription(), namespace, batchSize, comment),
-                NoOpFieldNameValidator.INSTANCE, ReadPreference.primary(),
-                CommandResultDocumentCodec.create(decoder, NEXT_BATCH),
-                assertNotNull(resourceManager.getConnectionSource()).getOperationContext(),
-                (commandResult, t) -> {
-                    if (t != null) {
-                        Throwable translatedException =
-                                t instanceof MongoCommandException
-                                        ? translateCommandException((MongoCommandException) t, serverCursor)
-                                        : t;
-                        callback.onResult(null, translatedException);
-                        return;
-                    }
-                    commandCursorResult = toCommandCursorResult(
-                            connection.getDescription().getServerAddress(), NEXT_BATCH, assertNotNull(commandResult));
-                    ServerCursor nextServerCursor = commandCursorResult.getServerCursor();
-                    resourceManager.setServerCursor(nextServerCursor);
-                    List nextBatch = commandCursorResult.getResults();
-                    if (nextServerCursor == null || !nextBatch.isEmpty()) {
-                        callback.onResult(nextBatch, null);
-                        return;
-                    }
-
-                    if (!resourceManager.operable()) {
-                        callback.onResult(emptyList(), null);
-                        return;
-                    }
-
-                    getMoreLoop(connection, nextServerCursor, callback);
-        });
-    }
-
-    private CommandCursorResult toCommandCursorResult(final ServerAddress serverAddress, final String fieldNameContainingBatch,
-            final BsonDocument commandCursorDocument) {
-        CommandCursorResult commandCursorResult = new CommandCursorResult<>(serverAddress, fieldNameContainingBatch,
-                commandCursorDocument);
-        logCommandCursorResult(commandCursorResult);
-        return commandCursorResult;
-    }
-
-    /**
-     * Configures the cursor to {@link #close()}
-     * without {@linkplain TimeoutContext#withNewlyStartedTimeout() starting a new}
-     * {@linkplain TimeoutContext#getTimeout() timeout}.
-     * This is useful when managing the {@link #close()} behavior externally.
-     */
-    AsyncCommandBatchCursor disableTimeoutResetWhenClosing() {
-        resetTimeoutWhenClosing = false;
-        return this;
-    }
-
-    @ThreadSafe
-    private final class ResourceManager extends CursorResourceManager {
-        ResourceManager(
-                final MongoNamespace namespace,
-                final AsyncConnectionSource connectionSource,
-                @Nullable final AsyncConnection connectionToPin,
-                @Nullable final ServerCursor serverCursor) {
-            super(namespace, connectionSource, connectionToPin, serverCursor);
-        }
-
-        /**
-         * Thread-safe.
-         * Executes {@code operation} within the {@link #tryStartOperation()}/{@link #endOperation()} bounds.
-         */
-         void execute(final AsyncCallbackSupplier operation, final SingleResultCallback callback) {
-            boolean canStartOperation = doesNotThrow(this::tryStartOperation);
-            if (!canStartOperation) {
-                callback.onResult(null, new IllegalStateException(MESSAGE_IF_CLOSED_AS_CURSOR));
-            } else {
-                operation.whenComplete(() -> {
-                    endOperation();
-                    if (super.getServerCursor() == null) {
-                        // At this point all resources have been released,
-                        // but `isClose` may still be returning `false` if `close` have not been called.
-                        // Self-close to update the state managed by `ResourceManger`, and so that `isClosed` return `true`.
-                        close();
-                    }
-                }).get(callback);
-            }
-        }
-
-        @Override
-        void markAsPinned(final AsyncConnection connectionToPin, final Connection.PinningMode pinningMode) {
-            connectionToPin.markAsPinned(pinningMode);
-        }
-
-        @Override
-        void doClose() {
-            TimeoutContext timeoutContext = operationContext.getTimeoutContext();
-            timeoutContext.resetToDefaultMaxTime();
-            if (resetTimeoutWhenClosing) {
-                releaseResourcesAsync(operationContext.withNewlyStartedTimeout(), THEN_DO_NOTHING);
-            } else {
-                releaseResourcesAsync(operationContext, THEN_DO_NOTHING);
-            }
-        }
-
-        private void releaseResourcesAsync(final OperationContext operationContext, final SingleResultCallback callback) {
-            beginAsync().thenRunTryCatchAsyncBlocks(c -> {
-                if (isSkipReleasingServerResourcesOnClose()) {
-                    unsetServerCursor();
-                }
-                if (super.getServerCursor() != null) {
-                    beginAsync().thenSupply(c2 -> {
-                        getConnection(c2);
-                    }).thenConsume((connection, c3) -> {
-                        beginAsync().thenRun(c4 -> {
-                            releaseServerResourcesAsync(connection, operationContext, c4);
-                        }).thenAlwaysRunAndFinish(() -> {
-                            connection.release();
-                        }, c3);
-                    }).finish(c);
-                } else {
-                    c.complete(c);
-                }
-            }, MongoException.class, (e, c5) -> {
-                c5.complete(c5); // ignore exceptions when releasing server resources
-            }).thenAlwaysRunAndFinish(() -> {
-                // guarantee that regardless of exceptions, `serverCursor` is null and client resources are released
-                unsetServerCursor();
-                releaseClientResources();
-            }, callback);
-        }
-
-         void executeWithConnection(final AsyncCallableConnectionWithCallback callable, final SingleResultCallback callback) {
-            getConnection((connection, t) -> {
-                if (t != null) {
-                    callback.onResult(null, t);
-                    return;
-                }
-                callable.call(assertNotNull(connection), (result, t1) -> {
-                    if (t1 != null) {
-                        handleException(connection, t1);
-                    }
-                    connection.release();
-                    callback.onResult(result, t1);
-                });
-            });
-        }
-
-        private void handleException(final AsyncConnection connection, final Throwable exception) {
-            if (exception instanceof MongoOperationTimeoutException && exception.getCause() instanceof MongoSocketException) {
-                onCorruptedConnection(connection, (MongoSocketException) exception.getCause());
-            } else if (exception instanceof MongoSocketException) {
-                onCorruptedConnection(connection, (MongoSocketException) exception);
-            }
-        }
-
-        private void getConnection(final SingleResultCallback callback) {
-            assertTrue(getState() != State.IDLE);
-            AsyncConnection pinnedConnection = getPinnedConnection();
-            if (pinnedConnection != null) {
-                callback.onResult(assertNotNull(pinnedConnection).retain(), null);
-            } else {
-                assertNotNull(getConnectionSource()).getConnection(callback);
-            }
-        }
-
-        private void releaseServerResourcesAsync(final AsyncConnection connection, final OperationContext operationContext,
-                final SingleResultCallback callback) {
-            beginAsync().thenRun((c) -> {
-                ServerCursor localServerCursor = super.getServerCursor();
-                if (localServerCursor != null) {
-                    killServerCursorAsync(getNamespace(), localServerCursor, connection, operationContext, callback);
-                } else {
-                    c.complete(c);
-                }
-            }).thenAlwaysRunAndFinish(() -> {
-                unsetServerCursor();
-            }, callback);
-        }
-
-        private void killServerCursorAsync(
-                final MongoNamespace namespace,
-                final ServerCursor localServerCursor,
-                final AsyncConnection localConnection,
-                final OperationContext operationContext,
-                final SingleResultCallback callback) {
-            beginAsync().thenRun(c -> {
-                localConnection.commandAsync(
-                        namespace.getDatabaseName(),
-                        getKillCursorsCommand(namespace, localServerCursor),
-                        NoOpFieldNameValidator.INSTANCE,
-                        ReadPreference.primary(),
-                        new BsonDocumentCodec(),
-                        operationContext,
-                        (r, t) -> c.complete(c));
-            }).finish(callback);
-        }
+    AsyncCoreCursor getWrapped() {
+        return wrapped;
     }
 }
+
diff --git a/driver-core/src/main/com/mongodb/internal/operation/AsyncCommandCoreCursor.java b/driver-core/src/main/com/mongodb/internal/operation/AsyncCommandCoreCursor.java
new file mode 100644
index 00000000000..754c63208fd
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/operation/AsyncCommandCoreCursor.java
@@ -0,0 +1,348 @@
+package com.mongodb.internal.operation;
+
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+import com.mongodb.MongoCommandException;
+import com.mongodb.MongoException;
+import com.mongodb.MongoNamespace;
+import com.mongodb.MongoOperationTimeoutException;
+import com.mongodb.MongoSocketException;
+import com.mongodb.ReadPreference;
+import com.mongodb.ServerAddress;
+import com.mongodb.ServerCursor;
+import com.mongodb.annotations.ThreadSafe;
+import com.mongodb.connection.ConnectionDescription;
+import com.mongodb.connection.ServerType;
+import com.mongodb.internal.async.SingleResultCallback;
+import com.mongodb.internal.async.function.AsyncCallbackSupplier;
+import com.mongodb.internal.binding.AsyncConnectionSource;
+import com.mongodb.internal.connection.AsyncConnection;
+import com.mongodb.internal.connection.Connection;
+import com.mongodb.internal.connection.OperationContext;
+import com.mongodb.internal.operation.AsyncOperationHelper.AsyncCallableConnectionWithCallback;
+import com.mongodb.internal.validator.NoOpFieldNameValidator;
+import com.mongodb.lang.Nullable;
+import org.bson.BsonDocument;
+import org.bson.BsonTimestamp;
+import org.bson.BsonValue;
+import org.bson.codecs.BsonDocumentCodec;
+import org.bson.codecs.Decoder;
+
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import static com.mongodb.assertions.Assertions.assertNotNull;
+import static com.mongodb.assertions.Assertions.assertTrue;
+import static com.mongodb.assertions.Assertions.doesNotThrow;
+import static com.mongodb.internal.async.AsyncRunnable.beginAsync;
+import static com.mongodb.internal.async.SingleResultCallback.THEN_DO_NOTHING;
+import static com.mongodb.internal.operation.CommandBatchCursorHelper.FIRST_BATCH;
+import static com.mongodb.internal.operation.CommandBatchCursorHelper.MESSAGE_IF_CLOSED_AS_CURSOR;
+import static com.mongodb.internal.operation.CommandBatchCursorHelper.NEXT_BATCH;
+import static com.mongodb.internal.operation.CommandBatchCursorHelper.getKillCursorsCommand;
+import static com.mongodb.internal.operation.CommandBatchCursorHelper.getMoreCommandDocument;
+import static com.mongodb.internal.operation.CommandBatchCursorHelper.logCommandCursorResult;
+import static com.mongodb.internal.operation.CommandBatchCursorHelper.translateCommandException;
+import static java.util.Collections.emptyList;
+
+class AsyncCommandCoreCursor implements AsyncCoreCursor {
+
+    private final MongoNamespace namespace;
+    private final Decoder decoder;
+    @Nullable
+    private final BsonValue comment;
+    private final int maxWireVersion;
+    private final boolean firstBatchEmpty;
+    private final ResourceManager resourceManager;
+    private final AtomicBoolean processedInitial = new AtomicBoolean();
+    private int batchSize;
+    private volatile CommandCursorResult commandCursorResult;
+
+    AsyncCommandCoreCursor(
+            final BsonDocument commandCursorDocument,
+            final int batchSize,
+            final Decoder decoder,
+            @Nullable final BsonValue comment,
+            final AsyncConnectionSource connectionSource,
+            final AsyncConnection connection) {
+        ConnectionDescription connectionDescription = connection.getDescription();
+        this.commandCursorResult = toCommandCursorResult(connectionDescription.getServerAddress(), FIRST_BATCH, commandCursorDocument);
+        this.namespace = commandCursorResult.getNamespace();
+        this.batchSize = batchSize;
+        this.decoder = decoder;
+        this.comment = comment;
+        this.maxWireVersion = connectionDescription.getMaxWireVersion();
+        this.firstBatchEmpty = commandCursorResult.getResults().isEmpty();
+        AsyncConnection connectionToPin = connectionSource.getServerDescription().getType() == ServerType.LOAD_BALANCER
+                ? connection : null;
+        resourceManager = new ResourceManager(namespace, connectionSource, connectionToPin, commandCursorResult.getServerCursor());
+    }
+
+    @Override
+    public void next(final OperationContext operationContext, final SingleResultCallback> callback) {
+        resourceManager.execute(funcCallback -> {
+           //checkTimeoutModeAndResetTimeoutContextIfIteration(); //FIXME it was a bug? we should have reset the timeout when next was request to execute connection checkout and subsequent read wait on one timeout
+            ServerCursor localServerCursor = resourceManager.getServerCursor();
+            boolean serverCursorIsNull = localServerCursor == null;
+            List batchResults = emptyList();
+            if (!processedInitial.getAndSet(true) && !firstBatchEmpty) {
+                batchResults = commandCursorResult.getResults();
+            }
+
+            if (serverCursorIsNull || !batchResults.isEmpty()) {
+                funcCallback.onResult(batchResults, null);
+            } else {
+                getMore(localServerCursor, operationContext, funcCallback);
+            }
+        }, operationContext, callback);
+    }
+
+    @Override
+    public boolean isClosed() {
+        return !resourceManager.operable();
+    }
+
+    @Override
+    public void setBatchSize(final int batchSize) {
+        this.batchSize = batchSize;
+    }
+
+    @Override
+    public int getBatchSize() {
+        return batchSize;
+    }
+
+    @Override
+    public void close(final OperationContext operationContext) {
+        resourceManager.close(operationContext);
+    }
+
+    @Nullable
+    @Override
+    public ServerCursor getServerCursor() {
+        if (!resourceManager.operable()) {
+            return null;
+        }
+        return resourceManager.getServerCursor();
+    }
+
+    @Override
+    public BsonDocument getPostBatchResumeToken() {
+        return commandCursorResult.getPostBatchResumeToken();
+    }
+
+    @Override
+    public BsonTimestamp getOperationTime() {
+        return commandCursorResult.getOperationTime();
+    }
+
+    @Override
+    public boolean isFirstBatchEmpty() {
+        return firstBatchEmpty;
+    }
+
+    @Override
+    public int getMaxWireVersion() {
+        return maxWireVersion;
+    }
+
+    private void getMore(final ServerCursor cursor, final OperationContext operationContext, final SingleResultCallback> callback) {
+        resourceManager.executeWithConnection(operationContext, (connection, wrappedCallback) ->
+                getMoreLoop(assertNotNull(connection), cursor, operationContext, wrappedCallback), callback);
+    }
+
+    private void getMoreLoop(final AsyncConnection connection, final ServerCursor serverCursor,
+                             final OperationContext operationContext,
+                             final SingleResultCallback> callback) {
+        connection.commandAsync(namespace.getDatabaseName(),
+                getMoreCommandDocument(serverCursor.getId(), connection.getDescription(), namespace, batchSize, comment),
+                NoOpFieldNameValidator.INSTANCE, ReadPreference.primary(),
+                CommandResultDocumentCodec.create(decoder, NEXT_BATCH),
+                operationContext,
+                (commandResult, t) -> {
+                    if (t != null) {
+                        Throwable translatedException =
+                                t instanceof MongoCommandException
+                                        ? translateCommandException((MongoCommandException) t, serverCursor)
+                                        : t;
+                        callback.onResult(null, translatedException);
+                        return;
+                    }
+                    commandCursorResult = toCommandCursorResult(
+                            connection.getDescription().getServerAddress(), NEXT_BATCH, assertNotNull(commandResult));
+                    ServerCursor nextServerCursor = commandCursorResult.getServerCursor();
+                    resourceManager.setServerCursor(nextServerCursor);
+                    List nextBatch = commandCursorResult.getResults();
+                    if (nextServerCursor == null || !nextBatch.isEmpty()) {
+                        callback.onResult(nextBatch, null);
+                        return;
+                    }
+
+                    if (!resourceManager.operable()) {
+                        callback.onResult(emptyList(), null);
+                        return;
+                    }
+
+                    getMoreLoop(connection, nextServerCursor, operationContext, callback);
+                });
+    }
+
+    private CommandCursorResult toCommandCursorResult(final ServerAddress serverAddress, final String fieldNameContainingBatch,
+                                                         final BsonDocument commandCursorDocument) {
+        CommandCursorResult commandCursorResult = new CommandCursorResult<>(serverAddress, fieldNameContainingBatch,
+                commandCursorDocument);
+        logCommandCursorResult(commandCursorResult);
+        return commandCursorResult;
+    }
+
+    @ThreadSafe
+    private final class ResourceManager extends CursorResourceManagerNew {
+        ResourceManager(
+                final MongoNamespace namespace,
+                final AsyncConnectionSource connectionSource,
+                @Nullable final AsyncConnection connectionToPin,
+                @Nullable final ServerCursor serverCursor) {
+            super(namespace, connectionSource, connectionToPin, serverCursor);
+        }
+
+        /**
+         * Thread-safe.
+         */
+         void execute(final AsyncCallbackSupplier operation, final OperationContext operationContext, final SingleResultCallback callback) {
+            boolean canStartOperation = doesNotThrow(this::tryStartOperation);
+            if (!canStartOperation) {
+                callback.onResult(null, new IllegalStateException(MESSAGE_IF_CLOSED_AS_CURSOR));
+            } else {
+                operation.whenComplete(() -> {
+                    endOperation(operationContext);
+                    if (super.getServerCursor() == null) {
+                        // At this point all resources have been released,
+                        // but `isClose` may still be returning `false` if `close` have not been called.
+                        // Self-close to update the state managed by `ResourceManger`, and so that `isClosed` return `true`.
+                        close(operationContext);
+                    }
+                }).get(callback);
+            }
+        }
+
+        @Override
+        void markAsPinned(final AsyncConnection connectionToPin, final Connection.PinningMode pinningMode) {
+            connectionToPin.markAsPinned(pinningMode);
+        }
+
+        @Override
+        void doClose(final OperationContext operationContext) {
+                releaseResourcesAsync(operationContext, THEN_DO_NOTHING);
+        }
+
+        private void releaseResourcesAsync(final OperationContext operationContext, final SingleResultCallback callback) {
+            beginAsync().thenRunTryCatchAsyncBlocks(c -> {
+                if (isSkipReleasingServerResourcesOnClose()) {
+                    unsetServerCursor();
+                }
+                if (super.getServerCursor() != null) {
+                    beginAsync().thenSupply(c2 -> {
+                        getConnection(operationContext, c2);
+                    }).thenConsume((connection, c3) -> {
+                        beginAsync().thenRun(c4 -> {
+                            releaseServerResourcesAsync(connection, operationContext, c4);
+                        }).thenAlwaysRunAndFinish(() -> {
+                            connection.release();
+                        }, c3);
+                    }).finish(c);
+                } else {
+                    c.complete(c);
+                }
+            }, MongoException.class, (e, c5) -> {
+                c5.complete(c5); // ignore exceptions when releasing server resources
+            }).thenAlwaysRunAndFinish(() -> {
+                // guarantee that regardless of exceptions, `serverCursor` is null and client resources are released
+                unsetServerCursor();
+                releaseClientResources();
+            }, callback);
+        }
+
+         void executeWithConnection(final OperationContext operationContext, final AsyncCallableConnectionWithCallback callable,
+                                       final SingleResultCallback callback) {
+            getConnection(operationContext, (connection, t) -> {
+                if (t != null) {
+                    callback.onResult(null, t);
+                    return;
+                }
+                callable.call(assertNotNull(connection), (result, t1) -> {
+                    if (t1 != null) {
+                        handleException(connection, t1);
+                    }
+                    connection.release();
+                    callback.onResult(result, t1);
+                });
+            });
+        }
+
+        private void handleException(final AsyncConnection connection, final Throwable exception) {
+            if (exception instanceof MongoOperationTimeoutException && exception.getCause() instanceof MongoSocketException) {
+                onCorruptedConnection(connection, (MongoSocketException) exception.getCause());
+            } else if (exception instanceof MongoSocketException) {
+                onCorruptedConnection(connection, (MongoSocketException) exception);
+            }
+        }
+
+        private void getConnection(final OperationContext operationContext, final SingleResultCallback callback) {
+            assertTrue(getState() != State.IDLE);
+            AsyncConnection pinnedConnection = getPinnedConnection();
+            if (pinnedConnection != null) {
+                callback.onResult(assertNotNull(pinnedConnection).retain(), null);
+            } else {
+                assertNotNull(getConnectionSource()).getConnection(operationContext, callback);
+            }
+        }
+
+        private void releaseServerResourcesAsync(final AsyncConnection connection, final OperationContext operationContext,
+                                                 final SingleResultCallback callback) {
+            beginAsync().thenRun((c) -> {
+                ServerCursor localServerCursor = super.getServerCursor();
+                if (localServerCursor != null) {
+                    killServerCursorAsync(getNamespace(), localServerCursor, connection, operationContext, callback);
+                } else {
+                    c.complete(c);
+                }
+            }).thenAlwaysRunAndFinish(() -> {
+                unsetServerCursor();
+            }, callback);
+        }
+
+        private void killServerCursorAsync(
+                final MongoNamespace namespace,
+                final ServerCursor localServerCursor,
+                final AsyncConnection localConnection,
+                final OperationContext operationContext,
+                final SingleResultCallback callback) {
+            beginAsync().thenRun(c -> {
+                localConnection.commandAsync(
+                        namespace.getDatabaseName(),
+                        getKillCursorsCommand(namespace, localServerCursor),
+                        NoOpFieldNameValidator.INSTANCE,
+                        ReadPreference.primary(),
+                        new BsonDocumentCodec(),
+                        operationContext,
+                        (r, t) -> c.complete(c));
+            }).finish(callback);
+        }
+    }
+}
+
diff --git a/driver-core/src/main/com/mongodb/internal/operation/AsyncCoreCursor.java b/driver-core/src/main/com/mongodb/internal/operation/AsyncCoreCursor.java
new file mode 100644
index 00000000000..c689d48f7df
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/operation/AsyncCoreCursor.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.operation;
+
+import com.mongodb.ServerCursor;
+import com.mongodb.internal.async.AsyncBatchCursor;
+import com.mongodb.internal.async.SingleResultCallback;
+import com.mongodb.internal.connection.OperationContext;
+import com.mongodb.lang.Nullable;
+import org.bson.BsonDocument;
+import org.bson.BsonTimestamp;
+
+import java.util.List;
+
+public interface AsyncCoreCursor {
+    void close(OperationContext operationContext);
+    void next(OperationContext operationContext, SingleResultCallback> callback);
+
+    /**
+     * Sets the batch size to use when requesting the next batch.  This is the number of documents to request in the next batch.
+     *
+     * @param batchSize the non-negative batch size.  0 means to use the server default.
+     */
+    void setBatchSize(int batchSize);
+
+    /**
+     * Gets the batch size to use when requesting the next batch.  This is the number of documents to request in the next batch.
+     *
+     * @return the non-negative batch size.  0 means to use the server default.
+     */
+    int getBatchSize();
+
+    @Nullable
+    ServerCursor getServerCursor();
+
+
+    @Nullable
+    BsonDocument getPostBatchResumeToken();
+
+    @Nullable
+    BsonTimestamp getOperationTime();
+
+    boolean isFirstBatchEmpty();
+
+    int getMaxWireVersion();
+
+
+    /**
+     * Implementations of {@link AsyncBatchCursor} are allowed to close themselves, see {@link #close()} for more details.
+     *
+     * @return {@code true} if {@code this} has been closed or has closed itself.
+     */
+    boolean isClosed();
+}
diff --git a/driver-core/src/main/com/mongodb/internal/operation/AsyncOperationHelper.java b/driver-core/src/main/com/mongodb/internal/operation/AsyncOperationHelper.java
index f158b3944ae..7b134df2ee8 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/AsyncOperationHelper.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/AsyncOperationHelper.java
@@ -21,12 +21,13 @@
 import com.mongodb.ReadPreference;
 import com.mongodb.assertions.Assertions;
 import com.mongodb.client.cursor.TimeoutMode;
+import com.mongodb.connection.ServerDescription;
 import com.mongodb.internal.TimeoutContext;
 import com.mongodb.internal.async.AsyncBatchCursor;
 import com.mongodb.internal.async.SingleResultCallback;
-import com.mongodb.internal.async.function.AsyncCallbackBiFunction;
 import com.mongodb.internal.async.function.AsyncCallbackFunction;
 import com.mongodb.internal.async.function.AsyncCallbackSupplier;
+import com.mongodb.internal.async.function.AsyncCallbackTriFunction;
 import com.mongodb.internal.async.function.RetryState;
 import com.mongodb.internal.async.function.RetryingAsyncCallbackSupplier;
 import com.mongodb.internal.binding.AsyncConnectionSource;
@@ -62,7 +63,7 @@
 final class AsyncOperationHelper {
 
     interface AsyncCallableWithConnection {
-        void call(@Nullable AsyncConnection connection, @Nullable Throwable t);
+        void call(@Nullable AsyncConnection connection, OperationContext operationContext, @Nullable Throwable t);
     }
 
     interface AsyncCallableConnectionWithCallback {
@@ -94,39 +95,69 @@ interface CommandReadTransformerAsync {
          * @return the function result
          */
         @Nullable
-        R apply(T t, AsyncConnectionSource source, AsyncConnection connection);
+        R apply(T t, AsyncConnectionSource source, AsyncConnection connection, OperationContext operationContext);
     }
 
 
-    static void withAsyncReadConnectionSource(final AsyncReadBinding binding, final AsyncCallableWithSource callable) {
-        binding.getReadConnectionSource(errorHandlingCallback(new AsyncCallableWithSourceCallback(callable), OperationHelper.LOGGER));
+    static void withAsyncReadConnectionSource(final AsyncReadBinding binding, final OperationContext operationContext,
+                                              final AsyncCallableWithSource callable) {
+        binding.getReadConnectionSource(operationContext,
+                errorHandlingCallback(new AsyncCallableWithSourceCallback(callable), OperationHelper.LOGGER));
     }
 
-    static void withAsyncConnection(final AsyncWriteBinding binding, final AsyncCallableWithConnection callable) {
-        binding.getWriteConnectionSource(errorHandlingCallback(new AsyncCallableWithConnectionCallback(callable), OperationHelper.LOGGER));
+    static void withAsyncConnection(final AsyncWriteBinding binding,
+                                    final OperationContext originalOperationContext,
+                                    final AsyncCallableWithConnection callable) {
+        OperationContext serverSelectionOperationContext = originalOperationContext.withTimeoutContextOverride(TimeoutContext::withComputedServerSelectionTimeoutContextNew);
+        binding.getWriteConnectionSource(
+                serverSelectionOperationContext,
+                errorHandlingCallback(
+                        new AsyncCallableWithConnectionCallback(callable, serverSelectionOperationContext, originalOperationContext),
+                        OperationHelper.LOGGER));
     }
 
     /**
-     * @see #withAsyncSuppliedResource(AsyncCallbackSupplier, boolean, SingleResultCallback, AsyncCallbackFunction)
+     * @see #withAsyncSuppliedResource(AsyncCallbackFunction, boolean, OperationContext, SingleResultCallback, AsyncCallbackFunction)
      */
-    static  void withAsyncSourceAndConnection(final AsyncCallbackSupplier sourceSupplier,
-            final boolean wrapConnectionSourceException, final SingleResultCallback callback,
-            final AsyncCallbackBiFunction asyncFunction)
+    static  void withAsyncSourceAndConnection(
+            final AsyncCallbackFunction sourceAsyncFunction,
+            final boolean wrapConnectionSourceException,
+            final OperationContext operationContext,
+            final SingleResultCallback callback,
+            final AsyncCallbackTriFunction asyncFunction)
             throws OperationHelper.ResourceSupplierInternalException {
         SingleResultCallback errorHandlingCallback = errorHandlingCallback(callback, OperationHelper.LOGGER);
-        withAsyncSuppliedResource(sourceSupplier, wrapConnectionSourceException, errorHandlingCallback,
+
+        OperationContext serverSelectionOperationContext =
+                operationContext.withTimeoutContextOverride(TimeoutContext::withComputedServerSelectionTimeoutContextNew);
+        withAsyncSuppliedResource(
+                sourceAsyncFunction,
+                wrapConnectionSourceException,
+                serverSelectionOperationContext,
+                errorHandlingCallback,
                 (source, sourceReleasingCallback) ->
-                        withAsyncSuppliedResource(source::getConnection, wrapConnectionSourceException, sourceReleasingCallback,
+                        withAsyncSuppliedResource(
+                                source::getConnection,
+                                wrapConnectionSourceException,
+                                serverSelectionOperationContext.withMinRoundTripTime(source.getServerDescription()),
+                                sourceReleasingCallback,
                                 (connection, connectionAndSourceReleasingCallback) ->
-                                        asyncFunction.apply(source, connection, connectionAndSourceReleasingCallback)));
+                                        asyncFunction.apply(
+                                                source,
+                                                connection,
+                                                operationContext.withMinRoundTripTime(source.getServerDescription()),
+                                                connectionAndSourceReleasingCallback)));
     }
 
 
-    static  void withAsyncSuppliedResource(final AsyncCallbackSupplier resourceSupplier,
-            final boolean wrapSourceConnectionException, final SingleResultCallback callback,
-            final AsyncCallbackFunction function) throws OperationHelper.ResourceSupplierInternalException {
+    static  void withAsyncSuppliedResource(final AsyncCallbackFunction resourceSupplier,
+                                                                          final boolean wrapSourceConnectionException,
+                                                                          final OperationContext operationContext,
+                                                                          final SingleResultCallback callback,
+                                                                          final AsyncCallbackFunction function)
+            throws OperationHelper.ResourceSupplierInternalException {
         SingleResultCallback errorHandlingCallback = errorHandlingCallback(callback, OperationHelper.LOGGER);
-        resourceSupplier.get((resource, supplierException) -> {
+        resourceSupplier.apply(operationContext, (resource, supplierException) -> {
             if (supplierException != null) {
                 if (wrapSourceConnectionException) {
                     supplierException = new OperationHelper.ResourceSupplierInternalException(supplierException);
@@ -144,57 +175,47 @@ static  void withAsyncSuppliedResource(final Asyn
         });
     }
 
-    static void withAsyncConnectionSourceCallableConnection(final AsyncConnectionSource source,
-            final AsyncCallableWithConnection callable) {
-        source.getConnection((connection, t) -> {
-            source.release();
-            if (t != null) {
-                callable.call(null, t);
-            } else {
-                callable.call(connection, null);
-            }
-        });
-    }
-
-    static void withAsyncConnectionSource(final AsyncConnectionSource source, final AsyncCallableWithSource callable) {
+    static void withAsyncConnectionSource(final AsyncConnectionSource source,
+                                          final AsyncCallableWithSource callable) {
         callable.call(source, null);
     }
 
     static  void executeRetryableReadAsync(
             final AsyncReadBinding binding,
+            final OperationContext operationContext,
             final String database,
             final CommandCreator commandCreator,
             final Decoder decoder,
             final CommandReadTransformerAsync transformer,
             final boolean retryReads,
             final SingleResultCallback callback) {
-        executeRetryableReadAsync(binding, binding::getReadConnectionSource, database, commandCreator,
+        executeRetryableReadAsync(binding, operationContext, binding::getReadConnectionSource, database, commandCreator,
                                   decoder, transformer, retryReads, callback);
     }
 
     static  void executeRetryableReadAsync(
             final AsyncReadBinding binding,
-            final AsyncCallbackSupplier sourceAsyncSupplier,
+            final OperationContext operationContext,
+            final AsyncCallbackFunction sourceAsyncFunction,
             final String database,
             final CommandCreator commandCreator,
             final Decoder decoder,
             final CommandReadTransformerAsync transformer,
             final boolean retryReads,
             final SingleResultCallback callback) {
-        RetryState retryState = initialRetryState(retryReads, binding.getOperationContext().getTimeoutContext());
+        RetryState retryState = initialRetryState(retryReads, operationContext.getTimeoutContext());
         binding.retain();
-        OperationContext operationContext = binding.getOperationContext();
-        AsyncCallbackSupplier asyncRead = decorateReadWithRetriesAsync(retryState, binding.getOperationContext(),
+        AsyncCallbackSupplier asyncRead = decorateReadWithRetriesAsync(retryState, operationContext,
                 (AsyncCallbackSupplier) funcCallback ->
-                        withAsyncSourceAndConnection(sourceAsyncSupplier, false, funcCallback,
-                                (source, connection, releasingCallback) -> {
+                        withAsyncSourceAndConnection(sourceAsyncFunction, false, operationContext, funcCallback,
+                                (source, connection, operationContextWithMinRtt, releasingCallback) -> {
                                     if (retryState.breakAndCompleteIfRetryAnd(
                                             () -> !OperationHelper.canRetryRead(source.getServerDescription(),
-                                                    operationContext),
+                                                    operationContextWithMinRtt),
                                             releasingCallback)) {
                                         return;
                                     }
-                                    createReadCommandAndExecuteAsync(retryState, operationContext, source, database,
+                                    createReadCommandAndExecuteAsync(retryState, operationContextWithMinRtt, source, database,
                                                                      commandCreator, decoder, transformer, connection, releasingCallback);
                                 })
         ).whenComplete(binding::release);
@@ -203,20 +224,31 @@ static  void executeRetryableReadAsync(
 
     static  void executeCommandAsync(
             final AsyncWriteBinding binding,
+            final OperationContext operationContext,
             final String database,
             final CommandCreator commandCreator,
             final CommandWriteTransformerAsync transformer,
             final SingleResultCallback callback) {
         Assertions.notNull("binding", binding);
-        withAsyncSourceAndConnection(binding::getWriteConnectionSource, false, callback,
-                (source, connection, releasingCallback) ->
-                        executeCommandAsync(binding, database, commandCreator.create(
-                                binding.getOperationContext(), source.getServerDescription(), connection.getDescription()),
-                                connection, transformer, releasingCallback)
-        );
+        withAsyncSourceAndConnection(
+                binding::getWriteConnectionSource,
+                false,
+                operationContext,
+                callback,
+                (source, connection, operationContextWithMinRtt, releasingCallback) ->
+                        executeCommandAsync(
+                                binding,
+                                operationContextWithMinRtt,
+                                database,
+                                commandCreator.create(
+                                        operationContextWithMinRtt, source.getServerDescription(), connection.getDescription()),
+                                connection,
+                                transformer,
+                                releasingCallback));
     }
 
     static  void executeCommandAsync(final AsyncWriteBinding binding,
+            final OperationContext operationContext,
             final String database,
             final BsonDocument command,
             final AsyncConnection connection,
@@ -226,11 +258,12 @@ static  void executeCommandAsync(final AsyncWriteBinding binding,
         SingleResultCallback addingRetryableLabelCallback = addingRetryableLabelCallback(callback,
                 connection.getDescription().getMaxWireVersion());
         connection.commandAsync(database, command, NoOpFieldNameValidator.INSTANCE, ReadPreference.primary(), new BsonDocumentCodec(),
-                binding.getOperationContext(), transformingWriteCallback(transformer, connection, addingRetryableLabelCallback));
+                operationContext, transformingWriteCallback(transformer, connection, addingRetryableLabelCallback));
     }
 
     static  void executeRetryableWriteAsync(
             final AsyncWriteBinding binding,
+            final OperationContext operationContext,
             final String database,
             @Nullable final ReadPreference readPreference,
             final FieldNameValidator fieldNameValidator,
@@ -240,9 +273,8 @@ static  void executeRetryableWriteAsync(
             final Function retryCommandModifier,
             final SingleResultCallback callback) {
 
-        RetryState retryState = initialRetryState(true, binding.getOperationContext().getTimeoutContext());
+        RetryState retryState = initialRetryState(true, operationContext.getTimeoutContext());
         binding.retain();
-        OperationContext operationContext = binding.getOperationContext();
 
         AsyncCallbackSupplier asyncWrite = decorateWriteWithRetriesAsync(retryState, operationContext,
                 (AsyncCallbackSupplier) funcCallback -> {
@@ -250,14 +282,14 @@ static  void executeRetryableWriteAsync(
             if (!firstAttempt && operationContext.getSessionContext().hasActiveTransaction()) {
                 operationContext.getSessionContext().clearTransactionContext();
             }
-            withAsyncSourceAndConnection(binding::getWriteConnectionSource, true, funcCallback,
-                    (source, connection, releasingCallback) -> {
+            withAsyncSourceAndConnection(binding::getWriteConnectionSource, true, operationContext, funcCallback,
+                    (source, connection, operationContextWithMinRtt, releasingCallback) -> {
                         int maxWireVersion = connection.getDescription().getMaxWireVersion();
                         SingleResultCallback addingRetryableLabelCallback = firstAttempt
                                 ? releasingCallback
                                 : addingRetryableLabelCallback(releasingCallback, maxWireVersion);
                         if (retryState.breakAndCompleteIfRetryAnd(() ->
-                                        !OperationHelper.canRetryWrite(connection.getDescription(), operationContext.getSessionContext()),
+                                        !OperationHelper.canRetryWrite(connection.getDescription(), operationContextWithMinRtt.getSessionContext()),
                                 addingRetryableLabelCallback)) {
                             return;
                         }
@@ -268,7 +300,7 @@ static  void executeRetryableWriteAsync(
                                         Assertions.assertFalse(firstAttempt);
                                         return retryCommandModifier.apply(previousAttemptCommand);
                                     }).orElseGet(() -> commandCreator.create(
-                                            operationContext,
+                                            operationContextWithMinRtt,
                                             source.getServerDescription(),
                                             connection.getDescription()));
                             // attach `maxWireVersion`, `retryableCommandFlag` ASAP because they are used to check whether we should retry
@@ -281,7 +313,8 @@ static  void executeRetryableWriteAsync(
                             return;
                         }
                         connection.commandAsync(database, command, fieldNameValidator, readPreference, commandResultDecoder,
-                                operationContext, transformingWriteCallback(transformer, connection, addingRetryableLabelCallback));
+                                operationContextWithMinRtt,
+                                transformingWriteCallback(transformer, connection, addingRetryableLabelCallback));
                     });
         }).whenComplete(binding::release);
 
@@ -307,7 +340,7 @@ static  void createReadCommandAndExecuteAsync(
             return;
         }
         connection.commandAsync(database, command, NoOpFieldNameValidator.INSTANCE, source.getReadPreference(), decoder,
-                operationContext, transformingReadCallback(transformer, source, connection, callback));
+                operationContext, transformingReadCallback(transformer, source, connection, operationContext, callback));
     }
 
     static  AsyncCallbackSupplier decorateReadWithRetriesAsync(final RetryState retryState, final OperationContext operationContext,
@@ -339,14 +372,21 @@ static CommandWriteTransformerAsync writeConcernErrorTransfo
     }
 
     static  CommandReadTransformerAsync> asyncSingleBatchCursorTransformer(final String fieldName) {
-        return (result, source, connection) ->
+        return (result, source, connection, operationContext) ->
                 new AsyncSingleBatchCursor<>(BsonDocumentWrapperHelper.toList(result, fieldName), 0);
     }
 
-    static  AsyncBatchCursor cursorDocumentToAsyncBatchCursor(final TimeoutMode timeoutMode, final BsonDocument cursorDocument,
-            final int batchSize, final Decoder decoder, @Nullable final BsonValue comment, final AsyncConnectionSource source,
-            final AsyncConnection connection) {
-        return new AsyncCommandBatchCursor<>(timeoutMode, cursorDocument, batchSize, 0, decoder, comment, source, connection);
+    static  AsyncBatchCursor cursorDocumentToAsyncBatchCursor(final TimeoutMode timeoutMode,
+                                                                    final BsonDocument cursorDocument,
+                                                                    final int batchSize,
+                                                                    final Decoder decoder,
+                                                                    @Nullable final BsonValue comment,
+                                                                    final AsyncConnectionSource source,
+                                                                    final AsyncConnection connection,
+                                                                    final OperationContext operationContext) {
+        return new AsyncCommandBatchCursor<>(timeoutMode, 0, operationContext, new AsyncCommandCoreCursor<>(
+                cursorDocument, batchSize, decoder, comment, source, connection
+        ));
     }
 
     static  SingleResultCallback releasingCallback(final SingleResultCallback wrapped, final AsyncConnection connection) {
@@ -388,19 +428,37 @@ private static  SingleResultCallback transformingWriteCallback(final Co
 
     private static class AsyncCallableWithConnectionCallback implements SingleResultCallback {
         private final AsyncCallableWithConnection callable;
+        private final OperationContext serverSelectionOperationContext;
+        private final OperationContext originalOperationContext;
 
-        AsyncCallableWithConnectionCallback(final AsyncCallableWithConnection callable) {
+        AsyncCallableWithConnectionCallback(final AsyncCallableWithConnection callable,
+                                            final OperationContext serverSelectionOperationContext,
+                                            final OperationContext originalOperationContext) {
             this.callable = callable;
+            this.serverSelectionOperationContext = serverSelectionOperationContext;
+            this.originalOperationContext = originalOperationContext;
         }
 
         @Override
         public void onResult(@Nullable final AsyncConnectionSource source, @Nullable final Throwable t) {
             if (t != null) {
-                callable.call(null, t);
+                callable.call(null, originalOperationContext, t);
             } else {
-                withAsyncConnectionSourceCallableConnection(Assertions.assertNotNull(source), callable);
+                withAsyncConnectionSourceCallableConnection(assertNotNull(source));
             }
         }
+
+        void withAsyncConnectionSourceCallableConnection(final AsyncConnectionSource source) {
+            source.getConnection(serverSelectionOperationContext, (connection, t) -> {
+                source.release();
+                ServerDescription serverDescription = source.getServerDescription();
+                if (t != null) {
+                    callable.call(null, originalOperationContext.withMinRoundTripTime(serverDescription), t);
+                } else {
+                    callable.call(connection, originalOperationContext.withMinRoundTripTime(serverDescription), null);
+                }
+            });
+        }
     }
 
     private static class AsyncCallableWithSourceCallback implements SingleResultCallback {
@@ -456,14 +514,14 @@ private static  SingleResultCallback addingRetryableLabelCallback(final Si
     }
 
     private static  SingleResultCallback transformingReadCallback(final CommandReadTransformerAsync transformer,
-            final AsyncConnectionSource source, final AsyncConnection connection, final SingleResultCallback callback) {
+            final AsyncConnectionSource source, final AsyncConnection connection, final OperationContext operationContext, final SingleResultCallback callback) {
         return (result, t) -> {
             if (t != null) {
                 callback.onResult(null, t);
             } else {
                 R transformedResult;
                 try {
-                    transformedResult = transformer.apply(assertNotNull(result), source, connection);
+                    transformedResult = transformer.apply(assertNotNull(result), source, connection, operationContext);
                 } catch (Throwable e) {
                     callback.onResult(null, e);
                     return;
diff --git a/driver-core/src/main/com/mongodb/internal/operation/AsyncReadOperation.java b/driver-core/src/main/com/mongodb/internal/operation/AsyncReadOperation.java
index 75b18f5cb00..9b6258d8d9e 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/AsyncReadOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/AsyncReadOperation.java
@@ -18,6 +18,7 @@
 
 import com.mongodb.internal.async.SingleResultCallback;
 import com.mongodb.internal.binding.AsyncReadBinding;
+import com.mongodb.internal.connection.OperationContext;
 
 /**
  * An operation which asynchronously reads from a MongoDB server.
@@ -34,5 +35,5 @@ public interface AsyncReadOperation {
      * @param binding the binding to execute in the context of
      * @param callback the callback to be called when the operation has been executed
      */
-    void executeAsync(AsyncReadBinding binding, SingleResultCallback callback);
+    void executeAsync(AsyncReadBinding binding, OperationContext operationContext, SingleResultCallback callback);
 }
diff --git a/driver-core/src/main/com/mongodb/internal/operation/AsyncWriteOperation.java b/driver-core/src/main/com/mongodb/internal/operation/AsyncWriteOperation.java
index 334c3bde8ac..bdc82eab4ce 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/AsyncWriteOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/AsyncWriteOperation.java
@@ -18,6 +18,7 @@
 
 import com.mongodb.internal.async.SingleResultCallback;
 import com.mongodb.internal.binding.AsyncWriteBinding;
+import com.mongodb.internal.connection.OperationContext;
 
 /**
  * An operation which asynchronously writes to a MongoDB server.
@@ -34,5 +35,5 @@ public interface AsyncWriteOperation {
      * @param binding the binding to execute in the context of
      * @param callback the callback to be called when the operation has been executed
      */
-    void executeAsync(AsyncWriteBinding binding, SingleResultCallback callback);
+    void executeAsync(AsyncWriteBinding binding, OperationContext operationContext, SingleResultCallback callback);
 }
diff --git a/driver-core/src/main/com/mongodb/internal/operation/BaseFindAndModifyOperation.java b/driver-core/src/main/com/mongodb/internal/operation/BaseFindAndModifyOperation.java
index e523ee3f389..5debdeece6b 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/BaseFindAndModifyOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/BaseFindAndModifyOperation.java
@@ -23,6 +23,7 @@
 import com.mongodb.internal.async.SingleResultCallback;
 import com.mongodb.internal.binding.AsyncWriteBinding;
 import com.mongodb.internal.binding.WriteBinding;
+import com.mongodb.internal.connection.OperationContext;
 import com.mongodb.internal.session.SessionContext;
 import com.mongodb.lang.Nullable;
 import org.bson.BsonDocument;
@@ -69,8 +70,8 @@ protected BaseFindAndModifyOperation(final MongoNamespace namespace, final Write
     }
 
     @Override
-    public T execute(final WriteBinding binding) {
-        return executeRetryableWrite(binding, getDatabaseName(), null, getFieldNameValidator(),
+    public T execute(final WriteBinding binding, final OperationContext operationContext) {
+        return executeRetryableWrite(binding, operationContext, getDatabaseName(), null, getFieldNameValidator(),
                                      CommandResultDocumentCodec.create(getDecoder(), "value"),
                                      getCommandCreator(),
                                      FindAndModifyHelper.transformer(),
@@ -78,8 +79,8 @@ public T execute(final WriteBinding binding) {
     }
 
     @Override
-    public void executeAsync(final AsyncWriteBinding binding, final SingleResultCallback callback) {
-        executeRetryableWriteAsync(binding, getDatabaseName(), null, getFieldNameValidator(),
+    public void executeAsync(final AsyncWriteBinding binding, final OperationContext operationContext, final SingleResultCallback callback) {
+        executeRetryableWriteAsync(binding, operationContext, getDatabaseName(), null, getFieldNameValidator(),
                                    CommandResultDocumentCodec.create(getDecoder(), "value"),
                                    getCommandCreator(),
                 FindAndModifyHelper.asyncTransformer(), cmd -> cmd, callback);
diff --git a/driver-core/src/main/com/mongodb/internal/operation/ChangeStreamBatchCursor.java b/driver-core/src/main/com/mongodb/internal/operation/ChangeStreamBatchCursor.java
index c4bd72a4775..103751e7df3 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/ChangeStreamBatchCursor.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/ChangeStreamBatchCursor.java
@@ -1,3 +1,5 @@
+package com.mongodb.internal.operation;
+
 /*
  * Copyright 2008-present MongoDB, Inc.
  *
@@ -14,7 +16,6 @@
  * limitations under the License.
  */
 
-package com.mongodb.internal.operation;
 
 import com.mongodb.MongoChangeStreamException;
 import com.mongodb.MongoException;
@@ -23,6 +24,7 @@
 import com.mongodb.ServerCursor;
 import com.mongodb.internal.TimeoutContext;
 import com.mongodb.internal.binding.ReadBinding;
+import com.mongodb.internal.connection.OperationContext;
 import com.mongodb.lang.Nullable;
 import org.bson.BsonDocument;
 import org.bson.BsonTimestamp;
@@ -55,11 +57,11 @@
  * 

  */
 final class ChangeStreamBatchCursor implements AggregateResponseBatchCursor {
-    private final ReadBinding binding;
+    private ReadBinding binding;
+    private OperationContext operationContext;
     private final ChangeStreamOperation changeStreamOperation;
     private final int maxWireVersion;
-    private final TimeoutContext timeoutContext;
-    private CommandBatchCursor wrapped;
+    private CoreCursor wrapped;
     private BsonDocument resumeToken;
     private final AtomicBoolean closed;
 
@@ -71,13 +73,14 @@ final class ChangeStreamBatchCursor implements AggregateResponseBatchCursor changeStreamOperation,
-                            final CommandBatchCursor wrapped,
+                            final CoreCursor wrapped,
                             final ReadBinding binding,
+                            final OperationContext operationContext,
                             @Nullable final BsonDocument resumeToken,
                             final int maxWireVersion) {
-        this.timeoutContext = binding.getOperationContext().getTimeoutContext();
         this.changeStreamOperation = changeStreamOperation;
         this.binding = binding.retain();
+        this.operationContext = operationContext.withTimeoutContextOverride(TimeoutContext::withMaxTimeAsMaxAwaitTimeOverride);
         this.wrapped = wrapped;
         this.resumeToken = resumeToken;
         this.maxWireVersion = maxWireVersion;
@@ -85,7 +88,7 @@ final class ChangeStreamBatchCursor implements AggregateResponseBatchCursor getWrapped() {
+    CoreCursor getWrapped() {
         return wrapped;
     }
 
@@ -93,7 +96,7 @@ CommandBatchCursor getWrapped() {
     public boolean hasNext() {
         return resumeableOperation(commandBatchCursor -> {
             try {
-                return commandBatchCursor.hasNext();
+                return commandBatchCursor.hasNext(operationContext);
             } finally {
                 cachePostBatchResumeToken(commandBatchCursor);
             }
@@ -104,7 +107,7 @@ public boolean hasNext() {
     public List next() {
         return resumeableOperation(commandBatchCursor -> {
             try {
-                return convertAndProduceLastId(commandBatchCursor.next(), changeStreamOperation.getDecoder(),
+                return convertAndProduceLastId(commandBatchCursor.next(operationContext), changeStreamOperation.getDecoder(),
                         lastId -> resumeToken = lastId);
             } finally {
                 cachePostBatchResumeToken(commandBatchCursor);
@@ -112,6 +115,10 @@ public List next() {
         });
     }
 
+    private void restartTimeout() {
+        operationContext = operationContext.withNewlyStartedTimeout();
+    }
+
     @Override
     public int available() {
         return wrapped.available();
@@ -121,7 +128,7 @@ public int available() {
     public List tryNext() {
         return resumeableOperation(commandBatchCursor -> {
             try {
-                List tryNext = commandBatchCursor.tryNext();
+                List tryNext = commandBatchCursor.tryNext(operationContext);
                 return tryNext == null ? null
                         : convertAndProduceLastId(tryNext, changeStreamOperation.getDecoder(), lastId -> resumeToken = lastId);
             } finally {
@@ -133,8 +140,7 @@ public List tryNext() {
     @Override
     public void close() {
         if (!closed.getAndSet(true)) {
-            timeoutContext.resetTimeoutIfPresent();
-            wrapped.close();
+            wrapped.close(operationContext);
             binding.release();
         }
     }
@@ -184,7 +190,7 @@ public int getMaxWireVersion() {
         return maxWireVersion;
     }
 
-    private void cachePostBatchResumeToken(final AggregateResponseBatchCursor commandBatchCursor) {
+    private void cachePostBatchResumeToken(final CoreCursor commandBatchCursor) {
         if (commandBatchCursor.getPostBatchResumeToken() != null) {
             resumeToken = commandBatchCursor.getPostBatchResumeToken();
         }
@@ -210,8 +216,8 @@ static  List convertAndProduceLastId(final List rawDocume
         return results;
     }
 
-     R resumeableOperation(final Function, R> function) {
-        timeoutContext.resetTimeoutIfPresent();
+     R resumeableOperation(final Function, R> function) {
+        restartTimeout();
         try {
             R result = execute(function);
             lastOperationTimedOut = false;
@@ -222,7 +228,7 @@  R resumeableOperation(final Function R execute(final Function, R> function) {
+    private  R execute(final Function, R> function) {
         boolean shouldBeResumed = hasPreviousNextTimedOut();
         while (true) {
             if (shouldBeResumed) {
@@ -240,13 +246,16 @@ private  R execute(final Function {
+        wrapped.close(operationContextWithDefaultMaxTime);
+        //TODO why do we initiate server selection here just to get server description and then ignore the selected server further on line 259? So we do two server selections?
+        withReadConnectionSource(binding, operationContext, (source, operationContextWithMinRtt) -> {
             changeStreamOperation.setChangeStreamOptionsForResume(resumeToken, source.getServerDescription().getMaxWireVersion());
             return null;
         });
-        wrapped = ((ChangeStreamBatchCursor) changeStreamOperation.execute(binding)).getWrapped();
+        wrapped = ((ChangeStreamBatchCursor) changeStreamOperation.execute(binding, operationContextWithDefaultMaxTime)).getWrapped();
         binding.release(); // release the new change stream batch cursor's reference to the binding
     }
 
diff --git a/driver-core/src/main/com/mongodb/internal/operation/ChangeStreamOperation.java b/driver-core/src/main/com/mongodb/internal/operation/ChangeStreamOperation.java
index c648bbe1813..77c6e994167 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/ChangeStreamOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/ChangeStreamOperation.java
@@ -28,6 +28,7 @@
 import com.mongodb.internal.binding.AsyncReadBinding;
 import com.mongodb.internal.binding.ReadBinding;
 import com.mongodb.internal.client.model.changestream.ChangeStreamLevel;
+import com.mongodb.internal.connection.OperationContext;
 import com.mongodb.lang.Nullable;
 import org.bson.BsonArray;
 import org.bson.BsonBoolean;
@@ -194,28 +195,34 @@ private AggregateOperationImpl getAggregateOperation(final Time
     }
 
     @Override
-    public BatchCursor execute(final ReadBinding binding) {
-        TimeoutContext timeoutContext = binding.getOperationContext().getTimeoutContext();
-        CommandBatchCursor cursor = ((CommandBatchCursor) getAggregateOperation(timeoutContext).execute(binding))
-                .disableTimeoutResetWhenClosing();
-
-            return new ChangeStreamBatchCursor<>(ChangeStreamOperation.this, cursor, binding,
-                    setChangeStreamOptions(cursor.getPostBatchResumeToken(), cursor.getOperationTime(),
-                            cursor.getMaxWireVersion(), cursor.isFirstBatchEmpty()), cursor.getMaxWireVersion());
+    public BatchCursor execute(final ReadBinding binding, final OperationContext operationContext) {
+        CoreCursor cursor = ((CommandBatchCursor) getAggregateOperation(operationContext.getTimeoutContext())
+                .execute(binding, operationContext))
+                .getWrapped();
+
+        return new ChangeStreamBatchCursor<>(ChangeStreamOperation.this,
+                    cursor,
+                    binding,
+                    operationContext,
+                    setChangeStreamOptions(
+                            cursor.getPostBatchResumeToken(),
+                            cursor.getOperationTime(),
+                            cursor.getMaxWireVersion(),
+                            cursor.isFirstBatchEmpty()),
+                    cursor.getMaxWireVersion());
     }
 
     @Override
-    public void executeAsync(final AsyncReadBinding binding, final SingleResultCallback> callback) {
-        TimeoutContext timeoutContext = binding.getOperationContext().getTimeoutContext();
-        getAggregateOperation(timeoutContext).executeAsync(binding, (result, t) -> {
+    public void executeAsync(final AsyncReadBinding binding, final OperationContext operationContext, final SingleResultCallback> callback) {
+        getAggregateOperation(operationContext.getTimeoutContext()).executeAsync(binding, operationContext, (result, t) -> {
             if (t != null) {
                 callback.onResult(null, t);
             } else {
-                AsyncCommandBatchCursor cursor = ((AsyncCommandBatchCursor) assertNotNull(result))
-                        .disableTimeoutResetWhenClosing();
+                AsyncCoreCursor cursor = ((AsyncCommandBatchCursor) assertNotNull(result))
+                        .getWrapped();
 
                 callback.onResult(new AsyncChangeStreamBatchCursor<>(ChangeStreamOperation.this, cursor, binding,
-                        setChangeStreamOptions(cursor.getPostBatchResumeToken(), cursor.getOperationTime(),
+                        operationContext, setChangeStreamOptions(cursor.getPostBatchResumeToken(), cursor.getOperationTime(),
                                 cursor.getMaxWireVersion(), cursor.isFirstBatchEmpty()), cursor.getMaxWireVersion()), null);
             }
         });
diff --git a/driver-core/src/main/com/mongodb/internal/operation/ClientBulkWriteOperation.java b/driver-core/src/main/com/mongodb/internal/operation/ClientBulkWriteOperation.java
index f6ff7632c8f..0e88e81e419 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/ClientBulkWriteOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/ClientBulkWriteOperation.java
@@ -178,13 +178,13 @@ public ClientBulkWriteOperation(
     }
 
     @Override
-    public ClientBulkWriteResult execute(final WriteBinding binding) throws ClientBulkWriteException {
-        WriteConcern effectiveWriteConcern = validateAndGetEffectiveWriteConcern(binding.getOperationContext().getSessionContext());
+    public ClientBulkWriteResult execute(final WriteBinding binding, final OperationContext operationContext) throws ClientBulkWriteException {
+        WriteConcern effectiveWriteConcern = validateAndGetEffectiveWriteConcern(operationContext.getSessionContext());
         ResultAccumulator resultAccumulator = new ResultAccumulator();
         MongoException transformedTopLevelError = null;
 
         try {
-            executeAllBatches(effectiveWriteConcern, binding, resultAccumulator);
+            executeAllBatches(effectiveWriteConcern, binding, operationContext, resultAccumulator);
         } catch (MongoException topLevelError) {
             transformedTopLevelError = transformWriteException(topLevelError);
         }
@@ -194,13 +194,14 @@ public ClientBulkWriteResult execute(final WriteBinding binding) throws ClientBu
 
     @Override
     public void executeAsync(final AsyncWriteBinding binding,
+                             final OperationContext operationContext,
                              final SingleResultCallback finalCallback) {
-        WriteConcern effectiveWriteConcern = validateAndGetEffectiveWriteConcern(binding.getOperationContext().getSessionContext());
+        WriteConcern effectiveWriteConcern = validateAndGetEffectiveWriteConcern(operationContext.getSessionContext());
         ResultAccumulator resultAccumulator = new ResultAccumulator();
         MutableValue transformedTopLevelError = new MutableValue<>();
 
         beginAsync().thenSupply(c -> {
-            executeAllBatchesAsync(effectiveWriteConcern, binding, resultAccumulator, c);
+            executeAllBatchesAsync(effectiveWriteConcern, binding, operationContext, resultAccumulator, c);
         }).onErrorIf(topLevelError -> topLevelError instanceof MongoException, (topLevelError, c) -> {
             transformedTopLevelError.set(transformWriteException((MongoException) topLevelError));
             c.complete(c);
@@ -221,27 +222,29 @@ public void executeAsync(final AsyncWriteBinding binding,
     private void executeAllBatches(
             final WriteConcern effectiveWriteConcern,
             final WriteBinding binding,
+            final OperationContext operationContext,
             final ResultAccumulator resultAccumulator) throws MongoException {
         Integer nextBatchStartModelIndex = INITIAL_BATCH_MODEL_START_INDEX;
 
         do {
-            nextBatchStartModelIndex = executeBatch(nextBatchStartModelIndex, effectiveWriteConcern, binding, resultAccumulator);
+            nextBatchStartModelIndex = executeBatch(nextBatchStartModelIndex, effectiveWriteConcern, binding, operationContext, resultAccumulator);
         } while (nextBatchStartModelIndex != null);
     }
 
     /**
-     * @see #executeAllBatches(WriteConcern, WriteBinding, ResultAccumulator)
+     * @see #executeAllBatches(WriteConcern, WriteBinding, OperationContext, ResultAccumulator)
      */
     private void executeAllBatchesAsync(
             final WriteConcern effectiveWriteConcern,
             final AsyncWriteBinding binding,
+            final OperationContext operationContext,
             final ResultAccumulator resultAccumulator,
             final SingleResultCallback finalCallback) {
         MutableValue nextBatchStartModelIndex = new MutableValue<>(INITIAL_BATCH_MODEL_START_INDEX);
 
         beginAsync().thenRunDoWhileLoop(iterationCallback -> {
             beginAsync().thenSupply(c -> {
-                executeBatchAsync(nextBatchStartModelIndex.get(), effectiveWriteConcern, binding, resultAccumulator, c);
+                executeBatchAsync(nextBatchStartModelIndex.get(), effectiveWriteConcern, binding, operationContext, resultAccumulator, c);
             }).thenApply((nextBatchStartModelIdx, c) -> {
                 nextBatchStartModelIndex.set(nextBatchStartModelIdx);
                 c.complete(c);
@@ -260,10 +263,10 @@ private Integer executeBatch(
             final int batchStartModelIndex,
             final WriteConcern effectiveWriteConcern,
             final WriteBinding binding,
+            final OperationContext operationContext,
             final ResultAccumulator resultAccumulator) {
         List unexecutedModels = models.subList(batchStartModelIndex, models.size());
         assertFalse(unexecutedModels.isEmpty());
-        OperationContext operationContext = binding.getOperationContext();
         SessionContext sessionContext = operationContext.getSessionContext();
         TimeoutContext timeoutContext = operationContext.getTimeoutContext();
         RetryState retryState = initialRetryState(retryWritesSetting, timeoutContext);
@@ -276,7 +279,7 @@ private Integer executeBatch(
                 // If connection pinning is required, `binding` handles that,
                 // and `ClientSession`, `TransactionContext` are aware of that.
                 () -> withSourceAndConnection(binding::getWriteConnectionSource, true,
-                        (connectionSource, connection) -> {
+                        (connectionSource, connection, commandOperationContext) -> {
                             ConnectionDescription connectionDescription = connection.getDescription();
                             boolean effectiveRetryWrites = isRetryableWrite(
                                     retryWritesSetting, effectiveWriteConcern, connectionDescription, sessionContext);
@@ -288,8 +291,8 @@ private Integer executeBatch(
                                     retryState, effectiveRetryWrites, effectiveWriteConcern, sessionContext, unexecutedModels, batchEncoder,
                                     () -> retryState.attach(AttachmentKeys.retryableCommandFlag(), true, true));
                             return executeBulkWriteCommandAndExhaustOkResponse(
-                                    retryState, connectionSource, connection, bulkWriteCommand, effectiveWriteConcern, operationContext);
-                        })
+                                    retryState, connectionSource, connection, bulkWriteCommand, effectiveWriteConcern, commandOperationContext);
+                        }, operationContext)
         );
 
         try {
@@ -313,17 +316,17 @@ private Integer executeBatch(
     }
 
     /**
-     * @see #executeBatch(int, WriteConcern, WriteBinding, ResultAccumulator)
+     * @see #executeBatch(int, WriteConcern, WriteBinding, OperationContext, ResultAccumulator)
      */
     private void executeBatchAsync(
             final int batchStartModelIndex,
             final WriteConcern effectiveWriteConcern,
             final AsyncWriteBinding binding,
+            final OperationContext operationContext,
             final ResultAccumulator resultAccumulator,
             final SingleResultCallback finalCallback) {
         List unexecutedModels = models.subList(batchStartModelIndex, models.size());
         assertFalse(unexecutedModels.isEmpty());
-        OperationContext operationContext = binding.getOperationContext();
         SessionContext sessionContext = operationContext.getSessionContext();
         TimeoutContext timeoutContext = operationContext.getTimeoutContext();
         RetryState retryState = initialRetryState(retryWritesSetting, timeoutContext);
@@ -335,8 +338,8 @@ private void executeBatchAsync(
                 // and it is allowed by https://jira.mongodb.org/browse/DRIVERS-2502.
                 // If connection pinning is required, `binding` handles that,
                 // and `ClientSession`, `TransactionContext` are aware of that.
-                funcCallback -> withAsyncSourceAndConnection(binding::getWriteConnectionSource, true, funcCallback,
-                        (connectionSource, connection, resultCallback) -> {
+                funcCallback -> withAsyncSourceAndConnection(binding::getWriteConnectionSource, true, operationContext, funcCallback,
+                        (connectionSource, connection, operationContextWithMinRtt, resultCallback) -> {
                             ConnectionDescription connectionDescription = connection.getDescription();
                             boolean effectiveRetryWrites = isRetryableWrite(
                                     retryWritesSetting, effectiveWriteConcern, connectionDescription, sessionContext);
@@ -348,7 +351,7 @@ private void executeBatchAsync(
                                     retryState, effectiveRetryWrites, effectiveWriteConcern, sessionContext, unexecutedModels, batchEncoder,
                                     () -> retryState.attach(AttachmentKeys.retryableCommandFlag(), true, true));
                             executeBulkWriteCommandAndExhaustOkResponseAsync(
-                                    retryState, connectionSource, connection, bulkWriteCommand, effectiveWriteConcern, operationContext, resultCallback);
+                                    retryState, connectionSource, connection, bulkWriteCommand, effectiveWriteConcern, operationContextWithMinRtt, resultCallback);
                         })
         );
 
@@ -408,7 +411,7 @@ private ExhaustiveClientBulkWriteCommandOkResponse executeBulkWriteCommandAndExh
             return null;
         }
         List> cursorExhaustBatches = doWithRetriesDisabledForCommand(retryState, "getMore", () ->
-                exhaustBulkWriteCommandOkResponseCursor(connectionSource, connection, bulkWriteCommandOkResponse));
+                exhaustBulkWriteCommandOkResponseCursor(connectionSource, operationContext, connection, bulkWriteCommandOkResponse));
         return createExhaustiveClientBulkWriteCommandOkResponse(
                 bulkWriteCommandOkResponse,
                 cursorExhaustBatches,
@@ -443,7 +446,7 @@ private void executeBulkWriteCommandAndExhaustOkResponseAsync(
             }
             beginAsync().>>thenSupply(c -> {
                 doWithRetriesDisabledForCommandAsync(retryState, "getMore", (c1) -> {
-                    exhaustBulkWriteCommandOkResponseCursorAsync(connectionSource, connection, bulkWriteCommandOkResponse, c1);
+                    exhaustBulkWriteCommandOkResponseCursorAsync(connectionSource, connection, bulkWriteCommandOkResponse, operationContext, c1);
                 }, c);
             }).thenApply((cursorExhaustBatches, c) -> {
                 c.complete(createExhaustiveClientBulkWriteCommandOkResponse(
@@ -509,6 +512,7 @@ private  void doWithRetriesDisabledForCommandAsync(
 
     private List> exhaustBulkWriteCommandOkResponseCursor(
             final ConnectionSource connectionSource,
+            final OperationContext operationContext,
             final Connection connection,
             final BsonDocument response) {
         try (CommandBatchCursor cursor = cursorDocumentToBatchCursor(
@@ -518,7 +522,8 @@ private List> exhaustBulkWriteCommandOkResponseCursor(
                 codecRegistry.get(BsonDocument.class),
                 options.getComment().orElse(null),
                 connectionSource,
-                connection)) {
+                connection,
+                operationContext)) {
 
            return cursor.exhaust();
         }
@@ -527,6 +532,7 @@ private List> exhaustBulkWriteCommandOkResponseCursor(
     private void exhaustBulkWriteCommandOkResponseCursorAsync(final AsyncConnectionSource connectionSource,
                                                               final AsyncConnection connection,
                                                               final BsonDocument bulkWriteCommandOkResponse,
+                                                              final OperationContext operationContext,
                                                               final SingleResultCallback>> finalCallback) {
         AsyncBatchCursor cursor = cursorDocumentToAsyncBatchCursor(
                 TimeoutMode.CURSOR_LIFETIME,
@@ -535,7 +541,8 @@ private void exhaustBulkWriteCommandOkResponseCursorAsync(final AsyncConnectionS
                 codecRegistry.get(BsonDocument.class),
                 options.getComment().orElse(null),
                 connectionSource,
-                connection);
+                connection,
+                operationContext);
 
         beginAsync().>>thenSupply(callback -> {
              cursor.exhaust(callback);
@@ -833,7 +840,7 @@ Integer onBulkWriteCommandOkResponseOrNoResponse(
         }
 
         /**
-         * @return See {@link #executeBatch(int, WriteConcern, WriteBinding, ResultAccumulator)}.
+         * @return See {@link #executeBatch(int, WriteConcern, WriteBinding, OperationContext, ResultAccumulator)}.
          */
         @Nullable
         Integer onBulkWriteCommandOkResponseWithWriteConcernError(
@@ -847,7 +854,7 @@ Integer onBulkWriteCommandOkResponseWithWriteConcernError(
         }
 
         /**
-         * @return See {@link #executeBatch(int, WriteConcern, WriteBinding, ResultAccumulator)}.
+         * @return See {@link #executeBatch(int, WriteConcern, WriteBinding,OperationContext, ResultAccumulator)}.
          */
         @Nullable
         private Integer onBulkWriteCommandOkResponseOrNoResponse(
@@ -1160,7 +1167,7 @@ Map getInsertModelDocumentIds() {
     }
 
     /**
-     * Exactly one instance must be used per {@linkplain #executeBatch(int, WriteConcern, WriteBinding, ResultAccumulator) batch}.
+     * Exactly one instance must be used per {@linkplain #executeBatch(int, WriteConcern, WriteBinding, OperationContext, ResultAccumulator) batch}.
      */
     @VisibleForTesting(otherwise = PRIVATE)
     public final class BatchEncoder {
diff --git a/driver-core/src/main/com/mongodb/internal/operation/CommandBatchCursor.java b/driver-core/src/main/com/mongodb/internal/operation/CommandBatchCursor.java
index 2a23f9d0711..78de7f33b93 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/CommandBatchCursor.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/CommandBatchCursor.java
@@ -16,150 +16,58 @@
 
 package com.mongodb.internal.operation;
 
-import com.mongodb.MongoCommandException;
-import com.mongodb.MongoException;
-import com.mongodb.MongoNamespace;
-import com.mongodb.MongoOperationTimeoutException;
-import com.mongodb.MongoSocketException;
-import com.mongodb.ReadPreference;
 import com.mongodb.ServerAddress;
 import com.mongodb.ServerCursor;
-import com.mongodb.annotations.ThreadSafe;
 import com.mongodb.client.cursor.TimeoutMode;
-import com.mongodb.connection.ConnectionDescription;
-import com.mongodb.connection.ServerType;
-import com.mongodb.internal.TimeoutContext;
-import com.mongodb.internal.VisibleForTesting;
-import com.mongodb.internal.binding.ConnectionSource;
-import com.mongodb.internal.connection.Connection;
 import com.mongodb.internal.connection.OperationContext;
-import com.mongodb.internal.validator.NoOpFieldNameValidator;
 import com.mongodb.lang.Nullable;
 import org.bson.BsonDocument;
 import org.bson.BsonTimestamp;
-import org.bson.BsonValue;
-import org.bson.codecs.BsonDocumentCodec;
-import org.bson.codecs.Decoder;
 
 import java.util.List;
-import java.util.NoSuchElementException;
-import java.util.function.Consumer;
-import java.util.function.Supplier;
-
-import static com.mongodb.assertions.Assertions.assertNotNull;
-import static com.mongodb.assertions.Assertions.assertTrue;
-import static com.mongodb.internal.VisibleForTesting.AccessModifier.PRIVATE;
-import static com.mongodb.internal.operation.CommandBatchCursorHelper.FIRST_BATCH;
-import static com.mongodb.internal.operation.CommandBatchCursorHelper.MESSAGE_IF_CLOSED_AS_CURSOR;
-import static com.mongodb.internal.operation.CommandBatchCursorHelper.MESSAGE_IF_CLOSED_AS_ITERATOR;
-import static com.mongodb.internal.operation.CommandBatchCursorHelper.NEXT_BATCH;
-import static com.mongodb.internal.operation.CommandBatchCursorHelper.getKillCursorsCommand;
-import static com.mongodb.internal.operation.CommandBatchCursorHelper.getMoreCommandDocument;
-import static com.mongodb.internal.operation.CommandBatchCursorHelper.logCommandCursorResult;
-import static com.mongodb.internal.operation.CommandBatchCursorHelper.translateCommandException;
 
 class CommandBatchCursor implements AggregateResponseBatchCursor {
 
-    private final MongoNamespace namespace;
-    private final Decoder decoder;
-    @Nullable
-    private final BsonValue comment;
-    private final int maxWireVersion;
-    private final boolean firstBatchEmpty;
-    private final ResourceManager resourceManager;
     private final TimeoutMode timeoutMode;
     private OperationContext operationContext;
-
-    private int batchSize;
-    private CommandCursorResult commandCursorResult;
-    @Nullable
-    private List nextBatch;
-    private boolean resetTimeoutWhenClosing;
+    private CoreCursor wrapped;
 
     CommandBatchCursor(
             final TimeoutMode timeoutMode,
-            final BsonDocument commandCursorDocument,
-            final int batchSize, final long maxTimeMS,
-            final Decoder decoder,
-            @Nullable final BsonValue comment,
-            final ConnectionSource connectionSource,
-            final Connection connection) {
-        ConnectionDescription connectionDescription = connection.getDescription();
-        this.commandCursorResult = toCommandCursorResult(connectionDescription.getServerAddress(), FIRST_BATCH, commandCursorDocument);
-        this.namespace = commandCursorResult.getNamespace();
-        this.batchSize = batchSize;
-        this.decoder = decoder;
-        this.comment = comment;
-        this.maxWireVersion = connectionDescription.getMaxWireVersion();
-        this.firstBatchEmpty = commandCursorResult.getResults().isEmpty();
+            final long maxTimeMs,
+            final OperationContext operationContext,
+            final CoreCursor wrapped) {
+        this.operationContext = operationContext.withTimeoutContextOverride(timeoutContext ->
+                timeoutContext.withMaxTimeOverride(maxTimeMs));
         this.timeoutMode = timeoutMode;
-
-        operationContext = connectionSource.getOperationContext();
-        operationContext.getTimeoutContext().setMaxTimeOverride(maxTimeMS); // TODO-JAVA-5640 with?
-
-        Connection connectionToPin = connectionSource.getServerDescription().getType() == ServerType.LOAD_BALANCER ? connection : null;
-        resourceManager = new ResourceManager(namespace, connectionSource, connectionToPin, commandCursorResult.getServerCursor());
-        resetTimeoutWhenClosing = true;
+        this.wrapped = wrapped;
     }
 
     @Override
     public boolean hasNext() {
-        return assertNotNull(resourceManager.execute(MESSAGE_IF_CLOSED_AS_CURSOR, this::doHasNext));
-    }
-
-    private boolean doHasNext() {
-        if (nextBatch != null) {
-            return true;
-        }
-
-        checkTimeoutModeAndResetTimeoutContextIfIteration();
-        while (resourceManager.getServerCursor() != null) {
-            getMore();
-            if (!resourceManager.operable()) {
-                throw new IllegalStateException(MESSAGE_IF_CLOSED_AS_CURSOR);
-            }
-            if (nextBatch != null) {
-                return true;
-            }
-        }
-
-        return false;
+        resetTimeout();
+        return wrapped.hasNext(operationContext);
     }
 
     @Override
     public List next() {
-        return assertNotNull(resourceManager.execute(MESSAGE_IF_CLOSED_AS_ITERATOR, this::doNext));
+        resetTimeout();
+        return wrapped.next(operationContext);
     }
 
     @Override
     public int available() {
-        return !resourceManager.operable() || nextBatch == null ? 0 : nextBatch.size();
-    }
-
-    @Nullable
-    private List doNext() {
-        if (!doHasNext()) {
-            throw new NoSuchElementException();
-        }
-
-        List retVal = nextBatch;
-        nextBatch = null;
-        return retVal;
-    }
-
-    @VisibleForTesting(otherwise = PRIVATE)
-    boolean isClosed() {
-        return !resourceManager.operable();
+        return wrapped.available();
     }
 
     @Override
     public void setBatchSize(final int batchSize) {
-        this.batchSize = batchSize;
+        wrapped.setBatchSize(batchSize);
     }
 
     @Override
     public int getBatchSize() {
-        return batchSize;
+        return wrapped.getBatchSize();
     }
 
     @Override
@@ -169,234 +77,60 @@ public void remove() {
 
     @Override
     public void close() {
-        resourceManager.close();
+        operationContext = operationContext.withTimeoutContextOverride(timeoutContext -> timeoutContext
+                .withNewlyStartedTimeout()
+                .withDefaultMaxTime());
+        wrapped.close(operationContext);
     }
 
     @Nullable
     @Override
     public List tryNext() {
-        return resourceManager.execute(MESSAGE_IF_CLOSED_AS_CURSOR, () -> {
-            if (!tryHasNext()) {
-                return null;
-            }
-            return doNext();
-        });
-    }
-
-    private boolean tryHasNext() {
-        if (nextBatch != null) {
-            return true;
-        }
-
-        if (resourceManager.getServerCursor() != null) {
-            getMore();
-        }
-
-        return nextBatch != null;
+        resetTimeout();
+        return wrapped.tryNext(operationContext);
     }
 
     @Override
     @Nullable
     public ServerCursor getServerCursor() {
-        if (!resourceManager.operable()) {
-            throw new IllegalStateException(MESSAGE_IF_CLOSED_AS_ITERATOR);
-        }
-        return resourceManager.getServerCursor();
+        return wrapped.getServerCursor();
     }
 
     @Override
     public ServerAddress getServerAddress() {
-        if (!resourceManager.operable()) {
-            throw new IllegalStateException(MESSAGE_IF_CLOSED_AS_ITERATOR);
-        }
-
-        return commandCursorResult.getServerAddress();
+        return wrapped.getServerAddress();
     }
 
     @Override
+    @Nullable
     public BsonDocument getPostBatchResumeToken() {
-        return commandCursorResult.getPostBatchResumeToken();
+        return wrapped.getPostBatchResumeToken();
     }
 
     @Override
+    @Nullable
     public BsonTimestamp getOperationTime() {
-        return commandCursorResult.getOperationTime();
+        return wrapped.getOperationTime();
     }
 
     @Override
     public boolean isFirstBatchEmpty() {
-        return firstBatchEmpty;
+        return wrapped.isFirstBatchEmpty();
     }
 
     @Override
     public int getMaxWireVersion() {
-        return maxWireVersion;
+        return wrapped.getMaxWireVersion();
     }
 
-    void checkTimeoutModeAndResetTimeoutContextIfIteration() {
+    private void resetTimeout() {
         if (timeoutMode == TimeoutMode.ITERATION) {
             operationContext = operationContext.withNewlyStartedTimeout();
         }
     }
 
-    private void getMore() {
-        ServerCursor serverCursor = assertNotNull(resourceManager.getServerCursor());
-        resourceManager.executeWithConnection(connection -> {
-            ServerCursor nextServerCursor;
-            try {
-                this.commandCursorResult = toCommandCursorResult(connection.getDescription().getServerAddress(), NEXT_BATCH,
-                        assertNotNull(
-                            connection.command(namespace.getDatabaseName(),
-                                 getMoreCommandDocument(serverCursor.getId(), connection.getDescription(), namespace, batchSize, comment),
-                                 NoOpFieldNameValidator.INSTANCE,
-                                 ReadPreference.primary(),
-                                 CommandResultDocumentCodec.create(decoder, NEXT_BATCH),
-                                 assertNotNull(resourceManager.getConnectionSource()).getOperationContext())));
-                nextServerCursor = commandCursorResult.getServerCursor();
-            } catch (MongoCommandException e) {
-                throw translateCommandException(e, serverCursor);
-            }
-            resourceManager.setServerCursor(nextServerCursor);
-        });
-    }
-
-    private CommandCursorResult toCommandCursorResult(final ServerAddress serverAddress, final String fieldNameContainingBatch,
-            final BsonDocument commandCursorDocument) {
-        CommandCursorResult commandCursorResult = new CommandCursorResult<>(serverAddress, fieldNameContainingBatch,
-                commandCursorDocument);
-        logCommandCursorResult(commandCursorResult);
-        this.nextBatch = commandCursorResult.getResults().isEmpty() ? null : commandCursorResult.getResults();
-        return commandCursorResult;
-    }
-
-    /**
-     * Configures the cursor to {@link #close()}
-     * without {@linkplain TimeoutContext#withNewlyStartedTimeout() starting a new}
-     * {@linkplain TimeoutContext#getTimeout() timeout}.
-     * This is useful when managing the {@link #close()} behavior externally.
-     */
-    CommandBatchCursor disableTimeoutResetWhenClosing() {
-        resetTimeoutWhenClosing = false;
-        return this;
-    }
-
-    @ThreadSafe
-    private final class ResourceManager extends CursorResourceManager {
-        ResourceManager(
-                final MongoNamespace namespace,
-                final ConnectionSource connectionSource,
-                @Nullable final Connection connectionToPin,
-                @Nullable final ServerCursor serverCursor) {
-            super(namespace, connectionSource, connectionToPin, serverCursor);
-        }
-
-        /**
-         * Thread-safe.
-         * Executes {@code operation} within the {@link #tryStartOperation()}/{@link #endOperation()} bounds.
-         *
-         * @throws IllegalStateException If {@linkplain CommandBatchCursor#close() closed}.
-         */
-        @Nullable
-         R execute(final String exceptionMessageIfClosed, final Supplier operation) throws IllegalStateException {
-            if (!tryStartOperation()) {
-                throw new IllegalStateException(exceptionMessageIfClosed);
-            }
-            try {
-                return operation.get();
-            } finally {
-                endOperation();
-            }
-        }
-
-        @Override
-        void markAsPinned(final Connection connectionToPin, final Connection.PinningMode pinningMode) {
-            connectionToPin.markAsPinned(pinningMode);
-        }
-
-        @Override
-        void doClose() {
-            TimeoutContext timeoutContext = operationContext.getTimeoutContext();
-            timeoutContext.resetToDefaultMaxTime();
-            if (resetTimeoutWhenClosing) { // TODO-JAVA-5640 don't we always reset when closing?
-                releaseResources(operationContext.withNewlyStartedTimeout());
-            } else {
-                releaseResources(operationContext);
-            }
-        }
-
-        private void releaseResources(final OperationContext operationContext) {
-            try {
-                if (isSkipReleasingServerResourcesOnClose()) {
-                    unsetServerCursor();
-                }
-                if (super.getServerCursor() != null) {
-                    Connection connection = getConnection();
-                    try {
-                        releaseServerResources(connection, operationContext);
-                    } finally {
-                        connection.release();
-                    }
-                }
-            } catch (MongoException e) {
-                // ignore exceptions when releasing server resources
-            } finally {
-                // guarantee that regardless of exceptions, `serverCursor` is null and client resources are released
-                unsetServerCursor();
-                releaseClientResources();
-            }
-        }
-
-        void executeWithConnection(final Consumer action) {
-            Connection connection = getConnection();
-            try {
-                action.accept(connection);
-            } catch (MongoSocketException e) {
-                onCorruptedConnection(connection, e);
-                throw e;
-            } catch (MongoOperationTimeoutException e) {
-                Throwable cause = e.getCause();
-                if (cause instanceof MongoSocketException) {
-                    onCorruptedConnection(connection, (MongoSocketException) cause);
-                }
-                throw e;
-            } finally {
-                connection.release();
-            }
-        }
-
-        private Connection getConnection() {
-            assertTrue(getState() != State.IDLE);
-            Connection pinnedConnection = getPinnedConnection();
-            if (pinnedConnection == null) {
-                return assertNotNull(getConnectionSource()).getConnection();
-            } else {
-                return pinnedConnection.retain();
-            }
-        }
-
-        private void releaseServerResources(final Connection connection, final OperationContext operationContext) {
-            try {
-                ServerCursor localServerCursor = super.getServerCursor();
-                if (localServerCursor != null) {
-                    killServerCursor(getNamespace(), localServerCursor, connection, operationContext);
-                }
-            } finally {
-                unsetServerCursor();
-            }
-        }
-
-        private void killServerCursor(
-                final MongoNamespace namespace,
-                final ServerCursor localServerCursor,
-                final Connection localConnection,
-                final OperationContext operationContext) {
-            localConnection.command(
-                    namespace.getDatabaseName(),
-                    getKillCursorsCommand(namespace, localServerCursor),
-                    NoOpFieldNameValidator.INSTANCE,
-                    ReadPreference.primary(),
-                    new BsonDocumentCodec(),
-                    operationContext);
-        }
+    CoreCursor getWrapped() {
+        return wrapped;
     }
 }
+
diff --git a/driver-core/src/main/com/mongodb/internal/operation/CommandCoreCursor.java b/driver-core/src/main/com/mongodb/internal/operation/CommandCoreCursor.java
new file mode 100644
index 00000000000..624c4b9bb83
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/operation/CommandCoreCursor.java
@@ -0,0 +1,364 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.operation;
+
+import com.mongodb.MongoCommandException;
+import com.mongodb.MongoException;
+import com.mongodb.MongoNamespace;
+import com.mongodb.MongoOperationTimeoutException;
+import com.mongodb.MongoSocketException;
+import com.mongodb.ReadPreference;
+import com.mongodb.ServerAddress;
+import com.mongodb.ServerCursor;
+import com.mongodb.annotations.ThreadSafe;
+import com.mongodb.connection.ConnectionDescription;
+import com.mongodb.connection.ServerType;
+import com.mongodb.internal.VisibleForTesting;
+import com.mongodb.internal.binding.ConnectionSource;
+import com.mongodb.internal.connection.Connection;
+import com.mongodb.internal.connection.OperationContext;
+import com.mongodb.internal.validator.NoOpFieldNameValidator;
+import com.mongodb.lang.Nullable;
+import org.bson.BsonDocument;
+import org.bson.BsonTimestamp;
+import org.bson.BsonValue;
+import org.bson.codecs.BsonDocumentCodec;
+import org.bson.codecs.Decoder;
+
+import java.util.List;
+import java.util.NoSuchElementException;
+import java.util.function.Consumer;
+import java.util.function.Supplier;
+
+import static com.mongodb.assertions.Assertions.assertNotNull;
+import static com.mongodb.assertions.Assertions.assertTrue;
+import static com.mongodb.internal.VisibleForTesting.AccessModifier.PRIVATE;
+import static com.mongodb.internal.operation.CommandBatchCursorHelper.FIRST_BATCH;
+import static com.mongodb.internal.operation.CommandBatchCursorHelper.MESSAGE_IF_CLOSED_AS_CURSOR;
+import static com.mongodb.internal.operation.CommandBatchCursorHelper.MESSAGE_IF_CLOSED_AS_ITERATOR;
+import static com.mongodb.internal.operation.CommandBatchCursorHelper.NEXT_BATCH;
+import static com.mongodb.internal.operation.CommandBatchCursorHelper.getKillCursorsCommand;
+import static com.mongodb.internal.operation.CommandBatchCursorHelper.getMoreCommandDocument;
+import static com.mongodb.internal.operation.CommandBatchCursorHelper.logCommandCursorResult;
+import static com.mongodb.internal.operation.CommandBatchCursorHelper.translateCommandException;
+
+class CommandCoreCursor implements CoreCursor {
+
+    private final MongoNamespace namespace;
+    private final Decoder decoder;
+    @Nullable
+    private final BsonValue comment;
+    private final int maxWireVersion;
+    private final boolean firstBatchEmpty;
+    private final ResourceManager resourceManager;
+
+    private int batchSize;
+    private CommandCursorResult commandCursorResult;
+    @Nullable
+    private List nextBatch;
+
+    CommandCoreCursor(
+            final BsonDocument commandCursorDocument,
+            final int batchSize,
+            final Decoder decoder,
+            @Nullable final BsonValue comment,
+            final ConnectionSource connectionSource,
+            final Connection connection) {
+        ConnectionDescription connectionDescription = connection.getDescription();
+        this.commandCursorResult = toCommandCursorResult(connectionDescription.getServerAddress(), FIRST_BATCH, commandCursorDocument);
+        this.namespace = commandCursorResult.getNamespace();
+        this.batchSize = batchSize;
+        this.decoder = decoder;
+        this.comment = comment;
+        this.maxWireVersion = connectionDescription.getMaxWireVersion();
+        this.firstBatchEmpty = commandCursorResult.getResults().isEmpty();
+
+        Connection connectionToPin = connectionSource.getServerDescription().getType() == ServerType.LOAD_BALANCER ? connection : null;
+        resourceManager = new ResourceManager(namespace, connectionSource, connectionToPin, commandCursorResult.getServerCursor());
+    }
+
+    @Override
+    public boolean hasNext(final OperationContext operationContext) {
+        return assertNotNull(resourceManager.execute(MESSAGE_IF_CLOSED_AS_CURSOR, () -> doHasNext(operationContext), operationContext));
+    }
+
+
+    private boolean doHasNext(final OperationContext operationContext) {
+        if (nextBatch != null) {
+            return true;
+        }
+
+        while (resourceManager.getServerCursor() != null) {
+            getMore(operationContext);
+            if (!resourceManager.operable()) {
+                throw new IllegalStateException(MESSAGE_IF_CLOSED_AS_CURSOR);
+            }
+            if (nextBatch != null) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    @Override
+    public List next(final OperationContext operationContext) {
+        return assertNotNull(resourceManager.execute(MESSAGE_IF_CLOSED_AS_ITERATOR, () -> doNext(operationContext), operationContext));
+    }
+
+    @Override
+    public int available() {
+        return !resourceManager.operable() || nextBatch == null ? 0 : nextBatch.size();
+    }
+
+    @Nullable
+    private List doNext(final OperationContext operationContext) {
+        if (!doHasNext(operationContext)) {
+            throw new NoSuchElementException();
+        }
+
+        List retVal = nextBatch;
+        nextBatch = null;
+        return retVal;
+    }
+
+    @VisibleForTesting(otherwise = PRIVATE)
+    boolean isClosed() {
+        return !resourceManager.operable();
+    }
+
+    @Override
+    public void setBatchSize(final int batchSize) {
+        this.batchSize = batchSize;
+    }
+
+    @Override
+    public int getBatchSize() {
+        return batchSize;
+    }
+
+
+    @Override
+    public void close(final OperationContext operationContext) {
+        resourceManager.close(operationContext);
+    }
+
+    @Nullable
+    @Override
+    public List tryNext(final OperationContext operationContext) {
+        return resourceManager.execute(MESSAGE_IF_CLOSED_AS_CURSOR, () -> {
+            if (!tryHasNext(operationContext)) {
+                return null;
+            }
+            return doNext(operationContext);
+        }, operationContext);
+    }
+
+    private boolean tryHasNext(final OperationContext operationContext) {
+        if (nextBatch != null) {
+            return true;
+        }
+
+        if (resourceManager.getServerCursor() != null) {
+            getMore(operationContext);
+        }
+
+        return nextBatch != null;
+    }
+
+    @Override
+    @Nullable
+    public ServerCursor getServerCursor() {
+        if (!resourceManager.operable()) {
+            throw new IllegalStateException(MESSAGE_IF_CLOSED_AS_ITERATOR);
+        }
+        return resourceManager.getServerCursor();
+    }
+
+    @Override
+    public ServerAddress getServerAddress() {
+        if (!resourceManager.operable()) {
+            throw new IllegalStateException(MESSAGE_IF_CLOSED_AS_ITERATOR);
+        }
+
+        return commandCursorResult.getServerAddress();
+    }
+
+    @Override
+    public BsonDocument getPostBatchResumeToken() {
+        return commandCursorResult.getPostBatchResumeToken();
+    }
+
+    @Override
+    public BsonTimestamp getOperationTime() {
+        return commandCursorResult.getOperationTime();
+    }
+
+    @Override
+    public boolean isFirstBatchEmpty() {
+        return firstBatchEmpty;
+    }
+
+    @Override
+    public int getMaxWireVersion() {
+        return maxWireVersion;
+    }
+
+    private void getMore(final OperationContext operationContext) {
+        ServerCursor serverCursor = assertNotNull(resourceManager.getServerCursor());
+        resourceManager.executeWithConnection(connection -> {
+            ServerCursor nextServerCursor;
+            try {
+                this.commandCursorResult = toCommandCursorResult(connection.getDescription().getServerAddress(), NEXT_BATCH,
+                        assertNotNull(
+                                connection.command(namespace.getDatabaseName(),
+                                        getMoreCommandDocument(serverCursor.getId(), connection.getDescription(), namespace, batchSize,
+                                                comment),
+                                        NoOpFieldNameValidator.INSTANCE,
+                                        ReadPreference.primary(),
+                                        CommandResultDocumentCodec.create(decoder, NEXT_BATCH),
+                                        operationContext)));
+                nextServerCursor = commandCursorResult.getServerCursor();
+            } catch (MongoCommandException e) {
+                throw translateCommandException(e, serverCursor);
+            }
+            resourceManager.setServerCursor(nextServerCursor);
+        }, operationContext);
+    }
+
+    private CommandCursorResult toCommandCursorResult(final ServerAddress serverAddress, final String fieldNameContainingBatch,
+                                                         final BsonDocument commandCursorDocument) {
+        CommandCursorResult commandCursorResult = new CommandCursorResult<>(serverAddress, fieldNameContainingBatch,
+                commandCursorDocument);
+        logCommandCursorResult(commandCursorResult);
+        this.nextBatch = commandCursorResult.getResults().isEmpty() ? null : commandCursorResult.getResults();
+        return commandCursorResult;
+    }
+
+
+    @ThreadSafe
+    private final class ResourceManager extends CursorResourceManagerNew {
+        ResourceManager(
+                final MongoNamespace namespace,
+                final ConnectionSource connectionSource,
+                @Nullable final Connection connectionToPin,
+                @Nullable final ServerCursor serverCursor) {
+            super(namespace, connectionSource, connectionToPin, serverCursor);
+        }
+
+        /**
+         * Thread-safe.
+         */
+        @Nullable
+         R execute(final String exceptionMessageIfClosed, final Supplier operation, final OperationContext operationContext)
+                throws IllegalStateException {
+            if (!tryStartOperation()) {
+                throw new IllegalStateException(exceptionMessageIfClosed);
+            }
+            try {
+                return operation.get();
+            } finally {
+                endOperation(operationContext);
+            }
+        }
+
+        @Override
+        void markAsPinned(final Connection connectionToPin, final Connection.PinningMode pinningMode) {
+            connectionToPin.markAsPinned(pinningMode);
+        }
+
+        @Override
+        void doClose(final OperationContext operationContext) {
+                releaseResources(operationContext);
+        }
+
+        private void releaseResources(final OperationContext operationContext) {
+            try {
+                if (isSkipReleasingServerResourcesOnClose()) {
+                    unsetServerCursor();
+                }
+                if (super.getServerCursor() != null) {
+                    Connection connection = getConnection(operationContext);
+                    try {
+                        releaseServerResources(connection, operationContext);
+                    } finally {
+                        connection.release();
+                    }
+                }
+            } catch (MongoException e) {
+                // ignore exceptions when releasing server resources
+            } finally {
+                // guarantee that regardless of exceptions, `serverCursor` is null and client resources are released
+                unsetServerCursor();
+                releaseClientResources();
+            }
+        }
+
+        void executeWithConnection(final Consumer action, final OperationContext operationContext) {
+            Connection connection = getConnection(operationContext);
+            try {
+                action.accept(connection);
+            } catch (MongoSocketException e) {
+                onCorruptedConnection(connection, e);
+                throw e;
+            } catch (MongoOperationTimeoutException e) {
+                Throwable cause = e.getCause();
+                if (cause instanceof MongoSocketException) {
+                    onCorruptedConnection(connection, (MongoSocketException) cause);
+                }
+                throw e;
+            } finally {
+                connection.release();
+            }
+        }
+
+        private Connection getConnection(final OperationContext operationContext) {
+            assertTrue(getState() != State.IDLE);
+            Connection pinnedConnection = getPinnedConnection();
+            if (pinnedConnection == null) {
+                return assertNotNull(getConnectionSource()).getConnection(operationContext);
+            } else {
+                return pinnedConnection.retain();
+            }
+        }
+
+        private void releaseServerResources(final Connection connection, final OperationContext operationContext) {
+            try {
+                ServerCursor localServerCursor = super.getServerCursor();
+                if (localServerCursor != null) {
+                    killServerCursor(getNamespace(), localServerCursor, connection, operationContext);
+                }
+            } finally {
+                unsetServerCursor();
+            }
+        }
+
+        private void killServerCursor(
+                final MongoNamespace namespace,
+                final ServerCursor localServerCursor,
+                final Connection localConnection,
+                final OperationContext operationContext) {
+            localConnection.command(
+                    namespace.getDatabaseName(),
+                    getKillCursorsCommand(namespace, localServerCursor),
+                    NoOpFieldNameValidator.INSTANCE,
+                    ReadPreference.primary(),
+                    new BsonDocumentCodec(),
+                    operationContext);
+        }
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/internal/operation/CommandReadOperation.java b/driver-core/src/main/com/mongodb/internal/operation/CommandReadOperation.java
index ea89dfb303e..fb6f2ddf19c 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/CommandReadOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/CommandReadOperation.java
@@ -19,12 +19,16 @@
 import com.mongodb.internal.async.SingleResultCallback;
 import com.mongodb.internal.binding.AsyncReadBinding;
 import com.mongodb.internal.binding.ReadBinding;
+import com.mongodb.internal.connection.OperationContext;
 import org.bson.BsonDocument;
 import org.bson.codecs.Decoder;
+import org.jetbrains.annotations.NotNull;
 
 import static com.mongodb.assertions.Assertions.notNull;
+import static com.mongodb.internal.operation.AsyncOperationHelper.CommandReadTransformerAsync;
 import static com.mongodb.internal.operation.AsyncOperationHelper.executeRetryableReadAsync;
 import static com.mongodb.internal.operation.CommandOperationHelper.CommandCreator;
+import static com.mongodb.internal.operation.SyncOperationHelper.CommandReadTransformer;
 import static com.mongodb.internal.operation.SyncOperationHelper.executeRetryableRead;
 
 /**
@@ -48,14 +52,23 @@ public CommandReadOperation(final String databaseName, final CommandCreator comm
     }
 
     @Override
-    public T execute(final ReadBinding binding) {
-        return executeRetryableRead(binding, databaseName, commandCreator, decoder,
-                                    (result, source, connection) -> result, false);
+    public T execute(final ReadBinding binding, final OperationContext operationContext) {
+        return executeRetryableRead(binding, operationContext, databaseName, commandCreator, decoder,
+                transformer(), false);
     }
 
     @Override
-    public void executeAsync(final AsyncReadBinding binding, final SingleResultCallback callback) {
-        executeRetryableReadAsync(binding, databaseName, commandCreator, decoder,
-                                  (result, source, connection) -> result, false, callback);
+    public void executeAsync(final AsyncReadBinding binding, final OperationContext operationContext,
+                             final SingleResultCallback callback) {
+        executeRetryableReadAsync(binding, operationContext,  databaseName, commandCreator, decoder,
+                asyncTransformer(), false, callback);
+    }
+
+    private static  CommandReadTransformer transformer() {
+        return (result, source, connection, operationContext) -> result;
+    }
+
+    private static  @NotNull CommandReadTransformerAsync asyncTransformer() {
+        return (result, source, connection, operationContext) -> result;
     }
 }
diff --git a/driver-core/src/main/com/mongodb/internal/operation/CommitTransactionOperation.java b/driver-core/src/main/com/mongodb/internal/operation/CommitTransactionOperation.java
index 6c2338d47de..2b6bb6f3c76 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/CommitTransactionOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/CommitTransactionOperation.java
@@ -29,6 +29,7 @@
 import com.mongodb.internal.async.SingleResultCallback;
 import com.mongodb.internal.binding.AsyncWriteBinding;
 import com.mongodb.internal.binding.WriteBinding;
+import com.mongodb.internal.connection.OperationContext;
 import com.mongodb.lang.Nullable;
 import org.bson.BsonDocument;
 
@@ -64,9 +65,11 @@ public CommitTransactionOperation recoveryToken(@Nullable final BsonDocument rec
     }
 
     @Override
-    public Void execute(final WriteBinding binding) {
+    public Void execute(final WriteBinding binding, final OperationContext operationContext) {
         try {
-            return super.execute(binding);
+            return super.execute(
+                    binding,
+                    operationContext.withTimeoutContextOverride(TimeoutContext::withMaxTimeOverrideAsMaxCommitTime));
         } catch (MongoException e) {
             addErrorLabels(e);
             throw e;
@@ -74,8 +77,11 @@ public Void execute(final WriteBinding binding) {
     }
 
     @Override
-    public void executeAsync(final AsyncWriteBinding binding, final SingleResultCallback callback) {
-        super.executeAsync(binding, (result, t) -> {
+    public void executeAsync(final AsyncWriteBinding binding, final OperationContext operationContext, final SingleResultCallback callback) {
+        super.executeAsync(
+                binding,
+                operationContext.withTimeoutContextOverride(TimeoutContext::withMaxTimeOverrideAsMaxCommitTime),
+                (result, t) -> {
              if (t instanceof MongoException) {
                  addErrorLabels((MongoException) t);
              }
@@ -121,7 +127,6 @@ CommandCreator getCommandCreator() {
         CommandCreator creator = (operationContext, serverDescription, connectionDescription) -> {
             BsonDocument command = CommitTransactionOperation.super.getCommandCreator()
                     .create(operationContext, serverDescription, connectionDescription);
-            operationContext.getTimeoutContext().setMaxTimeOverrideToMaxCommitTime();
             return command;
         };
         if (alreadyCommitted) {
diff --git a/driver-core/src/main/com/mongodb/internal/operation/CoreCursor.java b/driver-core/src/main/com/mongodb/internal/operation/CoreCursor.java
new file mode 100644
index 00000000000..5f797c1089f
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/operation/CoreCursor.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.operation;
+
+import com.mongodb.ServerAddress;
+import com.mongodb.ServerCursor;
+import com.mongodb.internal.connection.OperationContext;
+import com.mongodb.lang.Nullable;
+import org.bson.BsonDocument;
+import org.bson.BsonTimestamp;
+
+import java.util.List;
+
+interface CoreCursor {
+    void close(OperationContext operationContext);
+
+    boolean hasNext(OperationContext operationContext);
+
+    List next(OperationContext operationContext);
+
+    /**
+     * A special {@code next()} case that returns the next batch if available or null.
+     *
+     * 
Tailable cursors are an example where this is useful. A call to {@code tryNext()} may return null, but in the future calling
+     * {@code tryNext()} would return a new batch if a document had been added to the capped collection.

+     *
+     * @mongodb.driver.manual reference/glossary/#term-tailable-cursor Tailable Cursor
+     */
+    @Nullable
+    List tryNext(OperationContext operationContext);
+
+
+    int available();
+
+    /**
+     * Sets the batch size to use when requesting the next batch.  This is the number of documents to request in the next batch.
+     *
+     * @param batchSize the non-negative batch size.  0 means to use the server default.
+     */
+    void setBatchSize(int batchSize);
+
+    /**
+     * Gets the batch size to use when requesting the next batch.  This is the number of documents to request in the next batch.
+     *
+     * @return the non-negative batch size.  0 means to use the server default.
+     */
+    int getBatchSize();
+
+    @Nullable
+    ServerCursor getServerCursor();
+
+    ServerAddress getServerAddress();
+
+    @Nullable
+    BsonDocument getPostBatchResumeToken();
+
+    @Nullable
+    BsonTimestamp getOperationTime();
+
+    boolean isFirstBatchEmpty();
+
+    int getMaxWireVersion();
+}
+
diff --git a/driver-core/src/main/com/mongodb/internal/operation/CountDocumentsOperation.java b/driver-core/src/main/com/mongodb/internal/operation/CountDocumentsOperation.java
index 1095dd44508..9daba5572c9 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/CountDocumentsOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/CountDocumentsOperation.java
@@ -21,6 +21,7 @@
 import com.mongodb.internal.async.SingleResultCallback;
 import com.mongodb.internal.binding.AsyncReadBinding;
 import com.mongodb.internal.binding.ReadBinding;
+import com.mongodb.internal.connection.OperationContext;
 import com.mongodb.lang.Nullable;
 import org.bson.BsonDocument;
 import org.bson.BsonInt32;
@@ -120,15 +121,16 @@ public CountDocumentsOperation comment(@Nullable final BsonValue comment) {
     }
 
     @Override
-    public Long execute(final ReadBinding binding) {
-        try (BatchCursor cursor = getAggregateOperation().execute(binding)) {
+    public Long execute(final ReadBinding binding, final OperationContext operationContext) {
+        try (BatchCursor cursor = getAggregateOperation().execute(binding, operationContext)) {
             return cursor.hasNext() ? getCountFromAggregateResults(cursor.next()) : 0;
         }
     }
 
     @Override
-    public void executeAsync(final AsyncReadBinding binding, final SingleResultCallback callback) {
-        getAggregateOperation().executeAsync(binding, (result, t) -> {
+    public void executeAsync(final AsyncReadBinding binding, final OperationContext operationContext,
+                             final SingleResultCallback callback) {
+        getAggregateOperation().executeAsync(binding, operationContext, (result, t) -> {
             if (t != null) {
                 callback.onResult(null, t);
             } else {
diff --git a/driver-core/src/main/com/mongodb/internal/operation/CountOperation.java b/driver-core/src/main/com/mongodb/internal/operation/CountOperation.java
index f9aa0a8eaa2..298eb0b27f0 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/CountOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/CountOperation.java
@@ -21,6 +21,7 @@
 import com.mongodb.internal.async.SingleResultCallback;
 import com.mongodb.internal.binding.AsyncReadBinding;
 import com.mongodb.internal.binding.ReadBinding;
+import com.mongodb.internal.connection.OperationContext;
 import com.mongodb.lang.Nullable;
 import org.bson.BsonDocument;
 import org.bson.BsonString;
@@ -110,23 +111,23 @@ public CountOperation collation(@Nullable final Collation collation) {
     }
 
     @Override
-    public Long execute(final ReadBinding binding) {
-        return executeRetryableRead(binding, namespace.getDatabaseName(),
+    public Long execute(final ReadBinding binding, final OperationContext operationContext) {
+        return executeRetryableRead(binding, operationContext, namespace.getDatabaseName(),
                                     getCommandCreator(), DECODER, transformer(), retryReads);
     }
 
     @Override
-    public void executeAsync(final AsyncReadBinding binding, final SingleResultCallback callback) {
-        executeRetryableReadAsync(binding, namespace.getDatabaseName(),
+    public void executeAsync(final AsyncReadBinding binding, final OperationContext operationContext, final SingleResultCallback callback) {
+        executeRetryableReadAsync(binding, operationContext,  namespace.getDatabaseName(),
                                   getCommandCreator(), DECODER, asyncTransformer(), retryReads, callback);
     }
 
     private CommandReadTransformer transformer() {
-        return (result, source, connection) -> (result.getNumber("n")).longValue();
+        return (result, source, connection, operationContext) -> (result.getNumber("n")).longValue();
     }
 
     private CommandReadTransformerAsync asyncTransformer() {
-        return (result, source, connection) -> (result.getNumber("n")).longValue();
+        return (result, source, connection, operationContext) -> (result.getNumber("n")).longValue();
     }
 
     private CommandCreator getCommandCreator() {
diff --git a/driver-core/src/main/com/mongodb/internal/operation/CreateCollectionOperation.java b/driver-core/src/main/com/mongodb/internal/operation/CreateCollectionOperation.java
index d9a11d20287..3958de3f6c0 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/CreateCollectionOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/CreateCollectionOperation.java
@@ -30,6 +30,7 @@
 import com.mongodb.internal.binding.AsyncWriteBinding;
 import com.mongodb.internal.binding.WriteBinding;
 import com.mongodb.internal.connection.AsyncConnection;
+import com.mongodb.internal.connection.OperationContext;
 import com.mongodb.lang.Nullable;
 import org.bson.BsonArray;
 import org.bson.BsonBoolean;
@@ -232,20 +233,20 @@ public CreateCollectionOperation encryptedFields(@Nullable final BsonDocument en
     }
 
     @Override
-    public Void execute(final WriteBinding binding) {
-        return withConnection(binding, connection -> {
+    public Void execute(final WriteBinding binding, final OperationContext operationContext) {
+        return withConnection(binding, operationContext, (connection, operationContextWithMinRtt)-> {
             checkEncryptedFieldsSupported(connection.getDescription());
             getCommandFunctions().forEach(commandCreator ->
-               executeCommand(binding, databaseName, commandCreator.get(), connection,
-                      writeConcernErrorTransformer(binding.getOperationContext().getTimeoutContext()))
+               executeCommand(binding, operationContextWithMinRtt,  databaseName, commandCreator.get(), connection,
+                      writeConcernErrorTransformer(operationContextWithMinRtt.getTimeoutContext()))
             );
             return null;
         });
     }
 
     @Override
-    public void executeAsync(final AsyncWriteBinding binding, final SingleResultCallback callback) {
-        withAsyncConnection(binding, (connection, t) -> {
+    public void executeAsync(final AsyncWriteBinding binding, final OperationContext operationContext, final SingleResultCallback callback) {
+        withAsyncConnection(binding, operationContext, (connection, operationContextWithMinRtt, t) -> {
             SingleResultCallback errHandlingCallback = errorHandlingCallback(callback, LOGGER);
             if (t != null) {
                 errHandlingCallback.onResult(null, t);
@@ -254,7 +255,7 @@ public void executeAsync(final AsyncWriteBinding binding, final SingleResultCall
                 if (!checkEncryptedFieldsSupported(connection.getDescription(), releasingCallback)) {
                     return;
                 }
-                new ProcessCommandsCallback(binding, connection, releasingCallback)
+                new ProcessCommandsCallback(binding, operationContextWithMinRtt, connection, releasingCallback)
                         .onResult(null, null);
             }
         });
@@ -398,13 +399,15 @@ private boolean checkEncryptedFieldsSupported(final ConnectionDescription connec
      */
     class ProcessCommandsCallback implements SingleResultCallback {
         private final AsyncWriteBinding binding;
+        private final OperationContext operationContext;
         private final AsyncConnection connection;
         private final SingleResultCallback  finalCallback;
         private final Deque> commands;
 
         ProcessCommandsCallback(
-                final AsyncWriteBinding binding, final AsyncConnection connection, final SingleResultCallback finalCallback) {
+                final AsyncWriteBinding binding, final OperationContext operationContext, final AsyncConnection connection, final SingleResultCallback finalCallback) {
             this.binding = binding;
+            this.operationContext = operationContext;
             this.connection = connection;
             this.finalCallback = finalCallback;
             this.commands = new ArrayDeque<>(getCommandFunctions());
@@ -420,8 +423,8 @@ public void onResult(@Nullable final Void result, @Nullable final Throwable t) {
             if (nextCommandFunction == null) {
                 finalCallback.onResult(null, null);
             } else {
-                executeCommandAsync(binding, databaseName, nextCommandFunction.get(),
-                        connection, writeConcernErrorTransformerAsync(binding.getOperationContext().getTimeoutContext()), this);
+                executeCommandAsync(binding, operationContext,  databaseName, nextCommandFunction.get(),
+                        connection, writeConcernErrorTransformerAsync(operationContext.getTimeoutContext()), this);
             }
         }
     }
diff --git a/driver-core/src/main/com/mongodb/internal/operation/CreateIndexesOperation.java b/driver-core/src/main/com/mongodb/internal/operation/CreateIndexesOperation.java
index 76de0757ff1..c3514aed046 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/CreateIndexesOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/CreateIndexesOperation.java
@@ -29,6 +29,7 @@
 import com.mongodb.internal.binding.AsyncWriteBinding;
 import com.mongodb.internal.binding.WriteBinding;
 import com.mongodb.internal.bulk.IndexRequest;
+import com.mongodb.internal.connection.OperationContext;
 import com.mongodb.lang.Nullable;
 import org.bson.BsonArray;
 import org.bson.BsonBoolean;
@@ -100,19 +101,18 @@ public CreateIndexesOperation commitQuorum(@Nullable final CreateIndexCommitQuor
     }
 
     @Override
-    public Void execute(final WriteBinding binding) {
+    public Void execute(final WriteBinding binding, final OperationContext operationContext) {
         try {
-            return executeCommand(binding, namespace.getDatabaseName(), getCommandCreator(), writeConcernErrorTransformer(
-                    binding.getOperationContext().getTimeoutContext()));
+            return executeCommand(binding, operationContext,  namespace.getDatabaseName(), getCommandCreator(), writeConcernErrorTransformer(
+                    operationContext.getTimeoutContext()));
         } catch (MongoCommandException e) {
             throw checkForDuplicateKeyError(e);
         }
     }
 
     @Override
-    public void executeAsync(final AsyncWriteBinding binding, final SingleResultCallback callback) {
-        executeCommandAsync(binding, namespace.getDatabaseName(), getCommandCreator(), writeConcernErrorTransformerAsync(binding
-                        .getOperationContext().getTimeoutContext()),
+    public void executeAsync(final AsyncWriteBinding binding, final OperationContext operationContext, final SingleResultCallback callback) {
+        executeCommandAsync(binding, operationContext,  namespace.getDatabaseName(), getCommandCreator(), writeConcernErrorTransformerAsync(operationContext.getTimeoutContext()),
                 ((result, t) -> {
                     if (t != null) {
                         callback.onResult(null, translateException(t));
diff --git a/driver-core/src/main/com/mongodb/internal/operation/CreateViewOperation.java b/driver-core/src/main/com/mongodb/internal/operation/CreateViewOperation.java
index 3636db08593..50c1c1720c2 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/CreateViewOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/CreateViewOperation.java
@@ -21,6 +21,7 @@
 import com.mongodb.internal.async.SingleResultCallback;
 import com.mongodb.internal.binding.AsyncWriteBinding;
 import com.mongodb.internal.binding.WriteBinding;
+import com.mongodb.internal.connection.OperationContext;
 import com.mongodb.lang.Nullable;
 import org.bson.BsonArray;
 import org.bson.BsonDocument;
@@ -124,24 +125,24 @@ public CreateViewOperation collation(@Nullable final Collation collation) {
     }
 
     @Override
-    public Void execute(final WriteBinding binding) {
-        return withConnection(binding, connection -> {
-            executeCommand(binding, databaseName, getCommand(), new BsonDocumentCodec(),
-                    writeConcernErrorTransformer(binding.getOperationContext().getTimeoutContext()));
+    public Void execute(final WriteBinding binding, final OperationContext operationContext) {
+        return withConnection(binding, operationContext, (connection, operationContextWithMinRtt) -> {
+            executeCommand(binding, operationContextWithMinRtt,  databaseName, getCommand(), new BsonDocumentCodec(),
+                    writeConcernErrorTransformer(operationContextWithMinRtt.getTimeoutContext()));
             return null;
         });
     }
 
     @Override
-    public void executeAsync(final AsyncWriteBinding binding, final SingleResultCallback callback) {
-        withAsyncConnection(binding, (connection, t) -> {
+    public void executeAsync(final AsyncWriteBinding binding, final OperationContext operationContext, final SingleResultCallback callback) {
+        withAsyncConnection(binding, operationContext, (connection, operationContextWithMinRtt, t) -> {
             SingleResultCallback errHandlingCallback = errorHandlingCallback(callback, LOGGER);
             if (t != null) {
                 errHandlingCallback.onResult(null, t);
             } else {
                 SingleResultCallback wrappedCallback = releasingCallback(errHandlingCallback, connection);
-                executeCommandAsync(binding, databaseName, getCommand(), connection,
-                        writeConcernErrorTransformerAsync(binding.getOperationContext().getTimeoutContext()),
+                executeCommandAsync(binding, operationContextWithMinRtt,  databaseName, getCommand(), connection,
+                        writeConcernErrorTransformerAsync(operationContextWithMinRtt.getTimeoutContext()),
                         wrappedCallback);
             }
         });
diff --git a/driver-core/src/main/com/mongodb/internal/operation/CursorResourceManagerNew.java b/driver-core/src/main/com/mongodb/internal/operation/CursorResourceManagerNew.java
new file mode 100644
index 00000000000..4cf08fa008a
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/operation/CursorResourceManagerNew.java
@@ -0,0 +1,262 @@
+package com.mongodb.internal.operation;
+
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import com.mongodb.MongoNamespace;
+import com.mongodb.MongoSocketException;
+import com.mongodb.ServerCursor;
+import com.mongodb.annotations.ThreadSafe;
+import com.mongodb.internal.binding.ReferenceCounted;
+import com.mongodb.internal.connection.Connection;
+import com.mongodb.internal.connection.OperationContext;
+import com.mongodb.lang.Nullable;
+
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+
+import static com.mongodb.assertions.Assertions.assertNotNull;
+import static com.mongodb.assertions.Assertions.assertNull;
+import static com.mongodb.assertions.Assertions.assertTrue;
+import static com.mongodb.assertions.Assertions.fail;
+import static com.mongodb.internal.Locks.withLock;
+import static com.mongodb.internal.operation.CommandBatchCursorHelper.MESSAGE_IF_CONCURRENT_OPERATION;
+
+@ThreadSafe
+abstract class CursorResourceManagerNew {
+    private final Lock lock;
+    private final MongoNamespace namespace;
+    private volatile State state;
+    @Nullable
+    private volatile CS connectionSource;
+    @Nullable
+    private volatile C pinnedConnection;
+    @Nullable
+    private volatile ServerCursor serverCursor;
+    private volatile boolean skipReleasingServerResourcesOnClose;
+
+    CursorResourceManagerNew(
+            final MongoNamespace namespace,
+            final CS connectionSource,
+            @Nullable final C connectionToPin,
+            @Nullable final ServerCursor serverCursor) {
+        this.lock = new ReentrantLock();
+        this.namespace = namespace;
+        this.state = State.IDLE;
+        if (serverCursor != null) {
+            connectionSource.retain();
+            this.connectionSource = connectionSource;
+            if (connectionToPin != null) {
+                connectionToPin.retain();
+                markAsPinned(connectionToPin, Connection.PinningMode.CURSOR);
+                this.pinnedConnection = connectionToPin;
+            }
+        }
+        this.skipReleasingServerResourcesOnClose = false;
+        this.serverCursor = serverCursor;
+    }
+
+    /**
+     * Thread-safe.
+     */
+    MongoNamespace getNamespace() {
+        return namespace;
+    }
+
+    /**
+     * Thread-safe.
+     */
+    State getState() {
+        return state;
+    }
+
+    /**
+     * Thread-safe.
+     */
+    @Nullable
+    CS getConnectionSource() {
+        return connectionSource;
+    }
+
+    /**
+     * Thread-safe.
+     */
+    @Nullable
+    C getPinnedConnection() {
+        return pinnedConnection;
+    }
+
+    /**
+     * Thread-safe.
+     */
+    boolean isSkipReleasingServerResourcesOnClose() {
+        return skipReleasingServerResourcesOnClose;
+    }
+
+    @SuppressWarnings("SameParameterValue")
+    abstract void markAsPinned(C connectionToPin, Connection.PinningMode pinningMode);
+
+    /**
+     * Thread-safe.
+     */
+    boolean operable() {
+        return state.operable();
+    }
+
+    /**
+     * Thread-safe.
+     * Returns {@code true} iff started an operation.
+     * If {@linkplain #operable() closed}, then returns false, otherwise completes abruptly.
+     *
+     * @throws IllegalStateException Iff another operation is in progress.
+     */
+    boolean tryStartOperation() throws IllegalStateException {
+        return withLock(lock, () -> {
+            State localState = state;
+            if (!localState.operable()) {
+                return false;
+            } else if (localState == State.IDLE) {
+                state = State.OPERATION_IN_PROGRESS;
+                return true;
+            } else if (localState == State.OPERATION_IN_PROGRESS) {
+                throw new IllegalStateException(MESSAGE_IF_CONCURRENT_OPERATION);
+            } else {
+                throw fail(state.toString());
+            }
+        });
+    }
+
+    /**
+     * Thread-safe.
+     */
+    void endOperation(final OperationContext operationContext) {
+        boolean doClose = withLock(lock, () -> {
+            State localState = state;
+            if (localState == State.OPERATION_IN_PROGRESS) {
+                state = State.IDLE;
+            } else if (localState == State.CLOSE_PENDING) {
+                state = State.CLOSED;
+                return true;
+            } else if (localState != State.CLOSED) {
+                throw fail(localState.toString());
+            }
+            return false;
+        });
+        if (doClose) {
+            doClose(operationContext);
+        }
+    }
+
+    /**
+     * Thread-safe.
+     */
+    void close(final OperationContext operationContext) {
+        boolean doClose = withLock(lock, () -> {
+            State localState = state;
+            if (localState.isOperationInProgress()) {
+                state = State.CLOSE_PENDING;
+            } else if (localState != State.CLOSED) {
+                state = State.CLOSED;
+                return true;
+            }
+            return false;
+        });
+        if (doClose) {
+            doClose(operationContext);
+        }
+    }
+
+    //    /**
+//     * This method is never executed concurrently with either itself or other operations
+//     * demarcated by {@link #tryStartOperation()}/{@link #endOperation()}.
+//     */
+    abstract void doClose(OperationContext operationContext);
+
+    void onCorruptedConnection(@Nullable final C corruptedConnection, final MongoSocketException e) {
+        // if `pinnedConnection` is corrupted, then we cannot kill `serverCursor` via such a connection
+        C localPinnedConnection = pinnedConnection;
+        if (localPinnedConnection != null) {
+            if (corruptedConnection != localPinnedConnection) {
+                e.addSuppressed(new AssertionError("Corrupted connection does not equal the pinned connection."));
+            }
+            skipReleasingServerResourcesOnClose = true;
+        }
+    }
+
+    /**
+     * Thread-safe.
+     */
+    @Nullable
+    final ServerCursor getServerCursor() {
+        return serverCursor;
+    }
+
+    void setServerCursor(@Nullable final ServerCursor serverCursor) {
+        assertTrue(state.isOperationInProgress());
+        assertNotNull(this.serverCursor);
+        // without `connectionSource` we will not be able to kill `serverCursor` later
+        assertNotNull(connectionSource);
+        this.serverCursor = serverCursor;
+        if (serverCursor == null) {
+            releaseClientResources();
+        }
+    }
+
+    void unsetServerCursor() {
+        this.serverCursor = null;
+    }
+
+    void releaseClientResources() {
+        assertNull(serverCursor);
+        CS localConnectionSource = connectionSource;
+        if (localConnectionSource != null) {
+            localConnectionSource.release();
+            connectionSource = null;
+        }
+        C localPinnedConnection = pinnedConnection;
+        if (localPinnedConnection != null) {
+            localPinnedConnection.release();
+            pinnedConnection = null;
+        }
+    }
+
+    enum State {
+        IDLE(true, false),
+        OPERATION_IN_PROGRESS(true, true),
+        /**
+         * Implies {@link #OPERATION_IN_PROGRESS}.
+         */
+        CLOSE_PENDING(false, true),
+        CLOSED(false, false);
+
+        private final boolean operable;
+        private final boolean operationInProgress;
+
+        State(final boolean operable, final boolean operationInProgress) {
+            this.operable = operable;
+            this.operationInProgress = operationInProgress;
+        }
+
+        boolean operable() {
+            return operable;
+        }
+
+        boolean isOperationInProgress() {
+            return operationInProgress;
+        }
+    }
+}
+
diff --git a/driver-core/src/main/com/mongodb/internal/operation/DistinctOperation.java b/driver-core/src/main/com/mongodb/internal/operation/DistinctOperation.java
index 547e5f0dfc1..4ae165390f1 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/DistinctOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/DistinctOperation.java
@@ -22,6 +22,7 @@
 import com.mongodb.internal.async.SingleResultCallback;
 import com.mongodb.internal.binding.AsyncReadBinding;
 import com.mongodb.internal.binding.ReadBinding;
+import com.mongodb.internal.connection.OperationContext;
 import com.mongodb.lang.Nullable;
 import org.bson.BsonDocument;
 import org.bson.BsonString;
@@ -108,14 +109,14 @@ public DistinctOperation hint(@Nullable final BsonValue hint) {
     }
 
     @Override
-    public BatchCursor execute(final ReadBinding binding) {
-        return executeRetryableRead(binding, namespace.getDatabaseName(), getCommandCreator(), createCommandDecoder(),
+    public BatchCursor execute(final ReadBinding binding, final OperationContext operationContext) {
+        return executeRetryableRead(binding, operationContext, namespace.getDatabaseName(), getCommandCreator(), createCommandDecoder(),
                 singleBatchCursorTransformer(VALUES), retryReads);
     }
 
     @Override
-    public void executeAsync(final AsyncReadBinding binding, final SingleResultCallback> callback) {
-        executeRetryableReadAsync(binding, namespace.getDatabaseName(),
+    public void executeAsync(final AsyncReadBinding binding, final OperationContext operationContext, final SingleResultCallback> callback) {
+        executeRetryableReadAsync(binding, operationContext,  namespace.getDatabaseName(),
                                   getCommandCreator(), createCommandDecoder(), asyncSingleBatchCursorTransformer(VALUES), retryReads,
                                   errorHandlingCallback(callback, LOGGER));
     }
diff --git a/driver-core/src/main/com/mongodb/internal/operation/DropCollectionOperation.java b/driver-core/src/main/com/mongodb/internal/operation/DropCollectionOperation.java
index d879f83e542..54b186a5c89 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/DropCollectionOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/DropCollectionOperation.java
@@ -26,6 +26,7 @@
 import com.mongodb.internal.binding.ReadWriteBinding;
 import com.mongodb.internal.binding.WriteBinding;
 import com.mongodb.internal.connection.AsyncConnection;
+import com.mongodb.internal.connection.OperationContext;
 import com.mongodb.lang.Nullable;
 import org.bson.BsonDocument;
 import org.bson.BsonString;
@@ -87,13 +88,13 @@ public DropCollectionOperation autoEncryptedFields(final boolean autoEncryptedFi
     }
 
     @Override
-    public Void execute(final WriteBinding binding) {
-        BsonDocument localEncryptedFields = getEncryptedFields((ReadWriteBinding) binding);
-        return withConnection(binding, connection -> {
+    public Void execute(final WriteBinding binding, final OperationContext operationContext) {
+        BsonDocument localEncryptedFields = getEncryptedFields((ReadWriteBinding) binding, operationContext);
+        return withConnection(binding, operationContext, (connection, operationContextWithMinRtt) -> {
             getCommands(localEncryptedFields).forEach(command -> {
                 try {
-                    executeCommand(binding, namespace.getDatabaseName(), command.get(),
-                            connection, writeConcernErrorTransformer(binding.getOperationContext().getTimeoutContext()));
+                    executeCommand(binding, operationContextWithMinRtt, namespace.getDatabaseName(), command.get(),
+                            connection, writeConcernErrorTransformer(operationContextWithMinRtt.getTimeoutContext()));
                 } catch (MongoCommandException e) {
                     rethrowIfNotNamespaceError(e);
                 }
@@ -103,17 +104,19 @@ public Void execute(final WriteBinding binding) {
     }
 
     @Override
-    public void executeAsync(final AsyncWriteBinding binding, final SingleResultCallback callback) {
+    public void executeAsync(final AsyncWriteBinding binding, final OperationContext operationContext,
+                             final SingleResultCallback callback) {
         SingleResultCallback errHandlingCallback = errorHandlingCallback(callback, LOGGER);
-        getEncryptedFields((AsyncReadWriteBinding) binding, (result, t) -> {
+        getEncryptedFields((AsyncReadWriteBinding) binding, operationContext, (result, t) -> {
             if (t != null) {
                 errHandlingCallback.onResult(null, t);
             } else {
-                withAsyncConnection(binding, (connection, t1) -> {
+                withAsyncConnection(binding, operationContext, (connection, operationContextWithMinRtt, t1) -> {
                     if (t1 != null) {
                         errHandlingCallback.onResult(null, t1);
                     } else {
-                        new ProcessCommandsCallback(binding, connection, getCommands(result), releasingCallback(errHandlingCallback,
+                        new ProcessCommandsCallback(binding, operationContextWithMinRtt, connection, getCommands(result),
+                                releasingCallback(errHandlingCallback,
                                 connection))
                                 .onResult(null, null);
                     }
@@ -173,9 +176,9 @@ private BsonDocument dropCollectionCommand() {
     }
 
     @Nullable
-    private BsonDocument getEncryptedFields(final ReadWriteBinding readWriteBinding) {
+    private BsonDocument getEncryptedFields(final ReadWriteBinding readWriteBinding, final OperationContext operationContext) {
         if (encryptedFields == null && autoEncryptedFields) {
-            try (BatchCursor cursor =  listCollectionOperation().execute(readWriteBinding)) {
+            try (BatchCursor cursor = listCollectionOperation().execute(readWriteBinding, operationContext)) {
                 return getCollectionEncryptedFields(encryptedFields, cursor.tryNext());
             }
         }
@@ -184,9 +187,10 @@ private BsonDocument getEncryptedFields(final ReadWriteBinding readWriteBinding)
 
     private void getEncryptedFields(
             final AsyncReadWriteBinding asyncReadWriteBinding,
+            final OperationContext operationContext,
             final SingleResultCallback callback) {
         if (encryptedFields == null && autoEncryptedFields) {
-            listCollectionOperation().executeAsync(asyncReadWriteBinding, (cursor, t) -> {
+            listCollectionOperation().executeAsync(asyncReadWriteBinding, operationContext, (cursor, t) -> {
                 if (t != null) {
                     callback.onResult(null, t);
                 } else {
@@ -224,15 +228,19 @@ private ListCollectionsOperation listCollectionOperation() {
      */
     class ProcessCommandsCallback implements SingleResultCallback {
         private final AsyncWriteBinding binding;
+        private final OperationContext operationContext;
         private final AsyncConnection connection;
         private final SingleResultCallback finalCallback;
         private final Deque> commands;
 
         ProcessCommandsCallback(
-                final AsyncWriteBinding binding, final AsyncConnection connection,
+                final AsyncWriteBinding binding,
+                final OperationContext operationContext,
+                final AsyncConnection connection,
                 final List> commands,
                 final SingleResultCallback finalCallback) {
             this.binding = binding;
+            this.operationContext = operationContext;
             this.connection = connection;
             this.finalCallback = finalCallback;
             this.commands = new ArrayDeque<>(commands);
@@ -249,8 +257,8 @@ public void onResult(@Nullable final Void result, @Nullable final Throwable t) {
                 finalCallback.onResult(null, null);
             } else {
                 try {
-                    executeCommandAsync(binding, namespace.getDatabaseName(), nextCommandFunction.get(),
-                            connection, writeConcernErrorTransformerAsync(binding.getOperationContext().getTimeoutContext()), this);
+                    executeCommandAsync(binding, operationContext,  namespace.getDatabaseName(), nextCommandFunction.get(),
+                            connection, writeConcernErrorTransformerAsync(operationContext.getTimeoutContext()), this);
                 } catch (MongoOperationTimeoutException operationTimeoutException) {
                     finalCallback.onResult(null, operationTimeoutException);
                 }
diff --git a/driver-core/src/main/com/mongodb/internal/operation/DropDatabaseOperation.java b/driver-core/src/main/com/mongodb/internal/operation/DropDatabaseOperation.java
index 9dd942cb726..d523a661a5d 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/DropDatabaseOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/DropDatabaseOperation.java
@@ -20,6 +20,7 @@
 import com.mongodb.internal.async.SingleResultCallback;
 import com.mongodb.internal.binding.AsyncWriteBinding;
 import com.mongodb.internal.binding.WriteBinding;
+import com.mongodb.internal.connection.OperationContext;
 import com.mongodb.lang.Nullable;
 import org.bson.BsonDocument;
 import org.bson.BsonInt32;
@@ -56,23 +57,23 @@ public WriteConcern getWriteConcern() {
     }
 
     @Override
-    public Void execute(final WriteBinding binding) {
-        return withConnection(binding, connection -> {
-            executeCommand(binding, databaseName, getCommand(), connection, writeConcernErrorTransformer(binding.getOperationContext()
+    public Void execute(final WriteBinding binding, final OperationContext operationContext) {
+        return withConnection(binding, operationContext, (connection, operationContextWithMinRtt) -> {
+            executeCommand(binding, operationContextWithMinRtt,  databaseName, getCommand(), connection, writeConcernErrorTransformer(operationContextWithMinRtt
                     .getTimeoutContext()));
             return null;
         });
     }
 
     @Override
-    public void executeAsync(final AsyncWriteBinding binding, final SingleResultCallback callback) {
-        withAsyncConnection(binding, (connection, t) -> {
+    public void executeAsync(final AsyncWriteBinding binding, final OperationContext operationContext, final SingleResultCallback callback) {
+        withAsyncConnection(binding, operationContext, (connection, operationContextWithMinRtt, t) -> {
             SingleResultCallback errHandlingCallback = errorHandlingCallback(callback, LOGGER);
             if (t != null) {
                 errHandlingCallback.onResult(null, t);
             } else {
-                executeCommandAsync(binding, databaseName, getCommand(), connection,
-                        writeConcernErrorTransformerAsync(binding.getOperationContext().getTimeoutContext()),
+                executeCommandAsync(binding, operationContextWithMinRtt,  databaseName, getCommand(), connection,
+                        writeConcernErrorTransformerAsync(operationContextWithMinRtt.getTimeoutContext()),
                         releasingCallback(errHandlingCallback, connection));
 
             }
diff --git a/driver-core/src/main/com/mongodb/internal/operation/DropIndexOperation.java b/driver-core/src/main/com/mongodb/internal/operation/DropIndexOperation.java
index e66a4e10bbf..37e8cfe4502 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/DropIndexOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/DropIndexOperation.java
@@ -22,6 +22,7 @@
 import com.mongodb.internal.async.SingleResultCallback;
 import com.mongodb.internal.binding.AsyncWriteBinding;
 import com.mongodb.internal.binding.WriteBinding;
+import com.mongodb.internal.connection.OperationContext;
 import com.mongodb.lang.Nullable;
 import org.bson.BsonDocument;
 import org.bson.BsonString;
@@ -65,11 +66,10 @@ public WriteConcern getWriteConcern() {
     }
 
     @Override
-    public Void execute(final WriteBinding binding) {
+    public Void execute(final WriteBinding binding, final OperationContext operationContext) {
         try {
-            executeCommand(binding, namespace.getDatabaseName(), getCommandCreator(), writeConcernErrorTransformer(binding
-                    .getOperationContext()
-                    .getTimeoutContext()));
+            executeCommand(binding, operationContext, namespace.getDatabaseName(), getCommandCreator(), writeConcernErrorTransformer(
+                    operationContext.getTimeoutContext()));
         } catch (MongoCommandException e) {
             rethrowIfNotNamespaceError(e);
         }
@@ -77,9 +77,10 @@ public Void execute(final WriteBinding binding) {
     }
 
     @Override
-    public void executeAsync(final AsyncWriteBinding binding, final SingleResultCallback callback) {
-        executeCommandAsync(binding, namespace.getDatabaseName(), getCommandCreator(),
-                writeConcernErrorTransformerAsync(binding.getOperationContext().getTimeoutContext()), (result, t) -> {
+    public void executeAsync(final AsyncWriteBinding binding, final OperationContext operationContext,
+                             final SingleResultCallback callback) {
+        executeCommandAsync(binding, operationContext,  namespace.getDatabaseName(), getCommandCreator(),
+                writeConcernErrorTransformerAsync(operationContext.getTimeoutContext()), (result, t) -> {
             if (t != null && !isNamespaceError(t)) {
                 callback.onResult(null, t);
             } else {
diff --git a/driver-core/src/main/com/mongodb/internal/operation/EstimatedDocumentCountOperation.java b/driver-core/src/main/com/mongodb/internal/operation/EstimatedDocumentCountOperation.java
index 17f7e617405..2cef2fef121 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/EstimatedDocumentCountOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/EstimatedDocumentCountOperation.java
@@ -22,6 +22,7 @@
 import com.mongodb.internal.async.SingleResultCallback;
 import com.mongodb.internal.binding.AsyncReadBinding;
 import com.mongodb.internal.binding.ReadBinding;
+import com.mongodb.internal.connection.OperationContext;
 import com.mongodb.lang.Nullable;
 import org.bson.BsonDocument;
 import org.bson.BsonString;
@@ -70,9 +71,9 @@ public EstimatedDocumentCountOperation comment(@Nullable final BsonValue comment
     }
 
     @Override
-    public Long execute(final ReadBinding binding) {
+    public Long execute(final ReadBinding binding, final OperationContext operationContext) {
         try {
-            return executeRetryableRead(binding, namespace.getDatabaseName(),
+            return executeRetryableRead(binding, operationContext, namespace.getDatabaseName(),
                                         getCommandCreator(), CommandResultDocumentCodec.create(DECODER, singletonList("firstBatch")),
                                         transformer(), retryReads);
         } catch (MongoCommandException e) {
@@ -81,8 +82,8 @@ public Long execute(final ReadBinding binding) {
     }
 
     @Override
-    public void executeAsync(final AsyncReadBinding binding, final SingleResultCallback callback) {
-        executeRetryableReadAsync(binding, namespace.getDatabaseName(),
+    public void executeAsync(final AsyncReadBinding binding, final OperationContext operationContext, final SingleResultCallback callback) {
+        executeRetryableReadAsync(binding, operationContext,  namespace.getDatabaseName(),
                                   getCommandCreator(), CommandResultDocumentCodec.create(DECODER, singletonList("firstBatch")),
                                   asyncTransformer(), retryReads,
                                   (result, t) -> {
@@ -95,11 +96,11 @@ public void executeAsync(final AsyncReadBinding binding, final SingleResultCallb
     }
 
     private CommandReadTransformer transformer() {
-        return (result, source, connection) -> transformResult(result, connection.getDescription());
+        return (result, source, connection, operationContext) -> transformResult(result, connection.getDescription());
     }
 
     private CommandReadTransformerAsync asyncTransformer() {
-        return (result, source, connection) -> transformResult(result, connection.getDescription());
+        return (result, source, connection, operationContext) -> transformResult(result, connection.getDescription());
     }
 
     private long transformResult(final BsonDocument result, final ConnectionDescription connectionDescription) {
diff --git a/driver-core/src/main/com/mongodb/internal/operation/ExplainCommandOperation.java b/driver-core/src/main/com/mongodb/internal/operation/ExplainCommandOperation.java
new file mode 100644
index 00000000000..a6aee45f588
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/operation/ExplainCommandOperation.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.operation;
+
+import com.mongodb.internal.async.SingleResultCallback;
+import com.mongodb.internal.binding.AsyncReadBinding;
+import com.mongodb.internal.binding.ReadBinding;
+import com.mongodb.internal.connection.OperationContext;
+import org.bson.BsonDocument;
+import org.bson.codecs.Decoder;
+
+import static com.mongodb.internal.operation.CommandOperationHelper.CommandCreator;
+
+/**
+ * 
This class is not part of the public API and may be removed or changed at any time

+ */
+public class ExplainCommandOperation extends CommandReadOperation {
+
+    public ExplainCommandOperation(final String databaseName, final BsonDocument command, final Decoder decoder) {
+        super(databaseName, (operationContext, serverDescription, connectionDescription) -> command, decoder);
+    }
+
+    public ExplainCommandOperation(final String databaseName, final CommandCreator commandCreator, final Decoder decoder) {
+        super(databaseName, commandCreator, decoder);
+    }
+
+    @Override
+    public T execute(final ReadBinding binding, final OperationContext operationContext) {
+        return super.execute(binding, operationContext.withTimeoutContextOverride(timeoutContext -> {
+            if (!timeoutContext.hasTimeoutMS()) {
+                return timeoutContext.withDisabledMaxTimeOverride();
+            }
+
+            return timeoutContext;
+        }));
+    }
+
+    @Override
+    public void executeAsync(final AsyncReadBinding binding, final OperationContext operationContext,
+                             final SingleResultCallback callback) {
+        super.executeAsync(binding, operationContext.withTimeoutContextOverride(timeoutContext -> {
+            if (!timeoutContext.hasTimeoutMS()) {
+                return timeoutContext.withDisabledMaxTimeOverride();
+            }
+
+            return timeoutContext;
+        }), callback);
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/internal/operation/FindOperation.java b/driver-core/src/main/com/mongodb/internal/operation/FindOperation.java
index 4f834bee349..89939e96cb3 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/FindOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/FindOperation.java
@@ -23,6 +23,7 @@
 import com.mongodb.MongoQueryException;
 import com.mongodb.client.cursor.TimeoutMode;
 import com.mongodb.client.model.Collation;
+import com.mongodb.internal.TimeoutContext;
 import com.mongodb.internal.async.AsyncBatchCursor;
 import com.mongodb.internal.async.SingleResultCallback;
 import com.mongodb.internal.async.function.AsyncCallbackSupplier;
@@ -54,7 +55,6 @@
 import static com.mongodb.internal.operation.ExplainHelper.asExplainCommand;
 import static com.mongodb.internal.operation.OperationHelper.LOGGER;
 import static com.mongodb.internal.operation.OperationHelper.canRetryRead;
-import static com.mongodb.internal.operation.OperationHelper.setNonTailableCursorMaxTimeSupplier;
 import static com.mongodb.internal.operation.OperationReadConcernHelper.appendReadConcernToCommand;
 import static com.mongodb.internal.operation.ServerVersionHelper.UNKNOWN_WIRE_VERSION;
 import static com.mongodb.internal.operation.SyncOperationHelper.CommandReadTransformer;
@@ -285,48 +285,67 @@ public FindOperation allowDiskUse(@Nullable final Boolean allowDiskUse) {
     }
 
     @Override
-    public BatchCursor execute(final ReadBinding binding) {
+    public BatchCursor execute(final ReadBinding binding, final OperationContext operationContext) {
         IllegalStateException invalidTimeoutModeException = invalidTimeoutModeException();
         if (invalidTimeoutModeException != null) {
             throw invalidTimeoutModeException;
         }
 
-        RetryState retryState = initialRetryState(retryReads,  binding.getOperationContext().getTimeoutContext());
-        Supplier> read = decorateReadWithRetries(retryState, binding.getOperationContext(), () ->
-            withSourceAndConnection(binding::getReadConnectionSource, false, (source, connection) -> {
-                retryState.breakAndThrowIfRetryAnd(() -> !canRetryRead(source.getServerDescription(), binding.getOperationContext()));
+        OperationContext findOperationContext;
+        if (shouldDisableMaxTimeMS()) {
+            findOperationContext = operationContext.withTimeoutContextOverride(TimeoutContext::withDisabledMaxTimeOverride);
+        } else {
+            findOperationContext = operationContext;
+        }
+
+        RetryState retryState = initialRetryState(retryReads, findOperationContext.getTimeoutContext());
+        Supplier> read = decorateReadWithRetries(retryState, findOperationContext, () ->
+                withSourceAndConnection(binding::getReadConnectionSource, false,
+                        (source, connection, commandOperationContext) -> {
+                            retryState.breakAndThrowIfRetryAnd(() -> !canRetryRead(source.getServerDescription(), commandOperationContext));
                 try {
-                    return createReadCommandAndExecute(retryState, binding.getOperationContext(), source, namespace.getDatabaseName(),
+                    return createReadCommandAndExecute(retryState, commandOperationContext, source, namespace.getDatabaseName(),
                                                        getCommandCreator(), CommandResultDocumentCodec.create(decoder, FIRST_BATCH),
                                                        transformer(), connection);
                 } catch (MongoCommandException e) {
                     throw new MongoQueryException(e.getResponse(), e.getServerAddress());
                 }
-            })
+          }, findOperationContext)
         );
         return read.get();
     }
 
+    private boolean shouldDisableMaxTimeMS() {
+        return isTailableCursor() && !isAwaitData() || timeoutMode == TimeoutMode.ITERATION;
+    }
+
     @Override
-    public void executeAsync(final AsyncReadBinding binding, final SingleResultCallback> callback) {
+    public void executeAsync(final AsyncReadBinding binding, final OperationContext operationContext, final SingleResultCallback> callback) {
         IllegalStateException invalidTimeoutModeException = invalidTimeoutModeException();
         if (invalidTimeoutModeException != null) {
             callback.onResult(null, invalidTimeoutModeException);
             return;
         }
 
-        RetryState retryState = initialRetryState(retryReads,  binding.getOperationContext().getTimeoutContext());
+        OperationContext findOperationContext;
+        if (shouldDisableMaxTimeMS()) {
+            findOperationContext = operationContext.withTimeoutContextOverride(TimeoutContext::withDisabledMaxTimeOverride);
+        } else {
+            findOperationContext = operationContext;
+        }
+
+        RetryState retryState = initialRetryState(retryReads, findOperationContext.getTimeoutContext());
         binding.retain();
         AsyncCallbackSupplier> asyncRead = decorateReadWithRetriesAsync(
-                retryState, binding.getOperationContext(), (AsyncCallbackSupplier>) funcCallback ->
-                    withAsyncSourceAndConnection(binding::getReadConnectionSource, false, funcCallback,
-                            (source, connection, releasingCallback) -> {
+                retryState, operationContext, (AsyncCallbackSupplier>) funcCallback ->
+                    withAsyncSourceAndConnection(binding::getReadConnectionSource, false, findOperationContext, funcCallback,
+                            (source, connection,   operationContextWithMinRTT, releasingCallback) -> {
                                 if (retryState.breakAndCompleteIfRetryAnd(() -> !canRetryRead(source.getServerDescription(),
-                                        binding.getOperationContext()), releasingCallback)) {
+                                        findOperationContext), releasingCallback)) {
                                     return;
                                 }
                                 SingleResultCallback> wrappedCallback = exceptionTransformingCallback(releasingCallback);
-                                createReadCommandAndExecuteAsync(retryState, binding.getOperationContext(), source,
+                                createReadCommandAndExecuteAsync(retryState, operationContextWithMinRTT, source,
                                         namespace.getDatabaseName(), getCommandCreator(),
                                         CommandResultDocumentCodec.create(decoder, FIRST_BATCH),
                                         asyncTransformer(), connection, wrappedCallback);
@@ -364,7 +383,7 @@ public  AsyncReadOperation asAsyncExplainableOperation(@Nullable final Exp
     }
 
      CommandReadOperation createExplainableOperation(@Nullable final ExplainVerbosity verbosity, final Decoder resultDecoder) {
-        return new CommandReadOperation<>(getNamespace().getDatabaseName(),
+        return new ExplainCommandOperation<>(getNamespace().getDatabaseName(),
                 (operationContext, serverDescription, connectionDescription) -> {
                     BsonDocument command = getCommand(operationContext, UNKNOWN_WIRE_VERSION);
                     applyMaxTimeMS(operationContext.getTimeoutContext(), command);
@@ -405,11 +424,7 @@ private BsonDocument getCommand(final OperationContext operationContext, final i
             commandDocument.put("tailable", BsonBoolean.TRUE);
             if (isAwaitData()) {
                 commandDocument.put("awaitData", BsonBoolean.TRUE);
-            } else {
-                operationContext.getTimeoutContext().disableMaxTimeOverride();
             }
-        } else {
-            setNonTailableCursorMaxTimeSupplier(timeoutMode, operationContext);
         }
 
         if (noCursorTimeout) {
@@ -469,15 +484,20 @@ private TimeoutMode getTimeoutMode() {
     }
 
     private CommandReadTransformer> transformer() {
-        return (result, source, connection) ->
-                new CommandBatchCursor<>(getTimeoutMode(), result, batchSize, getMaxTimeForCursor(source.getOperationContext()), decoder,
-                        comment, source, connection);
+        return (result, source, connection, operationContext) ->
+                new CommandBatchCursor<>(getTimeoutMode(), getMaxTimeForCursor(operationContext), operationContext,
+                        new CommandCoreCursor<>(
+                                result, batchSize, decoder, comment, source, connection
+                ));
     }
 
     private CommandReadTransformerAsync> asyncTransformer() {
-        return (result, source, connection) ->
-            new AsyncCommandBatchCursor<>(getTimeoutMode(), result, batchSize, getMaxTimeForCursor(source.getOperationContext()), decoder,
-                    comment, source, connection);
+        return (result, source, connection, operationContext) ->
+                new AsyncCommandBatchCursor<>(getTimeoutMode(), getMaxTimeForCursor(operationContext), operationContext,
+                        new AsyncCommandCoreCursor<>(
+                                result, batchSize, decoder,
+                                comment, source, connection
+                        ));
     }
 
     private long getMaxTimeForCursor(final OperationContext operationContext) {
diff --git a/driver-core/src/main/com/mongodb/internal/operation/ListCollectionsOperation.java b/driver-core/src/main/com/mongodb/internal/operation/ListCollectionsOperation.java
index 73abe905aea..5290e89aa5c 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/ListCollectionsOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/ListCollectionsOperation.java
@@ -25,6 +25,7 @@
 import com.mongodb.internal.async.function.RetryState;
 import com.mongodb.internal.binding.AsyncReadBinding;
 import com.mongodb.internal.binding.ReadBinding;
+import com.mongodb.internal.connection.OperationContext;
 import com.mongodb.lang.Nullable;
 import org.bson.BsonDocument;
 import org.bson.BsonInt32;
@@ -51,8 +52,8 @@
 import static com.mongodb.internal.operation.DocumentHelper.putIfNotNull;
 import static com.mongodb.internal.operation.DocumentHelper.putIfTrue;
 import static com.mongodb.internal.operation.OperationHelper.LOGGER;
+import static com.mongodb.internal.operation.OperationHelper.applyTimeoutModeToOperationContext;
 import static com.mongodb.internal.operation.OperationHelper.canRetryRead;
-import static com.mongodb.internal.operation.OperationHelper.setNonTailableCursorMaxTimeSupplier;
 import static com.mongodb.internal.operation.SingleBatchCursor.createEmptySingleBatchCursor;
 import static com.mongodb.internal.operation.SyncOperationHelper.CommandReadTransformer;
 import static com.mongodb.internal.operation.SyncOperationHelper.createReadCommandAndExecute;
@@ -158,36 +159,41 @@ public ListCollectionsOperation timeoutMode(@Nullable final TimeoutMode timeo
     }
 
     @Override
-    public BatchCursor execute(final ReadBinding binding) {
-        RetryState retryState = initialRetryState(retryReads, binding.getOperationContext().getTimeoutContext());
-        Supplier> read = decorateReadWithRetries(retryState, binding.getOperationContext(), () ->
-            withSourceAndConnection(binding::getReadConnectionSource, false, (source, connection) -> {
-                retryState.breakAndThrowIfRetryAnd(() -> !canRetryRead(source.getServerDescription(), binding.getOperationContext()));
+    public BatchCursor execute(final ReadBinding binding, final OperationContext operationContext) {
+        OperationContext listCollectionsOperationContext = applyTimeoutModeToOperationContext(timeoutMode, operationContext);
+
+        RetryState retryState = initialRetryState(retryReads, listCollectionsOperationContext.getTimeoutContext());
+        Supplier> read = decorateReadWithRetries(retryState, listCollectionsOperationContext, () ->
+            withSourceAndConnection(binding::getReadConnectionSource, false, (source, connection, operationContextWithMinRTT) -> {
+                retryState.breakAndThrowIfRetryAnd(() -> !canRetryRead(source.getServerDescription(), operationContextWithMinRTT));
                 try {
-                    return createReadCommandAndExecute(retryState, binding.getOperationContext(), source, databaseName,
+                    return createReadCommandAndExecute(retryState, operationContextWithMinRTT, source, databaseName,
                                                        getCommandCreator(), createCommandDecoder(), transformer(), connection);
                 } catch (MongoCommandException e) {
                     return rethrowIfNotNamespaceError(e,
                             createEmptySingleBatchCursor(source.getServerDescription().getAddress(), batchSize));
                 }
-            })
+            }, listCollectionsOperationContext)
         );
         return read.get();
     }
 
     @Override
-    public void executeAsync(final AsyncReadBinding binding, final SingleResultCallback> callback) {
-        RetryState retryState = initialRetryState(retryReads, binding.getOperationContext().getTimeoutContext());
+    public void executeAsync(final AsyncReadBinding binding, final OperationContext operationContext,
+                             final SingleResultCallback> callback) {
+        OperationContext listCollectionsOperationContext = applyTimeoutModeToOperationContext(timeoutMode, operationContext);
+
+        RetryState retryState = initialRetryState(retryReads, listCollectionsOperationContext.getTimeoutContext());
         binding.retain();
         AsyncCallbackSupplier> asyncRead = decorateReadWithRetriesAsync(
-                retryState, binding.getOperationContext(), (AsyncCallbackSupplier>) funcCallback ->
-                    withAsyncSourceAndConnection(binding::getReadConnectionSource, false, funcCallback,
-                            (source, connection, releasingCallback) -> {
+                retryState, listCollectionsOperationContext, (AsyncCallbackSupplier>) funcCallback ->
+                    withAsyncSourceAndConnection(binding::getReadConnectionSource, false, listCollectionsOperationContext, funcCallback,
+                            (source, connection, operationContextWithMinRtt, releasingCallback) -> {
                                 if (retryState.breakAndCompleteIfRetryAnd(() -> !canRetryRead(source.getServerDescription(),
-                                        binding.getOperationContext()), releasingCallback)) {
+                                        operationContextWithMinRtt), releasingCallback)) {
                                     return;
                                 }
-                                createReadCommandAndExecuteAsync(retryState, binding.getOperationContext(), source, databaseName,
+                                createReadCommandAndExecuteAsync(retryState, operationContextWithMinRtt, source, databaseName,
                                                                  getCommandCreator(), createCommandDecoder(), asyncTransformer(), connection,
                                         (result, t) -> {
                                             if (t != null && !isNamespaceError(t)) {
@@ -203,13 +209,13 @@ public void executeAsync(final AsyncReadBinding binding, final SingleResultCallb
     }
 
     private CommandReadTransformer> transformer() {
-        return (result, source, connection) ->
-                cursorDocumentToBatchCursor(timeoutMode, result, batchSize, decoder, comment, source, connection);
+        return (result, source, connection, operationContext) ->
+                cursorDocumentToBatchCursor(timeoutMode, result, batchSize, decoder, comment, source, connection, operationContext);
     }
 
     private CommandReadTransformerAsync> asyncTransformer() {
-        return (result, source, connection) ->
-                cursorDocumentToAsyncBatchCursor(timeoutMode, result, batchSize, decoder, comment, source, connection);
+        return (result, source, connection, operationContext) ->
+                cursorDocumentToAsyncBatchCursor(timeoutMode, result, batchSize, decoder, comment, source, connection, operationContext);
     }
 
 
@@ -220,7 +226,6 @@ private CommandCreator getCommandCreator() {
             putIfNotNull(commandDocument, "filter", filter);
             putIfTrue(commandDocument, "nameOnly", nameOnly);
             putIfTrue(commandDocument, "authorizedCollections", authorizedCollections);
-            setNonTailableCursorMaxTimeSupplier(timeoutMode, operationContext);
             putIfNotNull(commandDocument, "comment", comment);
             return commandDocument;
         };
diff --git a/driver-core/src/main/com/mongodb/internal/operation/ListDatabasesOperation.java b/driver-core/src/main/com/mongodb/internal/operation/ListDatabasesOperation.java
index 5f61c9192dd..283dd951b63 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/ListDatabasesOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/ListDatabasesOperation.java
@@ -20,6 +20,7 @@
 import com.mongodb.internal.async.SingleResultCallback;
 import com.mongodb.internal.binding.AsyncReadBinding;
 import com.mongodb.internal.binding.ReadBinding;
+import com.mongodb.internal.connection.OperationContext;
 import com.mongodb.lang.Nullable;
 import org.bson.BsonDocument;
 import org.bson.BsonInt32;
@@ -102,14 +103,16 @@ public ListDatabasesOperation comment(@Nullable final BsonValue comment) {
     }
 
     @Override
-    public BatchCursor execute(final ReadBinding binding) {
-        return executeRetryableRead(binding, "admin", getCommandCreator(), CommandResultDocumentCodec.create(decoder, DATABASES),
+    public BatchCursor execute(final ReadBinding binding, final OperationContext operationContext) {
+        return executeRetryableRead(binding, operationContext, "admin", getCommandCreator(),
+                CommandResultDocumentCodec.create(decoder, DATABASES),
                 singleBatchCursorTransformer(DATABASES), retryReads);
     }
 
     @Override
-    public void executeAsync(final AsyncReadBinding binding, final SingleResultCallback> callback) {
-        executeRetryableReadAsync(binding, "admin", getCommandCreator(), CommandResultDocumentCodec.create(decoder, DATABASES),
+    public void executeAsync(final AsyncReadBinding binding, final OperationContext operationContext,
+                             final SingleResultCallback> callback) {
+        executeRetryableReadAsync(binding, operationContext,  "admin", getCommandCreator(), CommandResultDocumentCodec.create(decoder, DATABASES),
                 asyncSingleBatchCursorTransformer(DATABASES), retryReads, errorHandlingCallback(callback, LOGGER));
     }
 
diff --git a/driver-core/src/main/com/mongodb/internal/operation/ListIndexesOperation.java b/driver-core/src/main/com/mongodb/internal/operation/ListIndexesOperation.java
index e540f752dbc..feff693e4eb 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/ListIndexesOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/ListIndexesOperation.java
@@ -25,6 +25,7 @@
 import com.mongodb.internal.async.function.RetryState;
 import com.mongodb.internal.binding.AsyncReadBinding;
 import com.mongodb.internal.binding.ReadBinding;
+import com.mongodb.internal.connection.OperationContext;
 import com.mongodb.lang.Nullable;
 import org.bson.BsonDocument;
 import org.bson.BsonString;
@@ -49,7 +50,7 @@
 import static com.mongodb.internal.operation.CursorHelper.getCursorDocumentFromBatchSize;
 import static com.mongodb.internal.operation.DocumentHelper.putIfNotNull;
 import static com.mongodb.internal.operation.OperationHelper.LOGGER;
-import static com.mongodb.internal.operation.OperationHelper.setNonTailableCursorMaxTimeSupplier;
+import static com.mongodb.internal.operation.OperationHelper.applyTimeoutModeToOperationContext;
 import static com.mongodb.internal.operation.OperationHelper.canRetryRead;
 import static com.mongodb.internal.operation.SingleBatchCursor.createEmptySingleBatchCursor;
 import static com.mongodb.internal.operation.SyncOperationHelper.CommandReadTransformer;
@@ -117,36 +118,40 @@ public ListIndexesOperation timeoutMode(@Nullable final TimeoutMode timeoutMo
     }
 
     @Override
-    public BatchCursor execute(final ReadBinding binding) {
-        RetryState retryState = initialRetryState(retryReads, binding.getOperationContext().getTimeoutContext());
-        Supplier> read = decorateReadWithRetries(retryState, binding.getOperationContext(), () ->
-            withSourceAndConnection(binding::getReadConnectionSource, false, (source, connection) -> {
-                retryState.breakAndThrowIfRetryAnd(() -> !canRetryRead(source.getServerDescription(), binding.getOperationContext()));
+    public BatchCursor execute(final ReadBinding binding, final OperationContext operationContext) {
+        OperationContext listIndexesOperationContext = applyTimeoutModeToOperationContext(timeoutMode, operationContext);
+
+        RetryState retryState = initialRetryState(retryReads, listIndexesOperationContext.getTimeoutContext());
+        Supplier> read = decorateReadWithRetries(retryState, listIndexesOperationContext, () ->
+            withSourceAndConnection(binding::getReadConnectionSource, false, (source, connection, operationContextWithMinRTT) -> {
+                retryState.breakAndThrowIfRetryAnd(() -> !canRetryRead(source.getServerDescription(), operationContextWithMinRTT));
                 try {
-                    return createReadCommandAndExecute(retryState, binding.getOperationContext(), source, namespace.getDatabaseName(),
+                    return createReadCommandAndExecute(retryState, operationContextWithMinRTT, source, namespace.getDatabaseName(),
                                                        getCommandCreator(), createCommandDecoder(), transformer(), connection);
                 } catch (MongoCommandException e) {
                     return rethrowIfNotNamespaceError(e,
                             createEmptySingleBatchCursor(source.getServerDescription().getAddress(), batchSize));
                 }
-            })
+            }, listIndexesOperationContext)
         );
         return read.get();
     }
 
     @Override
-    public void executeAsync(final AsyncReadBinding binding, final SingleResultCallback> callback) {
-        RetryState retryState = initialRetryState(retryReads, binding.getOperationContext().getTimeoutContext());
+    public void executeAsync(final AsyncReadBinding binding, final OperationContext operationContext, final SingleResultCallback> callback) {
+        OperationContext listIndexesOperationContext = applyTimeoutModeToOperationContext(timeoutMode, operationContext);
+
+        RetryState retryState = initialRetryState(retryReads, operationContext.getTimeoutContext());
         binding.retain();
         AsyncCallbackSupplier> asyncRead = decorateReadWithRetriesAsync(
-                retryState, binding.getOperationContext(), (AsyncCallbackSupplier>) funcCallback ->
-                    withAsyncSourceAndConnection(binding::getReadConnectionSource, false, funcCallback,
-                            (source, connection, releasingCallback) -> {
+                retryState, listIndexesOperationContext, (AsyncCallbackSupplier>) funcCallback ->
+                    withAsyncSourceAndConnection(binding::getReadConnectionSource, false, listIndexesOperationContext, funcCallback,
+                            (source, connection, operationContextWithMinRtt, releasingCallback) -> {
                                 if (retryState.breakAndCompleteIfRetryAnd(() -> !canRetryRead(source.getServerDescription(),
-                                        binding.getOperationContext()), releasingCallback)) {
+                                        operationContextWithMinRtt), releasingCallback)) {
                                     return;
                                 }
-                                createReadCommandAndExecuteAsync(retryState, binding.getOperationContext(), source,
+                                createReadCommandAndExecuteAsync(retryState, operationContextWithMinRtt, source,
                                         namespace.getDatabaseName(), getCommandCreator(), createCommandDecoder(),
                                         asyncTransformer(), connection,
                                         (result, t) -> {
@@ -167,20 +172,19 @@ private CommandCreator getCommandCreator() {
         return (operationContext, serverDescription, connectionDescription) -> {
             BsonDocument commandDocument = new BsonDocument("listIndexes", new BsonString(namespace.getCollectionName()))
                     .append("cursor", getCursorDocumentFromBatchSize(batchSize == 0 ? null : batchSize));
-            setNonTailableCursorMaxTimeSupplier(timeoutMode, operationContext);
             putIfNotNull(commandDocument, "comment", comment);
             return commandDocument;
         };
     }
 
     private CommandReadTransformer> transformer() {
-        return (result, source, connection) ->
-                cursorDocumentToBatchCursor(timeoutMode, result, batchSize, decoder, comment, source, connection);
+        return (result, source, connection, operationContext) ->
+                cursorDocumentToBatchCursor(timeoutMode, result, batchSize, decoder, comment, source, connection, operationContext);
     }
 
     private CommandReadTransformerAsync> asyncTransformer() {
-        return (result, source, connection) ->
-                cursorDocumentToAsyncBatchCursor(timeoutMode, result, batchSize, decoder, comment, source, connection);
+        return (result, source, connection, operationContext) ->
+                cursorDocumentToAsyncBatchCursor(timeoutMode, result, batchSize, decoder, comment, source, connection, operationContext);
     }
 
     private Codec createCommandDecoder() {
diff --git a/driver-core/src/main/com/mongodb/internal/operation/ListSearchIndexesOperation.java b/driver-core/src/main/com/mongodb/internal/operation/ListSearchIndexesOperation.java
index 3dfde30511d..136287b4bde 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/ListSearchIndexesOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/ListSearchIndexesOperation.java
@@ -24,6 +24,7 @@
 import com.mongodb.internal.async.SingleResultCallback;
 import com.mongodb.internal.binding.AsyncReadBinding;
 import com.mongodb.internal.binding.ReadBinding;
+import com.mongodb.internal.connection.OperationContext;
 import com.mongodb.lang.NonNull;
 import com.mongodb.lang.Nullable;
 import org.bson.BsonDocument;
@@ -74,9 +75,9 @@ public ListSearchIndexesOperation(final MongoNamespace namespace, final Decoder<
     }
 
     @Override
-    public BatchCursor execute(final ReadBinding binding) {
+    public BatchCursor execute(final ReadBinding binding, final OperationContext operationContext) {
         try {
-            return asAggregateOperation().execute(binding);
+            return asAggregateOperation().execute(binding, operationContext);
         } catch (MongoCommandException exception) {
             int cursorBatchSize = batchSize == null ? 0 : batchSize;
             if (!isNamespaceError(exception)) {
@@ -88,8 +89,8 @@ public BatchCursor execute(final ReadBinding binding) {
     }
 
     @Override
-    public void executeAsync(final AsyncReadBinding binding, final SingleResultCallback> callback) {
-        asAggregateOperation().executeAsync(binding, (cursor, exception) -> {
+    public void executeAsync(final AsyncReadBinding binding, final OperationContext operationContext, final SingleResultCallback> callback) {
+        asAggregateOperation().executeAsync(binding, operationContext, (cursor, exception) -> {
             if (exception != null && !isNamespaceError(exception)) {
                 callback.onResult(null, exception);
             } else if (exception != null) {
diff --git a/driver-core/src/main/com/mongodb/internal/operation/MapReduceToCollectionOperation.java b/driver-core/src/main/com/mongodb/internal/operation/MapReduceToCollectionOperation.java
index 327aa5e5fa7..a4bd3a0d8af 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/MapReduceToCollectionOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/MapReduceToCollectionOperation.java
@@ -24,6 +24,7 @@
 import com.mongodb.internal.async.SingleResultCallback;
 import com.mongodb.internal.binding.AsyncWriteBinding;
 import com.mongodb.internal.binding.WriteBinding;
+import com.mongodb.internal.connection.OperationContext;
 import com.mongodb.lang.Nullable;
 import org.bson.BsonBoolean;
 import org.bson.BsonDocument;
@@ -209,17 +210,19 @@ public MapReduceToCollectionOperation collation(@Nullable final Collation collat
     }
 
     @Override
-    public MapReduceStatistics execute(final WriteBinding binding) {
-        return executeCommand(binding, namespace.getDatabaseName(), getCommandCreator(), transformer(binding
-                .getOperationContext()
-                .getTimeoutContext()));
+    public MapReduceStatistics execute(final WriteBinding binding, final OperationContext operationContext) {
+        return executeCommand(binding,
+                operationContext,
+                namespace.getDatabaseName(),
+                getCommandCreator(),
+                transformer(operationContext.getTimeoutContext()));
     }
 
     @Override
-    public void executeAsync(final AsyncWriteBinding binding, final SingleResultCallback callback) {
-        executeCommandAsync(binding, namespace.getDatabaseName(), getCommandCreator(), transformerAsync(binding
-                .getOperationContext()
-                .getTimeoutContext()), callback);
+    public void executeAsync(final AsyncWriteBinding binding, final OperationContext operationContext,
+                             final SingleResultCallback callback) {
+        executeCommandAsync(binding, operationContext,  namespace.getDatabaseName(), getCommandCreator(),
+                transformerAsync(operationContext.getTimeoutContext()), callback);
     }
 
     /**
@@ -243,7 +246,7 @@ public AsyncReadOperation asExplainableOperationAsync(final Explai
     }
 
     private CommandReadOperation createExplainableOperation(final ExplainVerbosity explainVerbosity) {
-        return new CommandReadOperation<>(getNamespace().getDatabaseName(),
+        return new ExplainCommandOperation<>(getNamespace().getDatabaseName(),
                 (operationContext, serverDescription, connectionDescription) -> {
                     BsonDocument command = getCommandCreator().create(operationContext, serverDescription, connectionDescription);
                     applyMaxTimeMS(operationContext.getTimeoutContext(), command);
diff --git a/driver-core/src/main/com/mongodb/internal/operation/MapReduceWithInlineResultsOperation.java b/driver-core/src/main/com/mongodb/internal/operation/MapReduceWithInlineResultsOperation.java
index 273d8595ec8..eb80667fbf3 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/MapReduceWithInlineResultsOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/MapReduceWithInlineResultsOperation.java
@@ -22,6 +22,7 @@
 import com.mongodb.internal.async.SingleResultCallback;
 import com.mongodb.internal.binding.AsyncReadBinding;
 import com.mongodb.internal.binding.ReadBinding;
+import com.mongodb.internal.connection.OperationContext;
 import com.mongodb.lang.Nullable;
 import org.bson.BsonDocument;
 import org.bson.BsonInt32;
@@ -165,16 +166,17 @@ public MapReduceWithInlineResultsOperation collation(@Nullable final Collatio
     }
 
     @Override
-    public MapReduceBatchCursor execute(final ReadBinding binding) {
-        return executeRetryableRead(binding, namespace.getDatabaseName(),
+    public MapReduceBatchCursor execute(final ReadBinding binding, final OperationContext operationContext) {
+        return executeRetryableRead(binding, operationContext, namespace.getDatabaseName(),
                 getCommandCreator(),
                 CommandResultDocumentCodec.create(decoder, "results"), transformer(), false);
     }
 
     @Override
-    public void executeAsync(final AsyncReadBinding binding, final SingleResultCallback> callback) {
+    public void executeAsync(final AsyncReadBinding binding, final OperationContext operationContext,
+                             final SingleResultCallback> callback) {
         SingleResultCallback> errHandlingCallback = errorHandlingCallback(callback, LOGGER);
-        executeRetryableReadAsync(binding, namespace.getDatabaseName(),
+        executeRetryableReadAsync(binding, operationContext,  namespace.getDatabaseName(),
                 getCommandCreator(), CommandResultDocumentCodec.create(decoder, "results"),
                 asyncTransformer(), false, errHandlingCallback);
     }
@@ -188,7 +190,7 @@ public AsyncReadOperation asExplainableOperationAsync(final Explai
     }
 
     private CommandReadOperation createExplainableOperation(final ExplainVerbosity explainVerbosity) {
-        return new CommandReadOperation<>(namespace.getDatabaseName(),
+        return new ExplainCommandOperation<>(namespace.getDatabaseName(),
                 (operationContext, serverDescription, connectionDescription) -> {
                     BsonDocument command = getCommandCreator().create(operationContext, serverDescription, connectionDescription);
                     applyMaxTimeMS(operationContext.getTimeoutContext(), command);
@@ -198,7 +200,7 @@ private CommandReadOperation createExplainableOperation(final Expl
     }
 
     private CommandReadTransformer> transformer() {
-         return (result, source, connection) ->
+        return (result, source, connection, operationContext) ->
                 new MapReduceInlineResultsCursor<>(
                         new SingleBatchCursor<>(BsonDocumentWrapperHelper.toList(result, "results"), 0,
                                 connection.getDescription().getServerAddress()),
@@ -206,7 +208,7 @@ private CommandReadTransformer> transforme
     }
 
     private CommandReadTransformerAsync> asyncTransformer() {
-        return (result, source, connection) -> new MapReduceInlineResultsAsyncCursor<>(
+        return (result, source, connection, operationContext) -> new MapReduceInlineResultsAsyncCursor<>(
                 new AsyncSingleBatchCursor<>(BsonDocumentWrapperHelper.toList(result, "results"), 0),
                 MapReduceHelper.createStatistics(result));
     }
diff --git a/driver-core/src/main/com/mongodb/internal/operation/MixedBulkWriteOperation.java b/driver-core/src/main/com/mongodb/internal/operation/MixedBulkWriteOperation.java
index 06d392bceb2..b72f88c6ee7 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/MixedBulkWriteOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/MixedBulkWriteOperation.java
@@ -176,8 +176,8 @@ private boolean shouldAttemptToRetryWrite(final RetryState retryState, final Thr
     }
 
     @Override
-    public BulkWriteResult execute(final WriteBinding binding) {
-        TimeoutContext timeoutContext = binding.getOperationContext().getTimeoutContext();
+    public BulkWriteResult execute(final WriteBinding binding, final OperationContext operationContext) {
+        TimeoutContext timeoutContext = operationContext.getTimeoutContext();
         /* We cannot use the tracking of attempts built in the `RetryState` class because conceptually we have to maintain multiple attempt
          * counters while executing a single bulk write operation:
          * - a counter that limits attempts to select server and checkout a connection before we created a batch;
@@ -187,24 +187,26 @@ public BulkWriteResult execute(final WriteBinding binding) {
          * and the code related to the attempt tracking in `BulkWriteTracker` will be removed. */
         RetryState retryState = new RetryState(timeoutContext);
         BulkWriteTracker.attachNew(retryState, retryWrites, timeoutContext);
-        Supplier retryingBulkWrite = decorateWriteWithRetries(retryState, binding.getOperationContext(), () ->
-            withSourceAndConnection(binding::getWriteConnectionSource, true, (source, connection) -> {
+        Supplier retryingBulkWrite = decorateWriteWithRetries(retryState, operationContext, () ->
+            withSourceAndConnection(binding::getWriteConnectionSource, true, (source, connection, operationContextWithMinRTT) -> {
+                TimeoutContext timeoutContextWithMinRtt = operationContextWithMinRTT.getTimeoutContext();
                 ConnectionDescription connectionDescription = connection.getDescription();
                 // attach `maxWireVersion` ASAP because it is used to check whether we can retry
                 retryState.attach(AttachmentKeys.maxWireVersion(), connectionDescription.getMaxWireVersion(), true);
-                SessionContext sessionContext = binding.getOperationContext().getSessionContext();
+                SessionContext sessionContext = operationContext.getSessionContext();
                 WriteConcern writeConcern = validateAndGetEffectiveWriteConcern(this.writeConcern, sessionContext);
                 if (!isRetryableWrite(retryWrites, writeConcern, connectionDescription, sessionContext)) {
-                    handleMongoWriteConcernWithResponseException(retryState, true, timeoutContext);
+                    handleMongoWriteConcernWithResponseException(retryState, true, timeoutContextWithMinRtt);
                 }
                 validateWriteRequests(connectionDescription, bypassDocumentValidation, writeRequests, writeConcern);
                 if (!retryState.attachment(AttachmentKeys.bulkWriteTracker()).orElseThrow(Assertions::fail).batch().isPresent()) {
                     BulkWriteTracker.attachNew(retryState, BulkWriteBatch.createBulkWriteBatch(namespace,
                             connectionDescription, ordered, writeConcern,
-                            bypassDocumentValidation, retryWrites, writeRequests, binding.getOperationContext(), comment, variables), timeoutContext);
+                                    bypassDocumentValidation, retryWrites, writeRequests, operationContextWithMinRTT, comment, variables),
+                            timeoutContextWithMinRtt);
                 }
-                return executeBulkWriteBatch(retryState, writeConcern, binding, connection);
-            })
+                return executeBulkWriteBatch(retryState, writeConcern, binding, operationContextWithMinRTT, connection);
+            }, operationContext)
         );
         try {
             return retryingBulkWrite.get();
@@ -213,24 +215,26 @@ public BulkWriteResult execute(final WriteBinding binding) {
         }
     }
 
-    public void executeAsync(final AsyncWriteBinding binding, final SingleResultCallback callback) {
-        TimeoutContext timeoutContext = binding.getOperationContext().getTimeoutContext();
+    public void executeAsync(final AsyncWriteBinding binding, final OperationContext operationContext, final SingleResultCallback callback) {
+        TimeoutContext timeoutContext = operationContext.getTimeoutContext();
         // see the comment in `execute(WriteBinding)` explaining the manual tracking of attempts
         RetryState retryState = new RetryState(timeoutContext);
         BulkWriteTracker.attachNew(retryState, retryWrites, timeoutContext);
         binding.retain();
         AsyncCallbackSupplier retryingBulkWrite = this.decorateWriteWithRetries(retryState,
-                binding.getOperationContext(),
+                operationContext,
                 funcCallback ->
-            withAsyncSourceAndConnection(binding::getWriteConnectionSource, true, funcCallback,
-                    (source, connection, releasingCallback) -> {
+            withAsyncSourceAndConnection(binding::getWriteConnectionSource, true, operationContext, funcCallback,
+                    (source, connection, operationContextWithMinRtt, releasingCallback) -> {
+                TimeoutContext timeoutContextWithMinRtt = operationContextWithMinRtt.getTimeoutContext();
                 ConnectionDescription connectionDescription = connection.getDescription();
+
                 // attach `maxWireVersion` ASAP because it is used to check whether we can retry
                 retryState.attach(AttachmentKeys.maxWireVersion(), connectionDescription.getMaxWireVersion(), true);
-                SessionContext sessionContext = binding.getOperationContext().getSessionContext();
+                SessionContext sessionContext = operationContextWithMinRtt.getSessionContext();
                 WriteConcern writeConcern = validateAndGetEffectiveWriteConcern(this.writeConcern, sessionContext);
-                if (!isRetryableWrite(retryWrites, writeConcern, connectionDescription, sessionContext)
-                        && handleMongoWriteConcernWithResponseExceptionAsync(retryState, releasingCallback, timeoutContext)) {
+                        if (!isRetryableWrite(retryWrites, writeConcern, connectionDescription, sessionContext)
+                        && handleMongoWriteConcernWithResponseExceptionAsync(retryState, releasingCallback, timeoutContextWithMinRtt)) {
                     return;
                 }
                 if (validateWriteRequestsAndCompleteIfInvalid(connectionDescription, bypassDocumentValidation, writeRequests,
@@ -241,13 +245,13 @@ && handleMongoWriteConcernWithResponseExceptionAsync(retryState, releasingCallba
                     if (!retryState.attachment(AttachmentKeys.bulkWriteTracker()).orElseThrow(Assertions::fail).batch().isPresent()) {
                         BulkWriteTracker.attachNew(retryState, BulkWriteBatch.createBulkWriteBatch(namespace,
                                 connectionDescription, ordered, writeConcern,
-                                bypassDocumentValidation, retryWrites, writeRequests, binding.getOperationContext(), comment, variables), timeoutContext);
+                                bypassDocumentValidation, retryWrites, writeRequests, operationContextWithMinRtt, comment, variables), timeoutContextWithMinRtt);
                     }
                 } catch (Throwable t) {
                     releasingCallback.onResult(null, t);
                     return;
                 }
-                executeBulkWriteBatchAsync(retryState, writeConcern, binding, connection, releasingCallback);
+                executeBulkWriteBatchAsync(retryState, writeConcern, binding, operationContextWithMinRtt, connection, releasingCallback);
             })
         ).whenComplete(binding::release);
         retryingBulkWrite.get(exceptionTransformingCallback(errorHandlingCallback(callback, LOGGER)));
@@ -257,12 +261,12 @@ private BulkWriteResult executeBulkWriteBatch(
             final RetryState retryState,
             final WriteConcern effectiveWriteConcern,
             final WriteBinding binding,
+            final OperationContext operationContext,
             final Connection connection) {
         BulkWriteTracker currentBulkWriteTracker = retryState.attachment(AttachmentKeys.bulkWriteTracker())
                 .orElseThrow(Assertions::fail);
         BulkWriteBatch currentBatch = currentBulkWriteTracker.batch().orElseThrow(Assertions::fail);
         int maxWireVersion = connection.getDescription().getMaxWireVersion();
-        OperationContext operationContext = binding.getOperationContext();
         TimeoutContext timeoutContext = operationContext.getTimeoutContext();
 
         while (currentBatch.shouldProcessBatch()) {
@@ -305,6 +309,7 @@ private void executeBulkWriteBatchAsync(
             final RetryState retryState,
             final WriteConcern effectiveWriteConcern,
             final AsyncWriteBinding binding,
+            final OperationContext operationContext,
             final AsyncConnection connection,
             final SingleResultCallback callback) {
         LoopState loopState = new LoopState();
@@ -317,13 +322,13 @@ private void executeBulkWriteBatchAsync(
             if (loopState.breakAndCompleteIf(() -> !currentBatch.shouldProcessBatch(), iterationCallback)) {
                 return;
             }
-            OperationContext operationContext = binding.getOperationContext();
+
             TimeoutContext timeoutContext = operationContext.getTimeoutContext();
             executeCommandAsync(effectiveWriteConcern, operationContext, connection, currentBatch, (result, t) -> {
                 if (t == null) {
                     if (currentBatch.getRetryWrites() && !operationContext.getSessionContext().hasActiveTransaction()) {
                         MongoException writeConcernBasedError = ProtocolHelper.createSpecialException(result,
-                                connection.getDescription().getServerAddress(), "errMsg", binding.getOperationContext().getTimeoutContext());
+                                connection.getDescription().getServerAddress(), "errMsg", operationContext.getTimeoutContext());
                         if (writeConcernBasedError != null) {
                             if (currentBulkWriteTracker.lastAttempt()) {
                                 addRetryableWriteErrorLabel(writeConcernBasedError, maxWireVersion);
diff --git a/driver-core/src/main/com/mongodb/internal/operation/OperationHelper.java b/driver-core/src/main/com/mongodb/internal/operation/OperationHelper.java
index f980d309a8a..26dbdc60126 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/OperationHelper.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/OperationHelper.java
@@ -25,6 +25,7 @@
 import com.mongodb.connection.ConnectionDescription;
 import com.mongodb.connection.ServerDescription;
 import com.mongodb.connection.ServerType;
+import com.mongodb.internal.TimeoutContext;
 import com.mongodb.internal.async.SingleResultCallback;
 import com.mongodb.internal.async.function.AsyncCallbackFunction;
 import com.mongodb.internal.async.function.AsyncCallbackSupplier;
@@ -192,10 +193,12 @@ static boolean canRetryRead(final ServerDescription serverDescription, final Ope
         return true;
     }
 
-    static void setNonTailableCursorMaxTimeSupplier(final TimeoutMode timeoutMode, final OperationContext operationContext) {
+    static OperationContext applyTimeoutModeToOperationContext(final TimeoutMode timeoutMode,
+                                                               final OperationContext operationContext) {
         if (timeoutMode == TimeoutMode.ITERATION) {
-            operationContext.getTimeoutContext().disableMaxTimeOverride();
+            return operationContext.withTimeoutContextOverride(TimeoutContext::withDisabledMaxTimeOverride);
         }
+        return operationContext;
     }
 
     /**
diff --git a/driver-core/src/main/com/mongodb/internal/operation/ReadOperation.java b/driver-core/src/main/com/mongodb/internal/operation/ReadOperation.java
index aa5d2e7d451..3fa1a6d7ddd 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/ReadOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/ReadOperation.java
@@ -17,6 +17,7 @@
 package com.mongodb.internal.operation;
 
 import com.mongodb.internal.binding.ReadBinding;
+import com.mongodb.internal.connection.OperationContext;
 
 /**
  * An operation that reads from a MongoDB server.
@@ -31,5 +32,5 @@ public interface ReadOperation {
      * @param binding the binding to execute in the context of
      * @return T, the result of the execution
      */
-    T execute(ReadBinding binding);
+    T execute(ReadBinding binding, OperationContext operationContext);
 }
diff --git a/driver-core/src/main/com/mongodb/internal/operation/RenameCollectionOperation.java b/driver-core/src/main/com/mongodb/internal/operation/RenameCollectionOperation.java
index fd727f2fd81..e7d7edab279 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/RenameCollectionOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/RenameCollectionOperation.java
@@ -21,6 +21,7 @@
 import com.mongodb.internal.async.SingleResultCallback;
 import com.mongodb.internal.binding.AsyncWriteBinding;
 import com.mongodb.internal.binding.WriteBinding;
+import com.mongodb.internal.connection.OperationContext;
 import com.mongodb.lang.Nullable;
 import org.bson.BsonBoolean;
 import org.bson.BsonDocument;
@@ -74,20 +75,22 @@ public RenameCollectionOperation dropTarget(final boolean dropTarget) {
     }
 
     @Override
-    public Void execute(final WriteBinding binding) {
-        return withConnection(binding, connection -> executeCommand(binding, "admin", getCommand(), connection,
-                writeConcernErrorTransformer(binding.getOperationContext().getTimeoutContext())));
+    public Void execute(final WriteBinding binding, final OperationContext operationContext) {
+        return withConnection(binding, operationContext, (connection, operationContextWithMinRtt) ->
+                executeCommand(binding,
+                        operationContextWithMinRtt, "admin", getCommand(), connection,
+                        writeConcernErrorTransformer(operationContextWithMinRtt.getTimeoutContext())));
     }
 
     @Override
-    public void executeAsync(final AsyncWriteBinding binding, final SingleResultCallback callback) {
-        withAsyncConnection(binding, (connection, t) -> {
+    public void executeAsync(final AsyncWriteBinding binding, final OperationContext operationContext, final SingleResultCallback callback) {
+        withAsyncConnection(binding, operationContext, (connection, operationContextWithMinRtt, t) -> {
             SingleResultCallback errHandlingCallback = errorHandlingCallback(callback, LOGGER);
             if (t != null) {
                 errHandlingCallback.onResult(null, t);
             } else {
-                executeCommandAsync(binding, "admin", getCommand(), assertNotNull(connection),
-                        writeConcernErrorTransformerAsync(binding.getOperationContext().getTimeoutContext()),
+                executeCommandAsync(binding, operationContextWithMinRtt, "admin", getCommand(), assertNotNull(connection),
+                        writeConcernErrorTransformerAsync(operationContextWithMinRtt.getTimeoutContext()),
                         releasingCallback(errHandlingCallback, connection));
             }
         });
diff --git a/driver-core/src/main/com/mongodb/internal/operation/SyncOperationHelper.java b/driver-core/src/main/com/mongodb/internal/operation/SyncOperationHelper.java
index 6d013df59ba..8a7fa630d00 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/SyncOperationHelper.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/SyncOperationHelper.java
@@ -21,10 +21,6 @@
 import com.mongodb.client.cursor.TimeoutMode;
 import com.mongodb.internal.TimeoutContext;
 import com.mongodb.internal.VisibleForTesting;
-import com.mongodb.internal.async.SingleResultCallback;
-import com.mongodb.internal.async.function.AsyncCallbackBiFunction;
-import com.mongodb.internal.async.function.AsyncCallbackFunction;
-import com.mongodb.internal.async.function.AsyncCallbackSupplier;
 import com.mongodb.internal.async.function.RetryState;
 import com.mongodb.internal.async.function.RetryingSyncSupplier;
 import com.mongodb.internal.binding.ConnectionSource;
@@ -43,7 +39,6 @@
 import org.bson.codecs.BsonDocumentCodec;
 import org.bson.codecs.Decoder;
 
-import java.util.function.BiFunction;
 import java.util.function.Function;
 import java.util.function.Supplier;
 
@@ -64,11 +59,16 @@
 final class SyncOperationHelper {
 
     interface CallableWithConnection {
-        T call(Connection connection);
+        T call(Connection connection, OperationContext operationContext);
     }
 
     interface CallableWithSource {
-        T call(ConnectionSource source);
+        T call(ConnectionSource source, OperationContext operationContext);
+    }
+
+    @FunctionalInterface
+    interface ExecutionFunction {
+        R apply(ConnectionSource source, Connection connection, OperationContext operationContext);
     }
 
     interface CommandReadTransformer {
@@ -80,7 +80,7 @@ interface CommandReadTransformer {
          * @return the function result
          */
         @Nullable
-        R apply(T t, ConnectionSource source, Connection connection);
+        R apply(T t, ConnectionSource source, Connection connection, OperationContext operationContext);
     }
 
     interface CommandWriteTransformer {
@@ -97,38 +97,56 @@ interface CommandWriteTransformer {
 
     private static final BsonDocumentCodec BSON_DOCUMENT_CODEC = new BsonDocumentCodec();
 
-    static  T withReadConnectionSource(final ReadBinding binding, final CallableWithSource callable) {
-        ConnectionSource source = binding.getReadConnectionSource();
+    static  T withReadConnectionSource(final ReadBinding binding,
+                                          final OperationContext operationContext,
+                                          final CallableWithSource callable) {
+        OperationContext serverSelectionOperationContext =
+                operationContext.withTimeoutContextOverride(TimeoutContext::withComputedServerSelectionTimeoutContextNew);
+        ConnectionSource source = binding.getReadConnectionSource(serverSelectionOperationContext);
         try {
-            return callable.call(source);
+            return callable.call(source, operationContext.withMinRoundTripTime(source.getServerDescription()));
         } finally {
             source.release();
         }
     }
 
-    static  T withConnection(final WriteBinding binding, final CallableWithConnection callable) {
-        ConnectionSource source = binding.getWriteConnectionSource();
-        try {
-            return withConnectionSource(source, callable);
-        } finally {
-            source.release();
-        }
+    static  T withConnection(final WriteBinding binding,
+                                final OperationContext operationContext,
+                                final CallableWithConnection callable) {
+        return withSourceAndConnection(
+                binding::getWriteConnectionSource,
+                false,
+                (source, connection, operationContextWithMinRtt) ->
+                        callable.call(connection, operationContextWithMinRtt),
+                operationContext);
     }
 
     /**
      * Gets a {@link ConnectionSource} and a {@link Connection} from the {@code sourceSupplier} and executes the {@code function} with them.
      * Guarantees to {@linkplain ReferenceCounted#release() release} the source and the connection after completion of the {@code function}.
      *
-     * @param wrapConnectionSourceException See {@link #withSuppliedResource(Supplier, boolean, Function)}.
-     * @see #withSuppliedResource(Supplier, boolean, Function)
-     * @see AsyncOperationHelper#withAsyncSourceAndConnection(AsyncCallbackSupplier, boolean, SingleResultCallback, AsyncCallbackBiFunction)
+     *
      */
-    static  R withSourceAndConnection(final Supplier sourceSupplier,
-            final boolean wrapConnectionSourceException,
-            final BiFunction function) throws ResourceSupplierInternalException {
-        return withSuppliedResource(sourceSupplier, wrapConnectionSourceException, source ->
-                withSuppliedResource(source::getConnection, wrapConnectionSourceException, connection ->
-                        function.apply(source, connection)));
+    static  R withSourceAndConnection(final Function sourceFunction,
+                                         final boolean wrapConnectionSourceException,
+                                         final ExecutionFunction function,
+                                         final OperationContext originalOperationContext) throws ResourceSupplierInternalException {
+        OperationContext serverSelectionOperationContext =
+                originalOperationContext.withTimeoutContextOverride(TimeoutContext::withComputedServerSelectionTimeoutContextNew);
+
+        return withSuppliedResource(
+                sourceFunction,
+                wrapConnectionSourceException,
+                serverSelectionOperationContext,
+                source -> withSuppliedResource(
+                        source::getConnection,
+                        wrapConnectionSourceException,
+                        serverSelectionOperationContext.withMinRoundTripTime(source.getServerDescription()),
+                        connection -> function.apply(
+                                source,
+                                connection,
+                                originalOperationContext.withMinRoundTripTime(source.getServerDescription())))
+        );
     }
 
     /**
@@ -138,14 +156,16 @@ static  R withSourceAndConnection(final Supplier sourceSupp
      * @param wrapSupplierException If {@code true} and {@code resourceSupplier} completes abruptly, then the exception is wrapped
      * into {@link OperationHelper.ResourceSupplierInternalException}, such that it can be accessed
      * via {@link OperationHelper.ResourceSupplierInternalException#getCause()}.
-     * @see AsyncOperationHelper#withAsyncSuppliedResource(AsyncCallbackSupplier, boolean, SingleResultCallback, AsyncCallbackFunction)
      */
-    static  R withSuppliedResource(final Supplier resourceSupplier,
-            final boolean wrapSupplierException, final Function function) throws OperationHelper.ResourceSupplierInternalException {
+    static  R withSuppliedResource(final Function resourceSupplier,
+                                                                  final boolean wrapSupplierException,
+                                                                  final OperationContext operationContext,
+                                                                  final Function function)
+            throws OperationHelper.ResourceSupplierInternalException {
         T resource = null;
         try {
             try {
-                resource = resourceSupplier.get();
+                resource = resourceSupplier.apply(operationContext);
             } catch (Exception supplierException) {
                 if (wrapSupplierException) {
                     throw new ResourceSupplierInternalException(supplierException);
@@ -161,80 +181,77 @@ static  R withSuppliedResource(final Supplier
         }
     }
 
-    private static  T withConnectionSource(final ConnectionSource source, final CallableWithConnection callable) {
-        Connection connection = source.getConnection();
-        try {
-            return callable.call(connection);
-        } finally {
-            connection.release();
-        }
-    }
-
     static  T executeRetryableRead(
             final ReadBinding binding,
+            final OperationContext operationContext,
             final String database,
             final CommandCreator commandCreator,
             final Decoder decoder,
             final CommandReadTransformer transformer,
             final boolean retryReads) {
-        return executeRetryableRead(binding, binding::getReadConnectionSource, database, commandCreator,
+        return executeRetryableRead(operationContext, binding::getReadConnectionSource, database, commandCreator,
                                     decoder, transformer, retryReads);
     }
 
     static  T executeRetryableRead(
-            final ReadBinding binding,
-            final Supplier readConnectionSourceSupplier,
+            final OperationContext operationContext,
+            final Function readConnectionSourceSupplier,
             final String database,
             final CommandCreator commandCreator,
             final Decoder decoder,
             final CommandReadTransformer transformer,
             final boolean retryReads) {
-        RetryState retryState = CommandOperationHelper.initialRetryState(retryReads, binding.getOperationContext().getTimeoutContext());
+        RetryState retryState = CommandOperationHelper.initialRetryState(retryReads, operationContext.getTimeoutContext());
 
-        Supplier read = decorateReadWithRetries(retryState, binding.getOperationContext(), () ->
-                withSourceAndConnection(readConnectionSourceSupplier, false, (source, connection) -> {
-                    retryState.breakAndThrowIfRetryAnd(() -> !canRetryRead(source.getServerDescription(), binding.getOperationContext()));
-                    return createReadCommandAndExecute(retryState, binding.getOperationContext(), source, database,
+        Supplier read = decorateReadWithRetries(retryState, operationContext, () ->
+                withSourceAndConnection(readConnectionSourceSupplier, false, (source, connection, operationContextWithMinRtt) -> {
+                    retryState.breakAndThrowIfRetryAnd(() -> !canRetryRead(source.getServerDescription(), operationContextWithMinRtt));
+                    return createReadCommandAndExecute(retryState, operationContextWithMinRtt, source, database,
                                                        commandCreator, decoder, transformer, connection);
-                })
+                }, operationContext)
         );
         return read.get();
     }
 
     @VisibleForTesting(otherwise = PRIVATE)
-    static  T executeCommand(final WriteBinding binding, final String database, final CommandCreator commandCreator,
+    static  T executeCommand(final WriteBinding binding, final OperationContext operationContext, final String database,
+                                final CommandCreator commandCreator,
             final CommandWriteTransformer transformer) {
-        return withSourceAndConnection(binding::getWriteConnectionSource, false, (source, connection) ->
+        return withSourceAndConnection(binding::getWriteConnectionSource, false, (source, connection, operationContextWithMinRtt) ->
                 transformer.apply(assertNotNull(
                         connection.command(database,
-                                commandCreator.create(binding.getOperationContext(),
+                                commandCreator.create(operationContextWithMinRtt,
                                         source.getServerDescription(),
                                         connection.getDescription()),
-                                NoOpFieldNameValidator.INSTANCE, primary(), BSON_DOCUMENT_CODEC, binding.getOperationContext())),
-                        connection));
+                                NoOpFieldNameValidator.INSTANCE, primary(), BSON_DOCUMENT_CODEC, operationContextWithMinRtt)),
+                        connection), operationContext);
     }
 
     @VisibleForTesting(otherwise = PRIVATE)
-    static  T executeCommand(final WriteBinding binding, final String database, final BsonDocument command,
+    static  T executeCommand(final WriteBinding binding, final OperationContext operationContext, final String database,
+                                   final BsonDocument command,
                                    final Decoder decoder, final CommandWriteTransformer transformer) {
-        return withSourceAndConnection(binding::getWriteConnectionSource, false, (source, connection) ->
+        return withSourceAndConnection(binding::getWriteConnectionSource, false, (source, connection, operationContextWithMinRtt) ->
                 transformer.apply(assertNotNull(
                         connection.command(database, command, NoOpFieldNameValidator.INSTANCE, primary(), decoder,
-                                binding.getOperationContext())), connection));
+                                operationContextWithMinRtt)), connection),
+                operationContext);
     }
 
     @Nullable
-    static  T executeCommand(final WriteBinding binding, final String database, final BsonDocument command,
+    static  T executeCommand(final WriteBinding binding, final OperationContext operationContext, final String database,
+                                final BsonDocument command,
                                 final Connection connection, final CommandWriteTransformer transformer) {
         notNull("binding", binding);
         return transformer.apply(assertNotNull(
                 connection.command(database, command, NoOpFieldNameValidator.INSTANCE, primary(), BSON_DOCUMENT_CODEC,
-                        binding.getOperationContext())),
+                        operationContext)),
                 connection);
     }
 
     static  R executeRetryableWrite(
             final WriteBinding binding,
+            final OperationContext operationContext,
             final String database,
             @Nullable final ReadPreference readPreference,
             final FieldNameValidator fieldNameValidator,
@@ -242,14 +259,14 @@ static  R executeRetryableWrite(
             final CommandCreator commandCreator,
             final CommandWriteTransformer transformer,
             final com.mongodb.Function retryCommandModifier) {
-        RetryState retryState = CommandOperationHelper.initialRetryState(true, binding.getOperationContext().getTimeoutContext());
-        Supplier retryingWrite = decorateWriteWithRetries(retryState, binding.getOperationContext(), () -> {
+        RetryState retryState = CommandOperationHelper.initialRetryState(true, operationContext.getTimeoutContext());
+        Supplier retryingWrite = decorateWriteWithRetries(retryState, operationContext, () -> {
             boolean firstAttempt = retryState.isFirstAttempt();
-            SessionContext sessionContext = binding.getOperationContext().getSessionContext();
+            SessionContext sessionContext = operationContext.getSessionContext();
             if (!firstAttempt && sessionContext.hasActiveTransaction()) {
                 sessionContext.clearTransactionContext();
             }
-            return withSourceAndConnection(binding::getWriteConnectionSource, true, (source, connection) -> {
+            return withSourceAndConnection(binding::getWriteConnectionSource, true, (source, connection, operationContextWithMinRtt) -> {
                 int maxWireVersion = connection.getDescription().getMaxWireVersion();
                 try {
                     retryState.breakAndThrowIfRetryAnd(() -> !canRetryWrite(connection.getDescription(), sessionContext));
@@ -257,7 +274,7 @@ static  R executeRetryableWrite(
                             .map(previousAttemptCommand -> {
                                 assertFalse(firstAttempt);
                                 return retryCommandModifier.apply(previousAttemptCommand);
-                            }).orElseGet(() -> commandCreator.create(binding.getOperationContext(), source.getServerDescription(),
+                            }).orElseGet(() -> commandCreator.create(operationContextWithMinRtt, source.getServerDescription(),
                                     connection.getDescription()));
                     // attach `maxWireVersion`, `retryableCommandFlag` ASAP because they are used to check whether we should retry
                     retryState.attach(AttachmentKeys.maxWireVersion(), maxWireVersion, true)
@@ -265,7 +282,7 @@ static  R executeRetryableWrite(
                             .attach(AttachmentKeys.commandDescriptionSupplier(), command::getFirstKey, false)
                             .attach(AttachmentKeys.command(), command, false);
                     return transformer.apply(assertNotNull(connection.command(database, command, fieldNameValidator, readPreference,
-                                    commandResultDecoder, binding.getOperationContext())),
+                                    commandResultDecoder, operationContextWithMinRtt)),
                             connection);
                 } catch (MongoException e) {
                     if (!firstAttempt) {
@@ -273,7 +290,7 @@ static  R executeRetryableWrite(
                     }
                     throw e;
                 }
-            });
+            }, operationContext);
         });
         try {
             return retryingWrite.get();
@@ -295,8 +312,11 @@ static  T createReadCommandAndExecute(
         BsonDocument command = commandCreator.create(operationContext, source.getServerDescription(),
                 connection.getDescription());
         retryState.attach(AttachmentKeys.commandDescriptionSupplier(), command::getFirstKey, false);
-        return transformer.apply(assertNotNull(connection.command(database, command, NoOpFieldNameValidator.INSTANCE,
-                source.getReadPreference(), decoder, operationContext)), source, connection);
+
+        D result = assertNotNull(connection.command(database, command, NoOpFieldNameValidator.INSTANCE,
+                source.getReadPreference(), decoder, operationContext));
+
+        return transformer.apply(result, source, connection, operationContext);
     }
 
 
@@ -329,15 +349,19 @@ static CommandWriteTransformer writeConcernErrorTransformer(
     }
 
     static  CommandReadTransformer> singleBatchCursorTransformer(final String fieldName) {
-        return (result, source, connection) ->
+        return (result, source, connection, operationContext) ->
                 new SingleBatchCursor<>(BsonDocumentWrapperHelper.toList(result, fieldName), 0,
                         connection.getDescription().getServerAddress());
     }
 
     static  CommandBatchCursor cursorDocumentToBatchCursor(final TimeoutMode timeoutMode, final BsonDocument cursorDocument,
-            final int batchSize, final Decoder decoder, @Nullable final BsonValue comment, final ConnectionSource source,
-            final Connection connection) {
-        return new CommandBatchCursor<>(timeoutMode, cursorDocument, batchSize, 0, decoder, comment, source, connection);
+                                                                 final int batchSize, final Decoder decoder,
+                                                                 @Nullable final BsonValue comment, final ConnectionSource source,
+                                                                 final Connection connection, final OperationContext operationContext) {
+        return new CommandBatchCursor<>(timeoutMode, 0, operationContext, new CommandCoreCursor<>(
+                cursorDocument, batchSize, decoder, comment, source, connection
+        ));
+
     }
 
     private SyncOperationHelper() {
diff --git a/driver-core/src/main/com/mongodb/internal/operation/TransactionOperation.java b/driver-core/src/main/com/mongodb/internal/operation/TransactionOperation.java
index 8bf7ee76d25..435481772c2 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/TransactionOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/TransactionOperation.java
@@ -22,6 +22,7 @@
 import com.mongodb.internal.async.SingleResultCallback;
 import com.mongodb.internal.binding.AsyncWriteBinding;
 import com.mongodb.internal.binding.WriteBinding;
+import com.mongodb.internal.connection.OperationContext;
 import com.mongodb.internal.validator.NoOpFieldNameValidator;
 import org.bson.BsonDocument;
 import org.bson.BsonInt32;
@@ -54,19 +55,19 @@ public WriteConcern getWriteConcern() {
     }
 
     @Override
-    public Void execute(final WriteBinding binding) {
-        isTrue("in transaction", binding.getOperationContext().getSessionContext().hasActiveTransaction());
-        TimeoutContext timeoutContext = binding.getOperationContext().getTimeoutContext();
-        return executeRetryableWrite(binding, "admin", null, NoOpFieldNameValidator.INSTANCE,
+    public Void execute(final WriteBinding binding, final OperationContext operationContext) {
+        isTrue("in transaction", operationContext.getSessionContext().hasActiveTransaction());
+        TimeoutContext timeoutContext = operationContext.getTimeoutContext();
+        return executeRetryableWrite(binding, operationContext,  "admin", null, NoOpFieldNameValidator.INSTANCE,
                                      new BsonDocumentCodec(), getCommandCreator(),
                 writeConcernErrorTransformer(timeoutContext), getRetryCommandModifier(timeoutContext));
     }
 
     @Override
-    public void executeAsync(final AsyncWriteBinding binding, final SingleResultCallback callback) {
-        isTrue("in transaction", binding.getOperationContext().getSessionContext().hasActiveTransaction());
-        TimeoutContext timeoutContext = binding.getOperationContext().getTimeoutContext();
-        executeRetryableWriteAsync(binding, "admin", null, NoOpFieldNameValidator.INSTANCE,
+    public void executeAsync(final AsyncWriteBinding binding, final OperationContext operationContext, final SingleResultCallback callback) {
+        isTrue("in transaction", operationContext.getSessionContext().hasActiveTransaction());
+        TimeoutContext timeoutContext = operationContext.getTimeoutContext();
+        executeRetryableWriteAsync(binding, operationContext, "admin", null, NoOpFieldNameValidator.INSTANCE,
                                    new BsonDocumentCodec(), getCommandCreator(),
                 writeConcernErrorTransformerAsync(timeoutContext), getRetryCommandModifier(timeoutContext),
                                    errorHandlingCallback(callback, LOGGER));
diff --git a/driver-core/src/main/com/mongodb/internal/operation/WriteOperation.java b/driver-core/src/main/com/mongodb/internal/operation/WriteOperation.java
index 1a4fee36e1c..efe0b4f25f7 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/WriteOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/WriteOperation.java
@@ -17,6 +17,7 @@
 package com.mongodb.internal.operation;
 
 import com.mongodb.internal.binding.WriteBinding;
+import com.mongodb.internal.connection.OperationContext;
 
 /**
  * An operation which writes to a MongoDB server.
@@ -31,5 +32,5 @@ public interface WriteOperation {
      * @param binding the binding to execute in the context of
      * @return T, the result of the execution
      */
-    T execute(WriteBinding binding);
+    T execute(WriteBinding binding, OperationContext operationContext);
 }
diff --git a/driver-core/src/main/com/mongodb/internal/session/BaseClientSessionImpl.java b/driver-core/src/main/com/mongodb/internal/session/BaseClientSessionImpl.java
index 80f88cc08f5..48d5efc9f57 100644
--- a/driver-core/src/main/com/mongodb/internal/session/BaseClientSessionImpl.java
+++ b/driver-core/src/main/com/mongodb/internal/session/BaseClientSessionImpl.java
@@ -222,7 +222,7 @@ protected void setTimeoutContext(@Nullable final TimeoutContext timeoutContext)
 
     protected void resetTimeout() {
         if (timeoutContext != null) {
-            timeoutContext.resetTimeoutIfPresent();
+            timeoutContext = timeoutContext.withNewlyStartedTimeout();
         }
     }
 
diff --git a/driver-core/src/test/functional/com/mongodb/ClusterFixture.java b/driver-core/src/test/functional/com/mongodb/ClusterFixture.java
index 09976e363d6..cc40b786170 100644
--- a/driver-core/src/test/functional/com/mongodb/ClusterFixture.java
+++ b/driver-core/src/test/functional/com/mongodb/ClusterFixture.java
@@ -39,14 +39,12 @@
 import com.mongodb.internal.binding.AsyncOperationContextBinding;
 import com.mongodb.internal.binding.AsyncReadBinding;
 import com.mongodb.internal.binding.AsyncReadWriteBinding;
-import com.mongodb.internal.binding.AsyncSessionBinding;
 import com.mongodb.internal.binding.AsyncSingleConnectionBinding;
-import com.mongodb.internal.binding.AsyncWriteBinding;
 import com.mongodb.internal.binding.ClusterBinding;
 import com.mongodb.internal.binding.OperationContextBinding;
 import com.mongodb.internal.binding.ReadWriteBinding;
 import com.mongodb.internal.binding.ReferenceCounted;
-import com.mongodb.internal.binding.SessionBinding;
+import com.mongodb.internal.binding.SimpleSessionContext;
 import com.mongodb.internal.binding.SingleConnectionBinding;
 import com.mongodb.internal.connection.AsyncConnection;
 import com.mongodb.internal.connection.AsynchronousSocketChannelStreamFactory;
@@ -147,6 +145,8 @@ public final class ClusterFixture {
     private static Cluster cluster;
     private static Cluster asyncCluster;
     private static final Map BINDING_MAP = new HashMap<>();
+    private static final Map SESSION_CONTEXT_MAP = new HashMap<>();
+    private static final Map ASYNC_SESSION_CONTEXT_MAP = new HashMap<>();
     private static final Map ASYNC_BINDING_MAP = new HashMap<>();
 
     private static ServerVersion serverVersion;
@@ -186,7 +186,7 @@ public static ServerVersion getServerVersion() {
         if (serverVersion == null) {
             serverVersion = getVersion(new CommandReadOperation<>("admin",
                     new BsonDocument("buildInfo", new BsonInt32(1)), new BsonDocumentCodec())
-                    .execute(new ClusterBinding(getCluster(), ReadPreference.nearest(), ReadConcern.DEFAULT, OPERATION_CONTEXT)));
+                    .execute(new ClusterBinding(getCluster(), ReadPreference.nearest()), OPERATION_CONTEXT));
         }
         return serverVersion;
     }
@@ -248,7 +248,7 @@ public static boolean hasEncryptionTestsEnabled() {
     public static Document getServerStatus() {
         return new CommandReadOperation<>("admin", new BsonDocument("serverStatus", new BsonInt32(1)),
                 new DocumentCodec())
-                .execute(getBinding());
+                .execute(getBinding(), OPERATION_CONTEXT);
     }
 
     public static boolean supportsFsync() {
@@ -263,7 +263,7 @@ static class ShutdownHook extends Thread {
         public void run() {
             if (cluster != null) {
                 try {
-                    new DropDatabaseOperation(getDefaultDatabaseName(), WriteConcern.ACKNOWLEDGED).execute(getBinding());
+                    new DropDatabaseOperation(getDefaultDatabaseName(), WriteConcern.ACKNOWLEDGED).execute(getBinding(), OPERATION_CONTEXT);
                 } catch (MongoCommandException e) {
                     // if we do not have permission to drop the database, assume it is cleaned up in some other way
                     if (!e.getMessage().contains("Command dropDatabase requires authentication")) {
@@ -315,7 +315,7 @@ public static synchronized ConnectionString getConnectionString() {
         try {
             BsonDocument helloResult = new CommandReadOperation<>("admin",
                     new BsonDocument(LEGACY_HELLO, new BsonInt32(1)), new BsonDocumentCodec())
-                    .execute(new ClusterBinding(cluster, ReadPreference.nearest(), ReadConcern.DEFAULT, OPERATION_CONTEXT));
+                    .execute(new ClusterBinding(cluster, ReadPreference.nearest()), OPERATION_CONTEXT);
             if (helloResult.containsKey("setName")) {
                 connectionString = new ConnectionString(DEFAULT_URI + "/?replicaSet="
                         + helloResult.getString("setName").getValue());
@@ -363,7 +363,7 @@ public static ReadWriteBinding getBinding() {
     }
 
     public static ReadWriteBinding getBinding(final Cluster cluster) {
-        return new ClusterBinding(cluster, ReadPreference.primary(), ReadConcern.DEFAULT, OPERATION_CONTEXT);
+        return new ClusterBinding(cluster, ReadPreference.primary());
     }
 
     public static ReadWriteBinding getBinding(final TimeoutSettings timeoutSettings) {
@@ -390,13 +390,13 @@ private static ReadWriteBinding getBinding(final Cluster cluster,
             final ReadPreference readPreference,
             final OperationContext operationContext) {
         if (!BINDING_MAP.containsKey(readPreference)) {
-            ReadWriteBinding binding = new SessionBinding(new ClusterBinding(cluster, readPreference, ReadConcern.DEFAULT,
-                    operationContext));
+            ReadWriteBinding binding = new ClusterBinding(cluster, readPreference);
             BINDING_MAP.put(readPreference, binding);
+            SESSION_CONTEXT_MAP.put(readPreference, new SimpleSessionContext());
         }
         ReadWriteBinding readWriteBinding = BINDING_MAP.get(readPreference);
         return new OperationContextBinding(readWriteBinding,
-                operationContext.withSessionContext(readWriteBinding.getOperationContext().getSessionContext()));
+                operationContext.withSessionContext(SESSION_CONTEXT_MAP.get(readPreference)));
     }
 
     public static SingleConnectionBinding getSingleConnectionBinding() {
@@ -412,7 +412,7 @@ public static AsyncSingleConnectionBinding getAsyncSingleConnectionBinding(final
     }
 
     public static AsyncReadWriteBinding getAsyncBinding(final Cluster cluster) {
-        return new AsyncClusterBinding(cluster, ReadPreference.primary(), ReadConcern.DEFAULT, OPERATION_CONTEXT);
+        return new AsyncClusterBinding(cluster, ReadPreference.primary());
     }
 
     public static AsyncReadWriteBinding getAsyncBinding() {
@@ -436,13 +436,13 @@ public static AsyncReadWriteBinding getAsyncBinding(
             final ReadPreference readPreference,
             final OperationContext operationContext) {
         if (!ASYNC_BINDING_MAP.containsKey(readPreference)) {
-            AsyncReadWriteBinding binding = new AsyncSessionBinding(new AsyncClusterBinding(cluster, readPreference, ReadConcern.DEFAULT,
-                    operationContext));
+            AsyncReadWriteBinding binding = new AsyncClusterBinding(cluster, readPreference);
             ASYNC_BINDING_MAP.put(readPreference, binding);
+            ASYNC_SESSION_CONTEXT_MAP.put(readPreference, new SimpleSessionContext());
         }
         AsyncReadWriteBinding readWriteBinding = ASYNC_BINDING_MAP.get(readPreference);
         return new AsyncOperationContextBinding(readWriteBinding,
-                operationContext.withSessionContext(readWriteBinding.getOperationContext().getSessionContext()));
+                operationContext.withSessionContext(ASYNC_SESSION_CONTEXT_MAP.get(readPreference)));
     }
 
     public static synchronized Cluster getCluster() {
@@ -602,7 +602,7 @@ public static BsonDocument getServerParameters() {
         if (serverParameters == null) {
             serverParameters = new CommandReadOperation<>("admin",
                     new BsonDocument("getParameter", new BsonString("*")), new BsonDocumentCodec())
-                    .execute(getBinding());
+                    .execute(getBinding(), OPERATION_CONTEXT);
         }
         return serverParameters;
     }
@@ -666,7 +666,7 @@ public static void configureFailPoint(final BsonDocument failPointDocument) {
         if (!isSharded()) {
             try {
                 new CommandReadOperation<>("admin", failPointDocument, new BsonDocumentCodec())
-                        .execute(getBinding());
+                        .execute(getBinding(), OPERATION_CONTEXT);
             } catch (MongoCommandException e) {
                 if (e.getErrorCode() == COMMAND_NOT_FOUND_ERROR_CODE) {
                     failsPointsSupported = false;
@@ -682,7 +682,7 @@ public static void disableFailPoint(final String failPoint) {
                     .append("mode", new BsonString("off"));
             try {
                 new CommandReadOperation<>("admin", failPointDocument, new BsonDocumentCodec())
-                        .execute(getBinding());
+                        .execute(getBinding(), OPERATION_CONTEXT);
             } catch (MongoCommandException e) {
                 // ignore
             }
@@ -696,7 +696,7 @@ public static  T executeSync(final WriteOperation op) {
 
     @SuppressWarnings("overloads")
     public static  T executeSync(final WriteOperation op, final ReadWriteBinding binding) {
-        return op.execute(binding);
+        return op.execute(binding, applySessionContext(OPERATION_CONTEXT, binding.getReadPreference()));
     }
 
     @SuppressWarnings("overloads")
@@ -706,7 +706,12 @@ public static  T executeSync(final ReadOperation op) {
 
     @SuppressWarnings("overloads")
     public static  T executeSync(final ReadOperation op, final ReadWriteBinding binding) {
-        return op.execute(binding);
+        return op.execute(binding, OPERATION_CONTEXT);
+    }
+
+    @SuppressWarnings("overloads")
+    public static  T executeSync(final ReadOperation op, final ReadWriteBinding binding, final OperationContext operationContext) {
+        return op.execute(binding, operationContext);
     }
 
     @SuppressWarnings("overloads")
@@ -715,9 +720,9 @@ public static  T executeAsync(final AsyncWriteOperation op) throws Throwab
     }
 
     @SuppressWarnings("overloads")
-    public static  T executeAsync(final AsyncWriteOperation op, final AsyncWriteBinding binding) throws Throwable {
+    public static  T executeAsync(final AsyncWriteOperation op, final AsyncReadWriteBinding binding) throws Throwable {
         FutureResultCallback futureResultCallback = new FutureResultCallback<>();
-        op.executeAsync(binding, futureResultCallback);
+        op.executeAsync(binding, applySessionContext(OPERATION_CONTEXT, binding.getReadPreference()), futureResultCallback);
         return futureResultCallback.get(TIMEOUT, SECONDS);
     }
 
@@ -729,7 +734,13 @@ public static  T executeAsync(final AsyncReadOperation op) throws Throwabl
     @SuppressWarnings("overloads")
     public static  T executeAsync(final AsyncReadOperation op, final AsyncReadBinding binding) throws Throwable {
         FutureResultCallback futureResultCallback = new FutureResultCallback<>();
-        op.executeAsync(binding, futureResultCallback);
+        op.executeAsync(binding, OPERATION_CONTEXT, futureResultCallback);
+        return futureResultCallback.get(TIMEOUT, SECONDS);
+    }
+
+    public static  T executeAsync(final AsyncReadOperation op, final AsyncReadBinding binding, final OperationContext operationContext) throws Throwable {
+        FutureResultCallback futureResultCallback = new FutureResultCallback<>();
+        op.executeAsync(binding, operationContext, futureResultCallback);
         return futureResultCallback.get(TIMEOUT, SECONDS);
     }
 
@@ -793,19 +804,19 @@ public static  List collectCursorResults(final BatchCursor batchCursor)
 
     public static AsyncConnectionSource getWriteConnectionSource(final AsyncReadWriteBinding binding) throws Throwable {
         FutureResultCallback futureResultCallback = new FutureResultCallback<>();
-        binding.getWriteConnectionSource(futureResultCallback);
+        binding.getWriteConnectionSource(OPERATION_CONTEXT, futureResultCallback);
         return futureResultCallback.get(TIMEOUT, SECONDS);
     }
 
     public static AsyncConnectionSource getReadConnectionSource(final AsyncReadWriteBinding binding) throws Throwable {
         FutureResultCallback futureResultCallback = new FutureResultCallback<>();
-        binding.getReadConnectionSource(futureResultCallback);
+        binding.getReadConnectionSource(OPERATION_CONTEXT, futureResultCallback);
         return futureResultCallback.get(TIMEOUT, SECONDS);
     }
 
     public static AsyncConnection getConnection(final AsyncConnectionSource source) throws Throwable {
         FutureResultCallback futureResultCallback = new FutureResultCallback<>();
-        source.getConnection(futureResultCallback);
+        source.getConnection(OPERATION_CONTEXT, futureResultCallback);
         return futureResultCallback.get(TIMEOUT, SECONDS);
     }
 
@@ -839,4 +850,16 @@ public static ClusterSettings.Builder setDirectConnection(final ClusterSettings.
         return builder.mode(ClusterConnectionMode.SINGLE).hosts(singletonList(getPrimary()));
     }
 
+    private static OperationContext applySessionContext(final OperationContext operationContext, final ReadPreference readPreference) {
+        SimpleSessionContext simpleSessionContext = SESSION_CONTEXT_MAP.get(readPreference);
+        if (simpleSessionContext == null) {
+            simpleSessionContext = new SimpleSessionContext();
+            SESSION_CONTEXT_MAP.put(readPreference, simpleSessionContext);
+        }
+        return operationContext.withSessionContext(simpleSessionContext);
+    }
+
+    public static OperationContext getOperationContext(final ReadPreference readPreference) {
+        return applySessionContext(OPERATION_CONTEXT, readPreference);
+    }
 }
diff --git a/driver-core/src/test/functional/com/mongodb/OperationFunctionalSpecification.groovy b/driver-core/src/test/functional/com/mongodb/OperationFunctionalSpecification.groovy
index 9fc12eddd93..ecfe63f09b5 100644
--- a/driver-core/src/test/functional/com/mongodb/OperationFunctionalSpecification.groovy
+++ b/driver-core/src/test/functional/com/mongodb/OperationFunctionalSpecification.groovy
@@ -30,6 +30,7 @@ import com.mongodb.connection.ServerConnectionState
 import com.mongodb.connection.ServerDescription
 import com.mongodb.connection.ServerType
 import com.mongodb.connection.ServerVersion
+import com.mongodb.internal.async.SingleResultCallback
 import com.mongodb.internal.binding.AsyncConnectionSource
 import com.mongodb.internal.binding.AsyncReadBinding
 import com.mongodb.internal.binding.AsyncReadWriteBinding
@@ -45,6 +46,7 @@ import com.mongodb.internal.binding.WriteBinding
 import com.mongodb.internal.bulk.InsertRequest
 import com.mongodb.internal.connection.AsyncConnection
 import com.mongodb.internal.connection.Connection
+import com.mongodb.internal.connection.OperationContext
 import com.mongodb.internal.connection.ServerHelper
 import com.mongodb.internal.connection.SplittablePayload
 import com.mongodb.internal.operation.AsyncReadOperation
@@ -108,7 +110,7 @@ class OperationFunctionalSpecification extends Specification {
 
     void acknowledgeWrite(final SingleConnectionBinding binding) {
         new MixedBulkWriteOperation(getNamespace(), [new InsertRequest(new BsonDocument())], true,
-                ACKNOWLEDGED, false).execute(binding)
+                ACKNOWLEDGED, false).execute(binding, OPERATION_CONTEXT)
         binding.release()
     }
 
@@ -151,10 +153,18 @@ class OperationFunctionalSpecification extends Specification {
         ClusterFixture.executeSync(operation, binding)
     }
 
+    def execute(operation, ReadWriteBinding binding, OperationContext operationContext) {
+        ClusterFixture.executeSync(operation, binding, operationContext)
+    }
+
     def execute(operation, AsyncReadWriteBinding binding) {
         ClusterFixture.executeAsync(operation, binding)
     }
 
+    def execute(operation, AsyncReadWriteBinding binding, OperationContext operationContext) {
+        ClusterFixture.executeAsync(operation, binding, operationContext)
+    }
+
     def executeAndCollectBatchCursorResults(operation, boolean async) {
         def cursor = execute(operation, async)
         def results = []
@@ -284,10 +294,9 @@ class OperationFunctionalSpecification extends Specification {
         }
 
         def connectionSource = Stub(ConnectionSource) {
-            getConnection() >> {
+            getConnection(_ as OperationContext) >> {
                 connection
             }
-            getOperationContext() >> operationContext
             getReadPreference() >> readPreference
             getServerDescription() >> {
                 def builder = ServerDescription.builder().address(Stub(ServerAddress)).state(ServerConnectionState.CONNECTED)
@@ -300,11 +309,9 @@ class OperationFunctionalSpecification extends Specification {
         def readBinding = Stub(ReadBinding) {
             getReadConnectionSource(*_) >> connectionSource
             getReadPreference() >> readPreference
-            getOperationContext() >> operationContext
         }
         def writeBinding = Stub(WriteBinding) {
-            getWriteConnectionSource() >> connectionSource
-            getOperationContext() >> operationContext
+            getWriteConnectionSource(_) >> connectionSource
         }
 
         if (retryable) {
@@ -338,9 +345,9 @@ class OperationFunctionalSpecification extends Specification {
             1 * connection.release()
         }
         if (operation instanceof ReadOperation) {
-            operation.execute(readBinding)
+            operation.execute(readBinding, operationContext)
         } else if (operation instanceof WriteOperation) {
-            operation.execute(writeBinding)
+            operation.execute(writeBinding, operationContext)
         }
     }
 
@@ -361,9 +368,10 @@ class OperationFunctionalSpecification extends Specification {
         }
 
         def connectionSource = Stub(AsyncConnectionSource) {
-            getConnection(_) >> { it[0].onResult(connection, null) }
+            getConnection(_ as OperationContext, _ as SingleResultCallback) >> {
+                it[1].onResult(connection, null)
+            }
             getReadPreference() >> readPreference
-            getOperationContext() >> operationContext
             getServerDescription() >> {
                 def builder = ServerDescription.builder().address(Stub(ServerAddress)).state(ServerConnectionState.CONNECTED)
                 if (new ServerVersion(serverVersion).compareTo(new ServerVersion(3, 6)) >= 0) {
@@ -375,11 +383,11 @@ class OperationFunctionalSpecification extends Specification {
         def readBinding = Stub(AsyncReadBinding) {
             getReadConnectionSource(*_) >> { it.last().onResult(connectionSource, null) }
             getReadPreference() >> readPreference
-            getOperationContext() >> operationContext
         }
         def writeBinding = Stub(AsyncWriteBinding) {
-            getWriteConnectionSource(_) >> { it[0].onResult(connectionSource, null) }
-            getOperationContext() >> operationContext
+            getWriteConnectionSource(_ as OperationContext, _ as SingleResultCallback) >> {
+                it[1].onResult(connectionSource, null)
+            }
         }
         def callback = new FutureResultCallback()
 
@@ -417,9 +425,9 @@ class OperationFunctionalSpecification extends Specification {
         }
 
         if (operation instanceof AsyncReadOperation) {
-            operation.executeAsync(readBinding, callback)
+            operation.executeAsync(readBinding, operationContext, callback)
         } else if (operation instanceof AsyncWriteOperation) {
-            operation.executeAsync(writeBinding, callback)
+            operation.executeAsync(writeBinding, operationContext, callback)
         }
          try {
              callback.get(1000, TimeUnit.MILLISECONDS)
@@ -449,18 +457,16 @@ class OperationFunctionalSpecification extends Specification {
                 })
 
         def connectionSource = Stub(ConnectionSource) {
-            getConnection() >> {
+            getConnection(_) >> {
                 if (serverVersions.isEmpty()){
                     throw new MongoSocketOpenException('No Server', new ServerAddress(), new Exception('no server'))
                 } else {
                     connection
                 }
             }
-            getOperationContext() >> operationContext
         }
         def writeBinding = Stub(WriteBinding) {
-            getWriteConnectionSource() >> connectionSource
-            getOperationContext() >> operationContext
+            getWriteConnectionSource(_) >> connectionSource
         }
 
         1 * connection.command(*_) >> {
@@ -468,7 +474,7 @@ class OperationFunctionalSpecification extends Specification {
         }
 
         expectedConnectionReleaseCount * connection.release()
-        operation.execute(writeBinding)
+        operation.execute(writeBinding, operationContext)
     }
 
     def testAyncRetryableOperationThrows(operation, Queue> serverVersions, Queue serverTypes,
@@ -492,27 +498,25 @@ class OperationFunctionalSpecification extends Specification {
                 })
 
         def connectionSource = Stub(AsyncConnectionSource) {
-            getConnection(_) >> {
+            getConnection(_ as OperationContext, _ as SingleResultCallback) >> {
                 if (serverVersions.isEmpty()) {
-                    it[0].onResult(null,
+                    it[1].onResult(null,
                             new MongoSocketOpenException('No Server', new ServerAddress(), new Exception('no server')))
                 } else {
-                    it[0].onResult(connection, null)
+                    it[1].onResult(connection, null)
                 }
             }
-            getOperationContext() >> operationContext
         }
 
         def writeBinding = Stub(AsyncWriteBinding) {
-            getWriteConnectionSource(_) >> { it[0].onResult(connectionSource, null) }
-            getOperationContext() >> operationContext
+            getWriteConnectionSource(_ as OperationContext, _ as SingleResultCallback) >> { it[1].onResult(connectionSource, null) }
         }
         def callback = new FutureResultCallback()
 
         1 * connection.commandAsync(*_) >> { it.last().onResult(null, exception) }
         expectedConnectionReleaseCount * connection.release()
 
-        operation.executeAsync(writeBinding, callback)
+        operation.executeAsync(writeBinding, operationContext, callback)
         callback.get(1000, TimeUnit.MILLISECONDS)
     }
 
diff --git a/driver-core/src/test/functional/com/mongodb/client/test/CollectionHelper.java b/driver-core/src/test/functional/com/mongodb/client/test/CollectionHelper.java
index 3e58712ca9c..6f06f43ee9f 100644
--- a/driver-core/src/test/functional/com/mongodb/client/test/CollectionHelper.java
+++ b/driver-core/src/test/functional/com/mongodb/client/test/CollectionHelper.java
@@ -72,6 +72,7 @@
 import java.util.Optional;
 import java.util.stream.Collectors;
 
+import static com.mongodb.ClusterFixture.OPERATION_CONTEXT;
 import static com.mongodb.ClusterFixture.executeAsync;
 import static com.mongodb.ClusterFixture.getBinding;
 import static java.util.Arrays.asList;
@@ -91,7 +92,7 @@ public CollectionHelper(final Codec codec, final MongoNamespace namespace) {
 
     public T hello() {
         return new CommandReadOperation<>("admin", BsonDocument.parse("{isMaster: 1}"), codec)
-                .execute(getBinding());
+                .execute(getBinding(), OPERATION_CONTEXT);
     }
 
     public static void drop(final MongoNamespace namespace) {
@@ -104,7 +105,7 @@ public static void drop(final MongoNamespace namespace, final WriteConcern write
         boolean success = false;
         while (!success) {
             try {
-                new DropCollectionOperation(namespace, writeConcern).execute(getBinding());
+                new DropCollectionOperation(namespace, writeConcern).execute(getBinding(), OPERATION_CONTEXT);
                 success = true;
             } catch (MongoWriteConcernException e) {
                 LOGGER.info("Retrying drop collection after a write concern error: " + e);
@@ -129,7 +130,7 @@ public static void dropDatabase(final String name, final WriteConcern writeConce
             return;
         }
         try {
-            new DropDatabaseOperation(name, writeConcern).execute(getBinding());
+            new DropDatabaseOperation(name, writeConcern).execute(getBinding(), OPERATION_CONTEXT);
         } catch (MongoCommandException e) {
             if (!e.getErrorMessage().contains("ns not found")) {
                 throw e;
@@ -139,7 +140,7 @@ public static void dropDatabase(final String name, final WriteConcern writeConce
 
     public static BsonDocument getCurrentClusterTime() {
         return new CommandReadOperation("admin", new BsonDocument("ping", new BsonInt32(1)), new BsonDocumentCodec())
-                .execute(getBinding()).getDocument("$clusterTime", null);
+                .execute(getBinding(), OPERATION_CONTEXT).getDocument("$clusterTime", null);
     }
 
     public MongoNamespace getNamespace() {
@@ -211,7 +212,7 @@ public void create(final String collectionName, final CreateCollectionOptions op
         boolean success = false;
         while (!success) {
             try {
-                operation.execute(getBinding());
+                operation.execute(getBinding(), OPERATION_CONTEXT);
                 success = true;
             } catch (MongoCommandException e) {
                 if ("Interrupted".equals(e.getErrorCodeName())) {
@@ -230,7 +231,7 @@ public void killCursor(final MongoNamespace namespace, final ServerCursor server
                     .append("cursors", new BsonArray(singletonList(new BsonInt64(serverCursor.getId()))));
             try {
                 new CommandReadOperation<>(namespace.getDatabaseName(), command, new BsonDocumentCodec())
-                        .execute(getBinding());
+                        .execute(getBinding(), OPERATION_CONTEXT);
             } catch (Exception e) {
                 // Ignore any exceptions killing old cursors
             }
@@ -262,7 +263,7 @@ public void insertDocuments(final List documents, final WriteConce
         for (BsonDocument document : documents) {
             insertRequests.add(new InsertRequest(document));
         }
-        new MixedBulkWriteOperation(namespace, insertRequests, true, writeConcern, false).execute(binding);
+        new MixedBulkWriteOperation(namespace, insertRequests, true, writeConcern, false).execute(binding, OPERATION_CONTEXT);
     }
 
     public void insertDocuments(final Document... documents) {
@@ -305,7 +306,7 @@ public List find() {
     public Optional listSearchIndex(final String indexName) {
         ListSearchIndexesOperation listSearchIndexesOperation =
                 new ListSearchIndexesOperation<>(namespace, codec, indexName, null, null, null, null, true);
-        BatchCursor cursor = listSearchIndexesOperation.execute(getBinding());
+        BatchCursor cursor = listSearchIndexesOperation.execute(getBinding(), OPERATION_CONTEXT);
 
         List results = new ArrayList<>();
         while (cursor.hasNext()) {
@@ -318,13 +319,13 @@ public Optional listSearchIndex(final String indexName) {
     public void createSearchIndex(final SearchIndexRequest searchIndexModel) {
         CreateSearchIndexesOperation searchIndexesOperation =
                 new CreateSearchIndexesOperation(namespace, singletonList(searchIndexModel));
-         searchIndexesOperation.execute(getBinding());
+        searchIndexesOperation.execute(getBinding(), OPERATION_CONTEXT);
     }
 
     public  List find(final Codec codec) {
         BatchCursor cursor = new FindOperation<>(namespace, codec)
                 .sort(new BsonDocument("_id", new BsonInt32(1)))
-                .execute(getBinding());
+                .execute(getBinding(), OPERATION_CONTEXT);
         List results = new ArrayList<>();
         while (cursor.hasNext()) {
             results.addAll(cursor.next());
@@ -343,7 +344,7 @@ public void updateOne(final Bson filter, final Bson update, final boolean isUpse
                                                                     WriteRequest.Type.UPDATE)
                                                   .upsert(isUpsert)),
                                     true, WriteConcern.ACKNOWLEDGED, false)
-        .execute(getBinding());
+                .execute(getBinding(), OPERATION_CONTEXT);
     }
 
     public void replaceOne(final Bson filter, final Bson update, final boolean isUpsert) {
@@ -353,7 +354,7 @@ public void replaceOne(final Bson filter, final Bson update, final boolean isUps
                         WriteRequest.Type.REPLACE)
                         .upsert(isUpsert)),
                                     true, WriteConcern.ACKNOWLEDGED, false)
-                .execute(getBinding());
+                .execute(getBinding(), OPERATION_CONTEXT);
     }
 
     public void deleteOne(final Bson filter) {
@@ -368,7 +369,7 @@ private void delete(final Bson filter, final boolean multi) {
         new MixedBulkWriteOperation(namespace,
                 singletonList(new DeleteRequest(filter.toBsonDocument(Document.class, registry)).multi(multi)),
                 true, WriteConcern.ACKNOWLEDGED, false)
-                .execute(getBinding());
+                .execute(getBinding(), OPERATION_CONTEXT);
     }
 
     public List find(final Bson filter) {
@@ -393,7 +394,7 @@ private  List aggregate(final List pipeline, final Decoder decode
             bsonDocumentPipeline.add(cur.toBsonDocument(Document.class, registry));
         }
         BatchCursor cursor = new AggregateOperation<>(namespace, bsonDocumentPipeline, decoder, level)
-                .execute(getBinding());
+                .execute(getBinding(), OPERATION_CONTEXT);
         List results = new ArrayList<>();
         while (cursor.hasNext()) {
             results.addAll(cursor.next());
@@ -428,7 +429,7 @@ public  List find(final BsonDocument filter, final BsonDocument sort, fina
 
     public  List find(final BsonDocument filter, final BsonDocument sort, final BsonDocument projection, final Decoder decoder) {
         BatchCursor cursor = new FindOperation<>(namespace, decoder).filter(filter).sort(sort)
-                .projection(projection).execute(getBinding());
+                .projection(projection).execute(getBinding(), OPERATION_CONTEXT);
         List results = new ArrayList<>();
         while (cursor.hasNext()) {
             results.addAll(cursor.next());
@@ -441,7 +442,7 @@ public long count() {
     }
 
     public long count(final ReadBinding binding) {
-        return new CountDocumentsOperation(namespace).execute(binding);
+        return new CountDocumentsOperation(namespace).execute(binding, OPERATION_CONTEXT);
     }
 
     public long count(final AsyncReadWriteBinding binding) throws Throwable {
@@ -450,7 +451,7 @@ public long count(final AsyncReadWriteBinding binding) throws Throwable {
 
     public long count(final Bson filter) {
         return new CountDocumentsOperation(namespace)
-                .filter(toBsonDocument(filter)).execute(getBinding());
+                .filter(toBsonDocument(filter)).execute(getBinding(), OPERATION_CONTEXT);
     }
 
     public BsonDocument wrap(final Document document) {
@@ -463,34 +464,36 @@ public BsonDocument toBsonDocument(final Bson document) {
 
     public void createIndex(final BsonDocument key) {
         new CreateIndexesOperation(namespace, singletonList(new IndexRequest(key)), WriteConcern.ACKNOWLEDGED)
-                .execute(getBinding());
+                .execute(getBinding(), OPERATION_CONTEXT);
     }
 
     public void createIndex(final Document key) {
         new CreateIndexesOperation(namespace, singletonList(new IndexRequest(wrap(key))), WriteConcern.ACKNOWLEDGED)
-                .execute(getBinding());
+                .execute(getBinding(), OPERATION_CONTEXT);
     }
 
     public void createUniqueIndex(final Document key) {
         new CreateIndexesOperation(namespace, singletonList(new IndexRequest(wrap(key)).unique(true)),
                                    WriteConcern.ACKNOWLEDGED)
-                .execute(getBinding());
+                .execute(getBinding(), OPERATION_CONTEXT);
     }
 
     public void createIndex(final Document key, final String defaultLanguage) {
         new CreateIndexesOperation(namespace,
-                                   singletonList(new IndexRequest(wrap(key)).defaultLanguage(defaultLanguage)), WriteConcern.ACKNOWLEDGED).execute(getBinding());
+                singletonList(new IndexRequest(wrap(key)).defaultLanguage(defaultLanguage)), WriteConcern.ACKNOWLEDGED).execute(
+                getBinding(), OPERATION_CONTEXT);
     }
 
     public void createIndex(final Bson key) {
         new CreateIndexesOperation(namespace,
-                                   singletonList(new IndexRequest(key.toBsonDocument(Document.class, registry))), WriteConcern.ACKNOWLEDGED).execute(getBinding());
+                singletonList(new IndexRequest(key.toBsonDocument(Document.class, registry))), WriteConcern.ACKNOWLEDGED).execute(
+                getBinding(), OPERATION_CONTEXT);
     }
 
     public List listIndexes(){
         List indexes = new ArrayList<>();
         BatchCursor cursor = new ListIndexesOperation<>(namespace, new BsonDocumentCodec())
-                .execute(getBinding());
+                .execute(getBinding(), OPERATION_CONTEXT);
         while (cursor.hasNext()) {
             indexes.addAll(cursor.next());
         }
@@ -500,7 +503,7 @@ public List listIndexes(){
     public static void killAllSessions() {
         try {
             new CommandReadOperation<>("admin",
-                                       new BsonDocument("killAllSessions", new BsonArray()), new BsonDocumentCodec()).execute(getBinding());
+                    new BsonDocument("killAllSessions", new BsonArray()), new BsonDocumentCodec()).execute(getBinding(), OPERATION_CONTEXT);
         } catch (MongoCommandException e) {
             // ignore exception caused by killing the implicit session that the killAllSessions command itself is running in
         }
@@ -510,7 +513,8 @@ public void renameCollection(final MongoNamespace newNamespace) {
         try {
             new CommandReadOperation<>("admin",
                                        new BsonDocument("renameCollection", new BsonString(getNamespace().getFullName()))
-                            .append("to", new BsonString(newNamespace.getFullName())), new BsonDocumentCodec()).execute(getBinding());
+                                               .append("to", new BsonString(newNamespace.getFullName())), new BsonDocumentCodec()).execute(
+                    getBinding(), OPERATION_CONTEXT);
         } catch (MongoCommandException e) {
             // do nothing
         }
@@ -522,11 +526,11 @@ public void runAdminCommand(final String command) {
 
     public void runAdminCommand(final BsonDocument command) {
         new CommandReadOperation<>("admin", command, new BsonDocumentCodec())
-                .execute(getBinding());
+                .execute(getBinding(), OPERATION_CONTEXT);
     }
 
     public void runAdminCommand(final BsonDocument command, final ReadPreference readPreference) {
         new CommandReadOperation<>("admin", command, new BsonDocumentCodec())
-                .execute(getBinding(readPreference));
+                .execute(getBinding(readPreference), OPERATION_CONTEXT);
     }
 }
diff --git a/driver-core/src/test/functional/com/mongodb/connection/ConnectionSpecification.groovy b/driver-core/src/test/functional/com/mongodb/connection/ConnectionSpecification.groovy
index b3da89231e7..5658ec5ea43 100644
--- a/driver-core/src/test/functional/com/mongodb/connection/ConnectionSpecification.groovy
+++ b/driver-core/src/test/functional/com/mongodb/connection/ConnectionSpecification.groovy
@@ -16,15 +16,15 @@
 
 package com.mongodb.connection
 
-
 import com.mongodb.OperationFunctionalSpecification
 import com.mongodb.internal.operation.CommandReadOperation
 import org.bson.BsonDocument
 import org.bson.BsonInt32
 import org.bson.codecs.BsonDocumentCodec
 
-import static com.mongodb.ClusterFixture.getBinding
 import static com.mongodb.ClusterFixture.LEGACY_HELLO
+import static com.mongodb.ClusterFixture.OPERATION_CONTEXT
+import static com.mongodb.ClusterFixture.getBinding
 import static com.mongodb.connection.ConnectionDescription.getDefaultMaxMessageSize
 import static com.mongodb.connection.ConnectionDescription.getDefaultMaxWriteBatchSize
 
@@ -32,8 +32,8 @@ class ConnectionSpecification extends OperationFunctionalSpecification {
 
     def 'should have id'() {
         when:
-        def source = getBinding().getReadConnectionSource()
-        def connection = source.connection
+        def source = getBinding().getReadConnectionSource(OPERATION_CONTEXT)
+        def connection = source.getConnection(OPERATION_CONTEXT)
 
         then:
         connection.getDescription().getConnectionId() != null
@@ -50,8 +50,8 @@ class ConnectionSpecification extends OperationFunctionalSpecification {
                                                              new BsonInt32(getDefaultMaxMessageSize())).intValue()
         def expectedMaxBatchCount = commandResult.getNumber('maxWriteBatchSize',
                                                             new BsonInt32(getDefaultMaxWriteBatchSize())).intValue()
-        def source = getBinding().getReadConnectionSource()
-        def connection = source.connection
+        def source = getBinding().getReadConnectionSource(OPERATION_CONTEXT)
+        def connection = source.getConnection(OPERATION_CONTEXT)
 
         then:
         connection.description.serverAddress == source.getServerDescription().getAddress()
@@ -66,6 +66,6 @@ class ConnectionSpecification extends OperationFunctionalSpecification {
     }
    private static BsonDocument getHelloResult() {
         new CommandReadOperation('admin', new BsonDocument(LEGACY_HELLO, new BsonInt32(1)),
-                new BsonDocumentCodec()).execute(getBinding())
+                new BsonDocumentCodec()).execute(getBinding(), OPERATION_CONTEXT)
     }
 }
diff --git a/driver-core/src/test/functional/com/mongodb/internal/binding/AsyncOperationContextBinding.java b/driver-core/src/test/functional/com/mongodb/internal/binding/AsyncOperationContextBinding.java
index 17b1a1c4a7e..0a891b55a88 100644
--- a/driver-core/src/test/functional/com/mongodb/internal/binding/AsyncOperationContextBinding.java
+++ b/driver-core/src/test/functional/com/mongodb/internal/binding/AsyncOperationContextBinding.java
@@ -40,8 +40,9 @@ public ReadPreference getReadPreference() {
     }
 
     @Override
-    public void getWriteConnectionSource(final SingleResultCallback callback) {
-        wrapped.getWriteConnectionSource((result, t) -> {
+    public void getWriteConnectionSource(final OperationContext operationContext,
+                                         final SingleResultCallback callback) {
+        wrapped.getWriteConnectionSource(operationContext, (result, t) -> {
             if (t != null) {
                 callback.onResult(null, t);
             } else {
@@ -50,14 +51,11 @@ public void getWriteConnectionSource(final SingleResultCallback callback) {
-        wrapped.getReadConnectionSource((result, t) -> {
+    public void getReadConnectionSource(final OperationContext operationContext,
+                                        final SingleResultCallback callback) {
+        wrapped.getReadConnectionSource(operationContext, (result, t) -> {
             if (t != null) {
                 callback.onResult(null, t);
             } else {
@@ -69,8 +67,9 @@ public void getReadConnectionSource(final SingleResultCallback callback) {
-        wrapped.getReadConnectionSource(minWireVersion, fallbackReadPreference, (result, t) -> {
+        wrapped.getReadConnectionSource(minWireVersion, fallbackReadPreference, operationContext, (result, t) -> {
             if (t != null) {
                 callback.onResult(null, t);
             } else {
@@ -79,6 +78,10 @@ public void getReadConnectionSource(final int minWireVersion, final ReadPreferen
         });
     }
 
+    public OperationContext getOperationContext() {
+        return operationContext;
+    }
+
     @Override
     public int getCount() {
         return wrapped.getCount();
@@ -107,19 +110,14 @@ public ServerDescription getServerDescription() {
             return wrapped.getServerDescription();
         }
 
-        @Override
-        public OperationContext getOperationContext() {
-            return operationContext;
-        }
-
         @Override
         public ReadPreference getReadPreference() {
             return wrapped.getReadPreference();
         }
 
         @Override
-        public void getConnection(final SingleResultCallback callback) {
-            wrapped.getConnection(callback);
+        public void getConnection(final OperationContext operationContext, final SingleResultCallback callback) {
+            wrapped.getConnection(operationContext, callback);
         }
 
         @Override
diff --git a/driver-core/src/test/functional/com/mongodb/internal/binding/AsyncSessionBinding.java b/driver-core/src/test/functional/com/mongodb/internal/binding/AsyncSessionBinding.java
index fa588a340d0..5461a6ee007 100644
--- a/driver-core/src/test/functional/com/mongodb/internal/binding/AsyncSessionBinding.java
+++ b/driver-core/src/test/functional/com/mongodb/internal/binding/AsyncSessionBinding.java
@@ -27,11 +27,11 @@
 public final class AsyncSessionBinding implements AsyncReadWriteBinding {
 
     private final AsyncReadWriteBinding wrapped;
-    private final OperationContext operationContext;
+   // private final OperationContext operationContext;
 
     public AsyncSessionBinding(final AsyncReadWriteBinding wrapped) {
         this.wrapped = notNull("wrapped", wrapped);
-        this.operationContext = wrapped.getOperationContext().withSessionContext(new SimpleSessionContext());
+     //   this.operationContext = wrapped.getOperationContext().withSessionContext(new SimpleSessionContext());
     }
 
     @Override
@@ -40,8 +40,8 @@ public ReadPreference getReadPreference() {
     }
 
     @Override
-    public void getWriteConnectionSource(final SingleResultCallback callback) {
-        wrapped.getWriteConnectionSource((result, t) -> {
+    public void getWriteConnectionSource(final OperationContext operationContext, final SingleResultCallback callback) {
+        wrapped.getWriteConnectionSource(operationContext, (result, t) -> {
             if (t != null) {
                 callback.onResult(null, t);
             } else {
@@ -51,13 +51,8 @@ public void getWriteConnectionSource(final SingleResultCallback callback) {
-        wrapped.getReadConnectionSource((result, t) -> {
+    public void getReadConnectionSource(final OperationContext operationContext, final SingleResultCallback callback) {
+        wrapped.getReadConnectionSource(operationContext, (result, t) -> {
             if (t != null) {
                 callback.onResult(null, t);
             } else {
@@ -69,8 +64,9 @@ public void getReadConnectionSource(final SingleResultCallback callback) {
-        wrapped.getReadConnectionSource(minWireVersion, fallbackReadPreference, (result, t) -> {
+        wrapped.getReadConnectionSource(minWireVersion, fallbackReadPreference, operationContext, (result, t) -> {
             if (t != null) {
                 callback.onResult(null, t);
             } else {
@@ -107,19 +103,14 @@ public ServerDescription getServerDescription() {
             return wrapped.getServerDescription();
         }
 
-        @Override
-        public OperationContext getOperationContext() {
-            return operationContext;
-        }
-
         @Override
         public ReadPreference getReadPreference() {
             return wrapped.getReadPreference();
         }
 
         @Override
-        public void getConnection(final SingleResultCallback callback) {
-            wrapped.getConnection(callback);
+        public void getConnection(final OperationContext operationContext, final SingleResultCallback callback) {
+            wrapped.getConnection(operationContext, callback);
         }
 
         @Override
diff --git a/driver-core/src/test/functional/com/mongodb/internal/binding/AsyncSessionBindingSpecification.groovy b/driver-core/src/test/functional/com/mongodb/internal/binding/AsyncSessionBindingSpecification.groovy
index 87fa1b9c4ff..173cd9f0935 100644
--- a/driver-core/src/test/functional/com/mongodb/internal/binding/AsyncSessionBindingSpecification.groovy
+++ b/driver-core/src/test/functional/com/mongodb/internal/binding/AsyncSessionBindingSpecification.groovy
@@ -26,7 +26,6 @@ class AsyncSessionBindingSpecification extends Specification {
     def 'should wrap the passed in async binding'() {
         given:
         def wrapped = Mock(AsyncReadWriteBinding)
-        wrapped.getOperationContext() >> OPERATION_CONTEXT
         def binding = new AsyncSessionBinding(wrapped)
 
         when:
@@ -54,23 +53,16 @@ class AsyncSessionBindingSpecification extends Specification {
         1 * wrapped.release()
 
         when:
-        binding.getReadConnectionSource(Stub(SingleResultCallback))
+        binding.getReadConnectionSource(OPERATION_CONTEXT, Stub(SingleResultCallback))
 
         then:
-        1 * wrapped.getReadConnectionSource(_)
+        1 * wrapped.getReadConnectionSource(OPERATION_CONTEXT, _)
 
         when:
-        binding.getWriteConnectionSource(Stub(SingleResultCallback))
+        binding.getWriteConnectionSource(OPERATION_CONTEXT, Stub(SingleResultCallback))
 
         then:
-        1 * wrapped.getWriteConnectionSource(_)
-
-        when:
-        def context = binding.getOperationContext().getSessionContext()
-
-        then:
-        0 * wrapped.getOperationContext().getSessionContext()
-        context instanceof SimpleSessionContext
+        1 * wrapped.getWriteConnectionSource(OPERATION_CONTEXT, _)
     }
 
 }
diff --git a/driver-core/src/test/functional/com/mongodb/internal/binding/AsyncSingleConnectionBinding.java b/driver-core/src/test/functional/com/mongodb/internal/binding/AsyncSingleConnectionBinding.java
index 3fff8b66e06..46fde18d1c7 100644
--- a/driver-core/src/test/functional/com/mongodb/internal/binding/AsyncSingleConnectionBinding.java
+++ b/driver-core/src/test/functional/com/mongodb/internal/binding/AsyncSingleConnectionBinding.java
@@ -129,16 +129,13 @@ public ReadPreference getReadPreference() {
         return readPreference;
     }
 
-    @Override
-    public OperationContext getOperationContext() {
-        return operationContext;
-    }
 
     @Override
-    public void getReadConnectionSource(final SingleResultCallback callback) {
+    public void getReadConnectionSource(final OperationContext operationContext,
+                                        final SingleResultCallback callback) {
         isTrue("open", getCount() > 0);
         if (readPreference == primary()) {
-            getWriteConnectionSource(callback);
+            getWriteConnectionSource(operationContext, callback);
         } else {
             callback.onResult(new SingleAsyncConnectionSource(readServerDescription, readConnection), null);
         }
@@ -146,12 +143,13 @@ public void getReadConnectionSource(final SingleResultCallback callback) {
-        getReadConnectionSource(callback);
+        getReadConnectionSource(operationContext, callback);
     }
 
     @Override
-    public void getWriteConnectionSource(final SingleResultCallback callback) {
+    public void getWriteConnectionSource(final OperationContext operationContext, final SingleResultCallback callback) {
         isTrue("open", getCount() > 0);
         callback.onResult(new SingleAsyncConnectionSource(writeServerDescription, writeConnection), null);
     }
@@ -174,6 +172,7 @@ private SingleAsyncConnectionSource(final ServerDescription serverDescription,
                                             final AsyncConnection connection) {
             this.serverDescription = serverDescription;
             this.connection = connection;
+            //TODO do we need to retain and release those references properly?
             AsyncSingleConnectionBinding.this.retain();
         }
 
@@ -182,18 +181,13 @@ public ServerDescription getServerDescription() {
             return serverDescription;
         }
 
-        @Override
-        public OperationContext getOperationContext() {
-            return operationContext;
-        }
-
         @Override
         public ReadPreference getReadPreference() {
             return readPreference;
         }
 
         @Override
-        public void getConnection(final SingleResultCallback callback) {
+        public void getConnection(final OperationContext operationContext, final SingleResultCallback callback) {
             isTrue("open", getCount() > 0);
             callback.onResult(connection.retain(), null);
         }
diff --git a/driver-core/src/test/functional/com/mongodb/internal/binding/OperationContextBinding.java b/driver-core/src/test/functional/com/mongodb/internal/binding/OperationContextBinding.java
index 6af3f4520d4..3428db4f82e 100644
--- a/driver-core/src/test/functional/com/mongodb/internal/binding/OperationContextBinding.java
+++ b/driver-core/src/test/functional/com/mongodb/internal/binding/OperationContextBinding.java
@@ -54,23 +54,22 @@ public int release() {
     }
 
     @Override
-    public ConnectionSource getReadConnectionSource() {
-        return new SessionBindingConnectionSource(wrapped.getReadConnectionSource());
+    public ConnectionSource getReadConnectionSource(final OperationContext operationContext) {
+        return new SessionBindingConnectionSource(wrapped.getReadConnectionSource(operationContext));
     }
 
     @Override
-    public ConnectionSource getReadConnectionSource(final int minWireVersion, final ReadPreference fallbackReadPreference) {
-        return new SessionBindingConnectionSource(wrapped.getReadConnectionSource(minWireVersion, fallbackReadPreference));
+    public ConnectionSource getReadConnectionSource(final int minWireVersion, final ReadPreference fallbackReadPreference, final OperationContext operationContext) {
+        return new SessionBindingConnectionSource(wrapped.getReadConnectionSource(minWireVersion, fallbackReadPreference, operationContext));
     }
 
-    @Override
     public OperationContext getOperationContext() {
         return operationContext;
     }
 
     @Override
-    public ConnectionSource getWriteConnectionSource() {
-        return new SessionBindingConnectionSource(wrapped.getWriteConnectionSource());
+    public ConnectionSource getWriteConnectionSource(final OperationContext operationContext) {
+        return new SessionBindingConnectionSource(wrapped.getWriteConnectionSource(operationContext));
     }
 
     private class SessionBindingConnectionSource implements ConnectionSource {
@@ -85,19 +84,14 @@ public ServerDescription getServerDescription() {
             return wrapped.getServerDescription();
         }
 
-        @Override
-        public OperationContext getOperationContext() {
-            return operationContext;
-        }
-
         @Override
         public ReadPreference getReadPreference() {
             return wrapped.getReadPreference();
         }
 
         @Override
-        public Connection getConnection() {
-            return wrapped.getConnection();
+        public Connection getConnection(final OperationContext operationContext) {
+            return wrapped.getConnection(operationContext);
         }
 
         @Override
diff --git a/driver-core/src/test/functional/com/mongodb/internal/binding/SessionBinding.java b/driver-core/src/test/functional/com/mongodb/internal/binding/SessionBinding.java
index 3a2666a8093..04ed3bf5f4b 100644
--- a/driver-core/src/test/functional/com/mongodb/internal/binding/SessionBinding.java
+++ b/driver-core/src/test/functional/com/mongodb/internal/binding/SessionBinding.java
@@ -25,11 +25,11 @@
 
 public class SessionBinding implements ReadWriteBinding {
     private final ReadWriteBinding wrapped;
-    private final OperationContext operationContext;
 
     public SessionBinding(final ReadWriteBinding wrapped) {
         this.wrapped = notNull("wrapped", wrapped);
-        this.operationContext = wrapped.getOperationContext().withSessionContext(new SimpleSessionContext());
+        //TODO
+       // this.operationContext = wrapped.getOperationContext().withSessionContext(new SimpleSessionContext());
     }
 
     @Override
@@ -54,23 +54,19 @@ public int release() {
     }
 
     @Override
-    public ConnectionSource getReadConnectionSource() {
-        return new SessionBindingConnectionSource(wrapped.getReadConnectionSource());
+    public ConnectionSource getReadConnectionSource(final OperationContext operationContext) {
+        return new SessionBindingConnectionSource(wrapped.getReadConnectionSource(operationContext));
     }
 
     @Override
-    public ConnectionSource getReadConnectionSource(final int minWireVersion, final ReadPreference fallbackReadPreference) {
-        return new SessionBindingConnectionSource(wrapped.getReadConnectionSource(minWireVersion, fallbackReadPreference));
+    public ConnectionSource getReadConnectionSource(final int minWireVersion, final ReadPreference fallbackReadPreference, final OperationContext operationContext) {
+        return new SessionBindingConnectionSource(wrapped.getReadConnectionSource(minWireVersion, fallbackReadPreference, operationContext));
     }
 
-    @Override
-    public OperationContext getOperationContext() {
-        return operationContext;
-    }
 
     @Override
-    public ConnectionSource getWriteConnectionSource() {
-        return new SessionBindingConnectionSource(wrapped.getWriteConnectionSource());
+    public ConnectionSource getWriteConnectionSource(final OperationContext operationContext) {
+        return new SessionBindingConnectionSource(wrapped.getWriteConnectionSource(operationContext));
     }
 
     private class SessionBindingConnectionSource implements ConnectionSource {
@@ -85,19 +81,14 @@ public ServerDescription getServerDescription() {
             return wrapped.getServerDescription();
         }
 
-        @Override
-        public OperationContext getOperationContext() {
-            return operationContext;
-        }
-
         @Override
         public ReadPreference getReadPreference() {
             return wrapped.getReadPreference();
         }
 
         @Override
-        public Connection getConnection() {
-            return wrapped.getConnection();
+        public Connection getConnection(final OperationContext operationContext) {
+            return wrapped.getConnection(operationContext);
         }
 
         @Override
diff --git a/driver-core/src/test/functional/com/mongodb/internal/binding/SingleConnectionBinding.java b/driver-core/src/test/functional/com/mongodb/internal/binding/SingleConnectionBinding.java
index 6bf3cff636d..911155ce10d 100644
--- a/driver-core/src/test/functional/com/mongodb/internal/binding/SingleConnectionBinding.java
+++ b/driver-core/src/test/functional/com/mongodb/internal/binding/SingleConnectionBinding.java
@@ -41,7 +41,6 @@ public class SingleConnectionBinding implements ReadWriteBinding {
     private final ServerDescription readServerDescription;
     private final ServerDescription writeServerDescription;
     private int count = 1;
-    private final OperationContext operationContext;
 
     /**
      * Create a new binding with the given cluster.
@@ -53,7 +52,6 @@ public class SingleConnectionBinding implements ReadWriteBinding {
     public SingleConnectionBinding(final Cluster cluster, final ReadPreference readPreference, final OperationContext operationContext) {
         notNull("cluster", cluster);
         this.readPreference = notNull("readPreference", readPreference);
-        this.operationContext = operationContext;
         ServerTuple writeServerTuple = cluster.selectServer(new WritableServerSelector(), operationContext);
         writeServerDescription = writeServerTuple.getServerDescription();
         writeConnection = writeServerTuple.getServer().getConnection(operationContext);
@@ -90,27 +88,23 @@ public ReadPreference getReadPreference() {
     }
 
     @Override
-    public ConnectionSource getReadConnectionSource() {
+    public ConnectionSource getReadConnectionSource(final OperationContext operationContext) {
         isTrue("open", getCount() > 0);
         if (readPreference == primary()) {
-            return getWriteConnectionSource();
+            return getWriteConnectionSource(operationContext);
         } else {
             return new SingleConnectionSource(readServerDescription, readConnection);
         }
     }
 
     @Override
-    public ConnectionSource getReadConnectionSource(final int minWireVersion, final ReadPreference fallbackReadPreference) {
+    public ConnectionSource getReadConnectionSource(final int minWireVersion, final ReadPreference fallbackReadPreference, final OperationContext operationContext) {
         throw new UnsupportedOperationException();
     }
 
-    @Override
-    public OperationContext getOperationContext() {
-        return operationContext;
-    }
 
     @Override
-    public ConnectionSource getWriteConnectionSource() {
+    public ConnectionSource getWriteConnectionSource(final OperationContext operationContext) {
         isTrue("open", getCount() > 0);
         return new SingleConnectionSource(writeServerDescription, writeConnection);
     }
@@ -120,7 +114,8 @@ private final class SingleConnectionSource implements ConnectionSource {
         private final Connection connection;
         private int count = 1;
 
-        SingleConnectionSource(final ServerDescription serverDescription, final Connection connection) {
+        SingleConnectionSource(final ServerDescription serverDescription,
+                               final Connection connection) {
             this.serverDescription = serverDescription;
             this.connection = connection;
             SingleConnectionBinding.this.retain();
@@ -131,18 +126,13 @@ public ServerDescription getServerDescription() {
             return serverDescription;
         }
 
-        @Override
-        public OperationContext getOperationContext() {
-            return operationContext;
-        }
-
         @Override
         public ReadPreference getReadPreference() {
             return readPreference;
         }
 
         @Override
-        public Connection getConnection() {
+        public Connection getConnection(final OperationContext operationContext) {
             isTrue("open", getCount() > 0);
             return connection.retain();
         }
diff --git a/driver-core/src/test/functional/com/mongodb/internal/connection/ScramSha256AuthenticationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/internal/connection/ScramSha256AuthenticationSpecification.groovy
index 4901872c1fc..36aac9b6908 100644
--- a/driver-core/src/test/functional/com/mongodb/internal/connection/ScramSha256AuthenticationSpecification.groovy
+++ b/driver-core/src/test/functional/com/mongodb/internal/connection/ScramSha256AuthenticationSpecification.groovy
@@ -16,9 +16,9 @@
 
 package com.mongodb.internal.connection
 
+import com.mongodb.ClusterFixture
 import com.mongodb.MongoCredential
 import com.mongodb.MongoSecurityException
-import com.mongodb.ReadConcern
 import com.mongodb.ReadPreference
 import com.mongodb.async.FutureResultCallback
 import com.mongodb.internal.binding.AsyncClusterBinding
@@ -85,14 +85,17 @@ class ScramSha256AuthenticationSpecification extends Specification {
                 .append('pwd', password)
                 .append('roles', ['root'])
                 .append('mechanisms', mechanisms)
+        def binding = getBinding()
         new CommandReadOperation<>('admin',
                 new BsonDocumentWrapper(createUserCommand, new DocumentCodec()), new DocumentCodec())
-                .execute(getBinding())
+                .execute(binding, ClusterFixture.getOperationContext(binding.getReadPreference()))
     }
 
     def dropUser(final String userName) {
+        def binding = getBinding()
+        def operationContext = ClusterFixture.getOperationContext(binding.getReadPreference())
         new CommandReadOperation<>('admin', new BsonDocument('dropUser', new BsonString(userName)),
-                new BsonDocumentCodec()).execute(getBinding())
+                new BsonDocumentCodec()).execute(binding, operationContext)
     }
 
     def 'test authentication and authorization'() {
@@ -102,7 +105,7 @@ class ScramSha256AuthenticationSpecification extends Specification {
         when:
         new CommandReadOperation('admin',
                 new BsonDocumentWrapper(new Document('dbstats', 1), new DocumentCodec()), new DocumentCodec())
-                .execute(new ClusterBinding(cluster, ReadPreference.primary(), ReadConcern.DEFAULT, OPERATION_CONTEXT))
+                .execute(new ClusterBinding(cluster, ReadPreference.primary()), OPERATION_CONTEXT)
 
         then:
         noExceptionThrown()
@@ -119,12 +122,13 @@ class ScramSha256AuthenticationSpecification extends Specification {
         def cluster = createAsyncCluster(credential)
         def callback = new FutureResultCallback()
 
+
         when:
         // make this synchronous
+        def binding = new AsyncClusterBinding(cluster, ReadPreference.primary())
         new CommandReadOperation('admin',
                 new BsonDocumentWrapper(new Document('dbstats', 1), new DocumentCodec()), new DocumentCodec())
-                .executeAsync(new AsyncClusterBinding(cluster, ReadPreference.primary(), ReadConcern.DEFAULT, OPERATION_CONTEXT),
-                        callback)
+                .executeAsync(binding, OPERATION_CONTEXT, callback)
         callback.get()
 
         then:
@@ -144,7 +148,7 @@ class ScramSha256AuthenticationSpecification extends Specification {
         when:
         new CommandReadOperation('admin',
                 new BsonDocumentWrapper(new Document('dbstats', 1), new DocumentCodec()), new DocumentCodec())
-                .execute(new ClusterBinding(cluster, ReadPreference.primary(), ReadConcern.DEFAULT, OPERATION_CONTEXT))
+                .execute(new ClusterBinding(cluster, ReadPreference.primary()), OPERATION_CONTEXT)
 
         then:
         thrown(MongoSecurityException)
@@ -164,7 +168,7 @@ class ScramSha256AuthenticationSpecification extends Specification {
         when:
         new CommandReadOperation('admin',
                 new BsonDocumentWrapper(new Document('dbstats', 1), new DocumentCodec()), new DocumentCodec())
-                .executeAsync(new AsyncClusterBinding(cluster, ReadPreference.primary(), ReadConcern.DEFAULT, OPERATION_CONTEXT),
+                .executeAsync(new AsyncClusterBinding(cluster, ReadPreference.primary()), OPERATION_CONTEXT,
                         callback)
         callback.get()
 
@@ -185,7 +189,7 @@ class ScramSha256AuthenticationSpecification extends Specification {
         when:
         new CommandReadOperation('admin',
                 new BsonDocumentWrapper(new Document('dbstats', 1), new DocumentCodec()), new DocumentCodec())
-                .execute(new ClusterBinding(cluster, ReadPreference.primary(), ReadConcern.DEFAULT, OPERATION_CONTEXT))
+                .execute(new ClusterBinding(cluster, ReadPreference.primary()), OPERATION_CONTEXT)
 
         then:
         noExceptionThrown()
@@ -205,7 +209,7 @@ class ScramSha256AuthenticationSpecification extends Specification {
         when:
         new CommandReadOperation('admin',
                 new BsonDocumentWrapper(new Document('dbstats', 1), new DocumentCodec()), new DocumentCodec())
-                .executeAsync(new AsyncClusterBinding(cluster, ReadPreference.primary(), ReadConcern.DEFAULT, OPERATION_CONTEXT),
+                .executeAsync(new AsyncClusterBinding(cluster, ReadPreference.primary()), OPERATION_CONTEXT,
                         callback)
         callback.get()
 
diff --git a/driver-core/src/test/functional/com/mongodb/internal/operation/AggregateOperationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/internal/operation/AggregateOperationSpecification.groovy
index b2814756eeb..c9c3c760a09 100644
--- a/driver-core/src/test/functional/com/mongodb/internal/operation/AggregateOperationSpecification.groovy
+++ b/driver-core/src/test/functional/com/mongodb/internal/operation/AggregateOperationSpecification.groovy
@@ -16,7 +16,7 @@
 
 package com.mongodb.internal.operation
 
-
+import com.mongodb.ClusterFixture
 import com.mongodb.MongoNamespace
 import com.mongodb.OperationFunctionalSpecification
 import com.mongodb.ReadConcern
@@ -31,12 +31,14 @@ import com.mongodb.connection.ConnectionDescription
 import com.mongodb.connection.ConnectionId
 import com.mongodb.connection.ServerId
 import com.mongodb.connection.ServerVersion
+import com.mongodb.internal.async.SingleResultCallback
 import com.mongodb.internal.binding.AsyncConnectionSource
 import com.mongodb.internal.binding.AsyncReadBinding
 import com.mongodb.internal.binding.ConnectionSource
 import com.mongodb.internal.binding.ReadBinding
 import com.mongodb.internal.connection.AsyncConnection
 import com.mongodb.internal.connection.Connection
+import com.mongodb.internal.connection.OperationContext
 import com.mongodb.internal.session.SessionContext
 import org.bson.BsonArray
 import org.bson.BsonBoolean
@@ -54,8 +56,8 @@ import static com.mongodb.ClusterFixture.OPERATION_CONTEXT
 import static com.mongodb.ClusterFixture.collectCursorResults
 import static com.mongodb.ClusterFixture.executeAsync
 import static com.mongodb.ClusterFixture.getAsyncCluster
-import static com.mongodb.ClusterFixture.getBinding
 import static com.mongodb.ClusterFixture.getCluster
+import static com.mongodb.ClusterFixture.getOperationContext
 import static com.mongodb.ClusterFixture.isSharded
 import static com.mongodb.ClusterFixture.isStandalone
 import static com.mongodb.ExplainVerbosity.QUERY_PLANNER
@@ -64,6 +66,7 @@ import static com.mongodb.internal.connection.ServerHelper.waitForLastRelease
 import static com.mongodb.internal.operation.OperationReadConcernHelper.appendReadConcernToCommand
 import static com.mongodb.internal.operation.ServerVersionHelper.UNKNOWN_WIRE_VERSION
 import static com.mongodb.internal.operation.TestOperationHelper.getKeyPattern
+import static org.junit.jupiter.api.Assertions.assertEquals
 
 class AggregateOperationSpecification extends OperationFunctionalSpecification {
 
@@ -226,8 +229,10 @@ class AggregateOperationSpecification extends OperationFunctionalSpecification {
         def viewSuffix = '-view'
         def viewName = getCollectionName() + viewSuffix
         def viewNamespace = new MongoNamespace(getDatabaseName(), viewName)
+
+        def binding = ClusterFixture.getBinding(ClusterFixture.getCluster())
         new CreateViewOperation(getDatabaseName(), viewName, getCollectionName(), [], WriteConcern.ACKNOWLEDGED)
-                .execute(getBinding(getCluster()))
+                .execute(binding, ClusterFixture.getOperationContext(binding.getReadPreference()))
 
         when:
         AggregateOperation operation = new AggregateOperation(viewNamespace, [], new DocumentCodec())
@@ -239,8 +244,9 @@ class AggregateOperationSpecification extends OperationFunctionalSpecification {
         results.containsAll(['Pete', 'Sam'])
 
         cleanup:
+        binding = ClusterFixture.getBinding(ClusterFixture.getCluster())
         new DropCollectionOperation(viewNamespace, WriteConcern.ACKNOWLEDGED)
-                .execute(getBinding(getCluster()))
+                .execute(binding, ClusterFixture.getOperationContext(binding.getReadPreference()))
 
         where:
         async << [true, false]
@@ -265,7 +271,9 @@ class AggregateOperationSpecification extends OperationFunctionalSpecification {
         when:
         AggregateOperation operation = new AggregateOperation(getNamespace(), [], new DocumentCodec())
                 .allowDiskUse(allowDiskUse)
-        def cursor = operation.execute(getBinding())
+
+        def binding = ClusterFixture.getBinding()
+        def cursor = operation.execute(binding, ClusterFixture.getOperationContext(binding.getReadPreference()))
 
         then:
         cursor.next()*.getString('name') == ['Pete', 'Sam', 'Pete']
@@ -278,7 +286,9 @@ class AggregateOperationSpecification extends OperationFunctionalSpecification {
         when:
         AggregateOperation operation = new AggregateOperation(getNamespace(), [], new DocumentCodec())
                 .batchSize(batchSize)
-        def cursor = operation.execute(getBinding())
+
+        def binding = ClusterFixture.getBinding()
+        def cursor = operation.execute(binding, ClusterFixture.getOperationContext(binding.getReadPreference()))
 
         then:
         cursor.next()*.getString('name') == ['Pete', 'Sam', 'Pete']
@@ -343,8 +353,10 @@ class AggregateOperationSpecification extends OperationFunctionalSpecification {
     def 'should apply comment'() {
         given:
         def profileCollectionHelper = getCollectionHelper(new MongoNamespace(getDatabaseName(), 'system.profile'))
+
+        def binding = ClusterFixture.getBinding()
         new CommandReadOperation<>(getDatabaseName(), new BsonDocument('profile', new BsonInt32(2)),
-                new BsonDocumentCodec()).execute(getBinding())
+                new BsonDocumentCodec()).execute(binding, getOperationContext(binding.getReadPreference()))
         def expectedComment = 'this is a comment'
         def operation = new AggregateOperation(getNamespace(), [], new DocumentCodec())
                 .comment(new BsonString(expectedComment))
@@ -356,9 +368,11 @@ class AggregateOperationSpecification extends OperationFunctionalSpecification {
         Document profileDocument = profileCollectionHelper.find(Filters.exists('command.aggregate')).get(0)
         ((Document) profileDocument.get('command')).get('comment') == expectedComment
 
+
         cleanup:
+        binding = ClusterFixture.getBinding()
         new CommandReadOperation<>(getDatabaseName(), new BsonDocument('profile', new BsonInt32(0)),
-                new BsonDocumentCodec()).execute(getBinding())
+                new BsonDocumentCodec()).execute(binding, getOperationContext(binding.getReadPreference()))
         profileCollectionHelper.drop()
 
         where:
@@ -372,11 +386,9 @@ class AggregateOperationSpecification extends OperationFunctionalSpecification {
         def source = Stub(ConnectionSource)
         def connection = Mock(Connection)
         binding.readPreference >> ReadPreference.primary()
-        binding.operationContext >> operationContext
-        binding.readConnectionSource >> source
-        source.connection >> connection
+        binding.getReadConnectionSource(_) >> source
+        source.getConnection(_) >> connection
         source.retain() >> source
-        source.operationContext >> operationContext
         def commandDocument = new BsonDocument('aggregate', new BsonString(getCollectionName()))
                 .append('pipeline', new BsonArray())
                 .append('cursor', new BsonDocument())
@@ -385,15 +397,17 @@ class AggregateOperationSpecification extends OperationFunctionalSpecification {
         def operation = new AggregateOperation(getNamespace(), [], new DocumentCodec())
 
         when:
-        operation.execute(binding)
+        operation.execute(binding, operationContext)
 
         then:
         _ * connection.description >> new ConnectionDescription(new ConnectionId(new ServerId(new ClusterId(), new ServerAddress())),
                 6, STANDALONE, 1000, 100000, 100000, [])
-        1 * connection.command(_, commandDocument, _, _, _, operationContext) >>
-                new BsonDocument('cursor', new BsonDocument('id', new BsonInt64(1))
-                        .append('ns', new BsonString(getNamespace().getFullName()))
-                        .append('firstBatch', new BsonArrayWrapper([])))
+        1 * connection.command(_, commandDocument, _, _, _, _ as OperationContext) >> {
+            assertEquals(((OperationContext) it[5]).getId(), operationContext.getId())
+            new BsonDocument('cursor', new BsonDocument('id', new BsonInt64(1))
+                    .append('ns', new BsonString(getNamespace().getFullName()))
+                    .append('firstBatch', new BsonArrayWrapper([])))
+        }
         1 * connection.release()
 
         where:
@@ -413,10 +427,8 @@ class AggregateOperationSpecification extends OperationFunctionalSpecification {
         def binding = Stub(AsyncReadBinding)
         def source = Stub(AsyncConnectionSource)
         def connection = Mock(AsyncConnection)
-        binding.operationContext >> operationContext
-        binding.getReadConnectionSource(_) >> { it[0].onResult(source, null) }
-        source.operationContext >> operationContext
-        source.getConnection(_) >> { it[0].onResult(connection, null) }
+        binding.getReadConnectionSource(_ as OperationContext, _ as SingleResultCallback) >> { it[1].onResult(source, null) }
+        source.getConnection(_ as OperationContext, _ as SingleResultCallback) >> { it[1].onResult(connection, null) }
         source.retain() >> source
         def commandDocument = new BsonDocument('aggregate', new BsonString(getCollectionName()))
                 .append('pipeline', new BsonArray())
@@ -426,12 +438,12 @@ class AggregateOperationSpecification extends OperationFunctionalSpecification {
         def operation = new AggregateOperation(getNamespace(), [], new DocumentCodec())
 
         when:
-        executeAsync(operation, binding)
+        executeAsync(operation, binding, operationContext)
 
         then:
         _ * connection.description >> new ConnectionDescription(new ConnectionId(new ServerId(new ClusterId(), new ServerAddress())),
                 6, STANDALONE, 1000, 100000, 100000, [])
-        1 * connection.commandAsync(_, commandDocument, _, _, _, operationContext, _) >> {
+        1 * connection.commandAsync(_, commandDocument, _, _, _, _, _) >> {
             it.last().onResult(new BsonDocument('cursor', new BsonDocument('id', new BsonInt64(1))
                     .append('ns', new BsonString(getNamespace().getFullName()))
                     .append('firstBatch', new BsonArrayWrapper([]))), null)
diff --git a/driver-core/src/test/functional/com/mongodb/internal/operation/AggregateToCollectionOperationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/internal/operation/AggregateToCollectionOperationSpecification.groovy
index ed617289316..6ebdcdc6b40 100644
--- a/driver-core/src/test/functional/com/mongodb/internal/operation/AggregateToCollectionOperationSpecification.groovy
+++ b/driver-core/src/test/functional/com/mongodb/internal/operation/AggregateToCollectionOperationSpecification.groovy
@@ -16,6 +16,7 @@
 
 package com.mongodb.internal.operation
 
+import com.mongodb.ClusterFixture
 import com.mongodb.MongoCommandException
 import com.mongodb.MongoNamespace
 import com.mongodb.MongoWriteConcernException
@@ -275,8 +276,9 @@ class AggregateToCollectionOperationSpecification extends OperationFunctionalSpe
     def 'should apply comment'() {
         given:
         def profileCollectionHelper = getCollectionHelper(new MongoNamespace(getDatabaseName(), 'system.profile'))
+        def binding = getBinding()
         new CommandReadOperation<>(getDatabaseName(), new BsonDocument('profile', new BsonInt32(2)),
-                new BsonDocumentCodec()).execute(getBinding())
+                new BsonDocumentCodec()).execute(binding, ClusterFixture.getOperationContext(binding.getReadPreference()))
         def expectedComment = 'this is a comment'
         AggregateToCollectionOperation operation = createOperation(getNamespace(),
                 [Aggregates.out('outputCollection').toBsonDocument(BsonDocument, registry)], ACKNOWLEDGED)
@@ -291,7 +293,7 @@ class AggregateToCollectionOperationSpecification extends OperationFunctionalSpe
 
         cleanup:
         new CommandReadOperation<>(getDatabaseName(), new BsonDocument('profile', new BsonInt32(0)),
-                new BsonDocumentCodec()).execute(getBinding())
+                new BsonDocumentCodec()).execute(binding, ClusterFixture.getOperationContext(binding.getReadPreference()))
         profileCollectionHelper.drop()
 
         where:
diff --git a/driver-core/src/test/functional/com/mongodb/internal/operation/AsyncCommandBatchCursorFunctionalTest.java b/driver-core/src/test/functional/com/mongodb/internal/operation/AsyncCommandBatchCursorFunctionalTest.java
index 88dc199ee29..58e01242420 100644
--- a/driver-core/src/test/functional/com/mongodb/internal/operation/AsyncCommandBatchCursorFunctionalTest.java
+++ b/driver-core/src/test/functional/com/mongodb/internal/operation/AsyncCommandBatchCursorFunctionalTest.java
@@ -55,6 +55,7 @@
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
+import static com.mongodb.ClusterFixture.OPERATION_CONTEXT;
 import static com.mongodb.ClusterFixture.checkReferenceCountReachesTarget;
 import static com.mongodb.ClusterFixture.getAsyncBinding;
 import static com.mongodb.ClusterFixture.getConnection;
@@ -110,8 +111,8 @@ void cleanup() {
     void shouldExhaustCursorAsyncWithMultipleBatches() {
         // given
         BsonDocument commandResult = executeFindCommand(0, 3); // Fetch in batches of size 3
-        cursor = new AsyncCommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, commandResult, 3, 0, DOCUMENT_DECODER,
-                null, connectionSource, connection);
+        cursor = new AsyncCommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
+                new AsyncCommandCoreCursor<>(commandResult, 3, DOCUMENT_DECODER, null, connectionSource, connection));
 
        // when
         FutureResultCallback>> futureCallback = new FutureResultCallback<>();
@@ -132,8 +133,8 @@ void shouldExhaustCursorAsyncWithMultipleBatches() {
     void shouldExhaustCursorAsyncWithClosedCursor() {
         // given
         BsonDocument commandResult = executeFindCommand(0, 3);
-        cursor = new AsyncCommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, commandResult, 3, 0, DOCUMENT_DECODER,
-                null, connectionSource, connection);
+        cursor = new AsyncCommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
+                new AsyncCommandCoreCursor<>(commandResult, 3, DOCUMENT_DECODER, null, connectionSource, connection));
 
         cursor.close();
 
@@ -155,8 +156,8 @@ void shouldExhaustCursorAsyncWithEmptyCursor() {
         getCollectionHelper().deleteMany(Filters.empty());
 
         BsonDocument commandResult = executeFindCommand(0, 3); // No documents to fetch
-        cursor = new AsyncCommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, commandResult, 3, 0, DOCUMENT_DECODER,
-                null, connectionSource, connection);
+        cursor = new AsyncCommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
+                new AsyncCommandCoreCursor<>(commandResult, 3, DOCUMENT_DECODER, null, connectionSource, connection));
 
         // when
         FutureResultCallback>> futureCallback = new FutureResultCallback<>();
@@ -172,33 +173,37 @@ void shouldExhaustCursorAsyncWithEmptyCursor() {
     @DisplayName("server cursor should not be null")
     void theServerCursorShouldNotBeNull() {
         BsonDocument commandResult = executeFindCommand(2);
-        cursor = new AsyncCommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, commandResult, 0, 0, DOCUMENT_DECODER,
-                                               null, connectionSource, connection);
+        AsyncCommandCoreCursor coreCursor =
+                new AsyncCommandCoreCursor<>(commandResult, 0, DOCUMENT_DECODER, null, connectionSource, connection);
+        cursor = new AsyncCommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
+                coreCursor);
 
-        assertNotNull(cursor.getServerCursor());
+        assertNotNull(coreCursor.getServerCursor());
     }
 
     @Test
     @DisplayName("should get Exceptions for operations on the cursor after closing")
     void shouldGetExceptionsForOperationsOnTheCursorAfterClosing() {
         BsonDocument commandResult = executeFindCommand(5);
-        cursor = new AsyncCommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, commandResult, 0, 0, DOCUMENT_DECODER,
-                                               null, connectionSource, connection);
+        AsyncCommandCoreCursor coreCursor =
+                new AsyncCommandCoreCursor<>(commandResult, 0, DOCUMENT_DECODER, null, connectionSource, connection);
+        cursor = new AsyncCommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
+                coreCursor);
 
         cursor.close();
         assertDoesNotThrow(() -> cursor.close());
 
         checkReferenceCountReachesTarget(connectionSource, 1);
         assertThrows(IllegalStateException.class, this::cursorNext);
-        assertNull(cursor.getServerCursor());
+        assertNull(coreCursor.getServerCursor());
     }
 
     @Test
     @DisplayName("should throw an Exception when going off the end")
     void shouldThrowAnExceptionWhenGoingOffTheEnd() {
         BsonDocument commandResult = executeFindCommand(2, 1);
-        cursor = new AsyncCommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, commandResult, 0, 0, DOCUMENT_DECODER,
-                                               null, connectionSource, connection);
+        cursor = new AsyncCommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
+                new AsyncCommandCoreCursor<>(commandResult, 0, DOCUMENT_DECODER, null, connectionSource, connection));
 
         cursorNext();
         cursorNext();
@@ -211,8 +216,8 @@ void shouldThrowAnExceptionWhenGoingOffTheEnd() {
     @DisplayName("test normal exhaustion")
     void testNormalExhaustion() {
         BsonDocument commandResult = executeFindCommand();
-        cursor = new AsyncCommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, commandResult, 0, 0, DOCUMENT_DECODER,
-                                               null, connectionSource, connection);
+        cursor = new AsyncCommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
+                new AsyncCommandCoreCursor<>(commandResult, 3, DOCUMENT_DECODER, null, connectionSource, connection));
 
         assertEquals(10, cursorFlatten().size());
     }
@@ -222,8 +227,8 @@ void testNormalExhaustion() {
     @DisplayName("test limit exhaustion")
     void testLimitExhaustion(final int limit, final int batchSize, final int expectedTotal) {
         BsonDocument commandResult = executeFindCommand(limit, batchSize);
-        cursor = new AsyncCommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, commandResult, batchSize, 0, DOCUMENT_DECODER,
-                                               null, connectionSource, connection);
+        cursor = new AsyncCommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
+                new AsyncCommandCoreCursor<>(commandResult, batchSize, DOCUMENT_DECODER, null, connectionSource, connection));
 
 
         assertEquals(expectedTotal, cursorFlatten().size());
@@ -241,8 +246,8 @@ void shouldBlockWaitingForNextBatchOnATailableCursor(final boolean awaitData, fi
 
         BsonDocument commandResult = executeFindCommand(new BsonDocument("ts",
                 new BsonDocument("$gte", new BsonTimestamp(5, 0))), 0, 2, true, awaitData);
-        cursor = new AsyncCommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, commandResult, 2, maxTimeMS, DOCUMENT_DECODER,
-                                               null, connectionSource, connection);
+        cursor = new AsyncCommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, maxTimeMS, OPERATION_CONTEXT,
+                new AsyncCommandCoreCursor<>(commandResult, 2, DOCUMENT_DECODER, null, connectionSource, connection));
 
         assertFalse(cursor.isClosed());
         assertEquals(1, cursorNext().get(0).get("_id"));
@@ -264,8 +269,8 @@ void testTailableInterrupt() throws InterruptedException {
 
         BsonDocument commandResult = executeFindCommand(new BsonDocument("ts",
                 new BsonDocument("$gte", new BsonTimestamp(5, 0))), 0, 2, true, true);
-        cursor = new AsyncCommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, commandResult, 2, 0, DOCUMENT_DECODER,
-                                               null, connectionSource, connection);
+        cursor = new AsyncCommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
+                new AsyncCommandCoreCursor<>(commandResult, 2, DOCUMENT_DECODER, null, connectionSource, connection));
 
         CountDownLatch latch = new CountDownLatch(1);
         AtomicInteger seen = new AtomicInteger();
@@ -297,12 +302,14 @@ void testTailableInterrupt() throws InterruptedException {
     void shouldKillCursorIfLimitIsReachedOnInitialQuery() {
         assumeFalse(isSharded());
         BsonDocument commandResult = executeFindCommand(5, 10);
-        cursor = new AsyncCommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, commandResult, 0, 0, DOCUMENT_DECODER,
-                                               null, connectionSource, connection);
+        AsyncCommandCoreCursor coreCursor =
+                new AsyncCommandCoreCursor<>(commandResult, 0, DOCUMENT_DECODER, null, connectionSource, connection);
+        cursor = new AsyncCommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
+                coreCursor);
 
         assertNotNull(cursorNext());
         assertTrue(cursor.isClosed());
-        assertNull(cursor.getServerCursor());
+        assertNull(coreCursor.getServerCursor());
     }
 
     @Test
@@ -310,10 +317,12 @@ void shouldKillCursorIfLimitIsReachedOnInitialQuery() {
     void shouldKillCursorIfLimitIsReachedOnGetMore() {
         assumeFalse(isSharded());
         BsonDocument commandResult = executeFindCommand(5, 3);
-        cursor = new AsyncCommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, commandResult, 3, 0, DOCUMENT_DECODER,
-                                               null, connectionSource, connection);
+        AsyncCommandCoreCursor coreCursor =
+                new AsyncCommandCoreCursor<>(commandResult, 3, DOCUMENT_DECODER, null, connectionSource, connection);
+        cursor = new AsyncCommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
+                coreCursor);
 
-        ServerCursor serverCursor = cursor.getServerCursor();
+        ServerCursor serverCursor = coreCursor.getServerCursor();
         assertNotNull(serverCursor);
         assertNotNull(cursorNext());
         assertNotNull(cursorNext());
@@ -330,12 +339,14 @@ void shouldReleaseConnectionSourceIfLimitIsReachedOnInitialQuery() {
         assumeFalse(isSharded());
 
         BsonDocument commandResult = executeFindCommand(5, 10);
-        cursor = new AsyncCommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, commandResult, 0, 0, DOCUMENT_DECODER,
-                                               null, connectionSource, connection);
+        AsyncCommandCoreCursor coreCursor =
+                new AsyncCommandCoreCursor<>(commandResult, 0, DOCUMENT_DECODER, null, connectionSource, connection);
+        cursor = new AsyncCommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
+                coreCursor);
 
         assertDoesNotThrow(() -> checkReferenceCountReachesTarget(connectionSource, 1));
         assertDoesNotThrow(() -> checkReferenceCountReachesTarget(connection, 1));
-        assertNull(cursor.getServerCursor());
+        assertNull(coreCursor.getServerCursor());
     }
 
     @Test
@@ -343,8 +354,8 @@ void shouldReleaseConnectionSourceIfLimitIsReachedOnInitialQuery() {
     void shouldReleaseConnectionSourceIfLimitIsReachedOnGetMore() {
         assumeFalse(isSharded());
         BsonDocument commandResult = executeFindCommand(5, 3);
-        cursor = new AsyncCommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, commandResult, 3, 0, DOCUMENT_DECODER,
-                                               null, connectionSource, connection);
+        cursor = new AsyncCommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
+                new AsyncCommandCoreCursor<>(commandResult, 3, DOCUMENT_DECODER, null, connectionSource, connection));
 
         assertNotNull(cursorNext());
         assertNotNull(cursorNext());
@@ -356,8 +367,8 @@ void shouldReleaseConnectionSourceIfLimitIsReachedOnGetMore() {
     @DisplayName("test limit with get more")
     void testLimitWithGetMore() {
         BsonDocument commandResult = executeFindCommand(5, 2);
-        cursor = new AsyncCommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, commandResult, 2, 0, DOCUMENT_DECODER,
-                                               null, connectionSource, connection);
+        cursor = new AsyncCommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
+                new AsyncCommandCoreCursor<>(commandResult, 2, DOCUMENT_DECODER, null, connectionSource, connection));
 
         assertNotNull(cursorNext());
         assertNotNull(cursorNext());
@@ -379,8 +390,8 @@ void testLimitWithLargeDocuments() {
         );
 
         BsonDocument commandResult = executeFindCommand(300, 0);
-        cursor = new AsyncCommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, commandResult, 0, 0, DOCUMENT_DECODER,
-                                               null, connectionSource, connection);
+        cursor = new AsyncCommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
+                new AsyncCommandCoreCursor<>(commandResult, 0, DOCUMENT_DECODER, null, connectionSource, connection));
 
         assertEquals(300, cursorFlatten().size());
     }
@@ -389,8 +400,8 @@ void testLimitWithLargeDocuments() {
     @DisplayName("should respect batch size")
     void shouldRespectBatchSize() {
         BsonDocument commandResult = executeFindCommand(2);
-        cursor = new AsyncCommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, commandResult, 2, 0, DOCUMENT_DECODER,
-                                               null, connectionSource, connection);
+        cursor = new AsyncCommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
+                new AsyncCommandCoreCursor<>(commandResult, 2, DOCUMENT_DECODER, null, connectionSource, connection));
 
         assertEquals(2, cursor.getBatchSize());
         assertEquals(2, cursorNext().size());
@@ -406,16 +417,18 @@ void shouldRespectBatchSize() {
     @DisplayName("should throw cursor not found exception")
     void shouldThrowCursorNotFoundException() throws Throwable {
         BsonDocument commandResult = executeFindCommand(2);
-        cursor = new AsyncCommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, commandResult, 2, 0, DOCUMENT_DECODER,
-                                               null, connectionSource, connection);
+        AsyncCommandCoreCursor coreCursor =
+                new AsyncCommandCoreCursor<>(commandResult, 2, DOCUMENT_DECODER, null, connectionSource, connection);
+        cursor = new AsyncCommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
+                coreCursor);
 
-        ServerCursor serverCursor = cursor.getServerCursor();
+        ServerCursor serverCursor = coreCursor.getServerCursor();
         assertNotNull(serverCursor);
         AsyncConnection localConnection = getConnection(connectionSource);
         this.block(cb -> localConnection.commandAsync(getNamespace().getDatabaseName(),
                 new BsonDocument("killCursors", new BsonString(getNamespace().getCollectionName()))
                         .append("cursors", new BsonArray(singletonList(new BsonInt64(serverCursor.getId())))),
-                NoOpFieldNameValidator.INSTANCE, ReadPreference.primary(), new BsonDocumentCodec(), connectionSource.getOperationContext(), cb));
+                NoOpFieldNameValidator.INSTANCE, ReadPreference.primary(), new BsonDocumentCodec(), OPERATION_CONTEXT, cb));
         localConnection.release();
 
         cursorNext();
@@ -481,7 +494,7 @@ private BsonDocument executeFindCommand(final BsonDocument filter, final int lim
 
         BsonDocument results = block(cb -> connection.commandAsync(getDatabaseName(), findCommand,
                 NoOpFieldNameValidator.INSTANCE, readPreference, CommandResultDocumentCodec.create(DOCUMENT_DECODER, FIRST_BATCH),
-                connectionSource.getOperationContext(), cb));
+                OPERATION_CONTEXT, cb));
 
         assertNotNull(results);
         return results;
diff --git a/driver-core/src/test/functional/com/mongodb/internal/operation/AsyncCommandBatchCursorTest.java b/driver-core/src/test/functional/com/mongodb/internal/operation/AsyncCommandBatchCursorTest.java
index e9a30686d5f..499f6724d6e 100644
--- a/driver-core/src/test/functional/com/mongodb/internal/operation/AsyncCommandBatchCursorTest.java
+++ b/driver-core/src/test/functional/com/mongodb/internal/operation/AsyncCommandBatchCursorTest.java
@@ -17,252 +17,73 @@
 package com.mongodb.internal.operation;
 
 import com.mongodb.MongoClientSettings;
-import com.mongodb.MongoNamespace;
-import com.mongodb.MongoOperationTimeoutException;
-import com.mongodb.MongoSocketException;
-import com.mongodb.ServerAddress;
 import com.mongodb.client.cursor.TimeoutMode;
-import com.mongodb.connection.ConnectionDescription;
-import com.mongodb.connection.ServerDescription;
-import com.mongodb.connection.ServerType;
-import com.mongodb.connection.ServerVersion;
+import com.mongodb.internal.IgnorableRequestContext;
 import com.mongodb.internal.TimeoutContext;
 import com.mongodb.internal.TimeoutSettings;
-import com.mongodb.internal.async.SingleResultCallback;
-import com.mongodb.internal.binding.AsyncConnectionSource;
-import com.mongodb.internal.connection.AsyncConnection;
+import com.mongodb.internal.connection.NoOpSessionContext;
 import com.mongodb.internal.connection.OperationContext;
-import org.bson.BsonArray;
-import org.bson.BsonDocument;
-import org.bson.BsonInt32;
-import org.bson.BsonInt64;
-import org.bson.BsonString;
 import org.bson.Document;
-import org.bson.codecs.Decoder;
-import org.bson.codecs.DocumentCodec;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
+import org.mockito.ArgumentCaptor;
 
 import java.time.Duration;
 
-import static com.mongodb.internal.operation.OperationUnitSpecification.getMaxWireVersionForServerVersion;
-import static com.mongodb.internal.thread.InterruptionUtil.interruptAndCreateMongoInterruptedException;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.argThat;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
 
 class AsyncCommandBatchCursorTest {
-
-    private static final MongoNamespace NAMESPACE = new MongoNamespace("test", "test");
-    private static final BsonInt64 CURSOR_ID = new BsonInt64(1);
-    private static final BsonDocument COMMAND_CURSOR_DOCUMENT = new BsonDocument("ok", new BsonInt32(1))
-            .append("cursor",
-                    new BsonDocument("ns", new BsonString(NAMESPACE.getFullName()))
-                            .append("id", CURSOR_ID)
-                            .append("firstBatch", new BsonArrayWrapper<>(new BsonArray())));
-
-    private static final Decoder DOCUMENT_CODEC = new DocumentCodec();
     private static final Duration TIMEOUT = Duration.ofMillis(3_000);
-
-
-    private AsyncConnection mockConnection;
-    private ConnectionDescription mockDescription;
-    private AsyncConnectionSource connectionSource;
     private OperationContext operationContext;
     private TimeoutContext timeoutContext;
-    private ServerDescription serverDescription;
+    private AsyncCoreCursor coreCursor;
 
     @BeforeEach
     void setUp() {
-        ServerVersion serverVersion = new ServerVersion(3, 6);
-
-        mockConnection = mock(AsyncConnection.class, "connection");
-        mockDescription = mock(ConnectionDescription.class);
-        when(mockDescription.getMaxWireVersion()).thenReturn(getMaxWireVersionForServerVersion(serverVersion.getVersionList()));
-        when(mockDescription.getServerType()).thenReturn(ServerType.LOAD_BALANCER);
-        when(mockConnection.getDescription()).thenReturn(mockDescription);
-        when(mockConnection.retain()).thenReturn(mockConnection);
-
-        connectionSource = mock(AsyncConnectionSource.class);
-        operationContext = mock(OperationContext.class);
-        timeoutContext = new TimeoutContext(TimeoutSettings.create(
-                MongoClientSettings.builder().timeout(TIMEOUT.toMillis(), MILLISECONDS).build()));
-        serverDescription = mock(ServerDescription.class);
-        when(operationContext.getTimeoutContext()).thenReturn(timeoutContext);
-        when(connectionSource.getOperationContext()).thenReturn(operationContext);
-        doAnswer(invocation -> {
-            SingleResultCallback callback = invocation.getArgument(0);
-            callback.onResult(mockConnection, null);
-            return null;
-        }).when(connectionSource).getConnection(any());
-        when(connectionSource.getServerDescription()).thenReturn(serverDescription);
+        coreCursor = mock(AsyncCoreCursor.class);
+        timeoutContext = spy(new TimeoutContext(TimeoutSettings.create(
+                MongoClientSettings.builder().timeout(TIMEOUT.toMillis(), MILLISECONDS).build())));
+        operationContext = spy(new OperationContext(
+                IgnorableRequestContext.INSTANCE,
+                NoOpSessionContext.INSTANCE,
+                timeoutContext,
+                null));
     }
 
-
-    @Test
-    void shouldSkipKillsCursorsCommandWhenNetworkErrorOccurs() {
-        //given
-        doAnswer(invocation -> {
-            SingleResultCallback argument = invocation.getArgument(6);
-            argument.onResult(null, new MongoSocketException("test", new ServerAddress()));
-            return null;
-        }).when(mockConnection).commandAsync(eq(NAMESPACE.getDatabaseName()), any(), any(), any(), any(), any(), any());
-        when(serverDescription.getType()).thenReturn(ServerType.LOAD_BALANCER);
-        AsyncCommandBatchCursor commandBatchCursor = createBatchCursor(0);
-
-        //when
-        commandBatchCursor.next((result, t) -> {
-            Assertions.assertNull(result);
-            Assertions.assertNotNull(t);
-            Assertions.assertEquals(MongoSocketException.class, t.getClass());
-        });
-
-        //then
-        commandBatchCursor.close();
-        verify(mockConnection, times(1)).commandAsync(eq(NAMESPACE.getDatabaseName()), any(), any(), any(), any(), any(), any());
-    }
-
-
-    @Test
-    void shouldNotSkipKillsCursorsCommandWhenTimeoutExceptionDoesNotHaveNetworkErrorCause() {
-        //given
-        doAnswer(invocation -> {
-            SingleResultCallback argument = invocation.getArgument(6);
-            argument.onResult(null, new MongoOperationTimeoutException("test"));
-            return null;
-        }).when(mockConnection).commandAsync(eq(NAMESPACE.getDatabaseName()), any(), any(), any(), any(), any(), any());
-        when(serverDescription.getType()).thenReturn(ServerType.LOAD_BALANCER);
-
-        AsyncCommandBatchCursor commandBatchCursor = createBatchCursor(0);
-
-        //when
-        commandBatchCursor.next((result, t) -> {
-            Assertions.assertNull(result);
-            Assertions.assertNotNull(t);
-            Assertions.assertEquals(MongoOperationTimeoutException.class, t.getClass());
-        });
-
-        commandBatchCursor.close();
-
-
-        //then
-        verify(mockConnection, times(2)).commandAsync(any(),
-                any(), any(), any(), any(), any(), any());
-        verify(mockConnection, times(1)).commandAsync(eq(NAMESPACE.getDatabaseName()),
-                argThat(bsonDocument -> bsonDocument.containsKey("getMore")), any(), any(), any(), any(), any());
-        verify(mockConnection, times(1)).commandAsync(eq(NAMESPACE.getDatabaseName()),
-                argThat(bsonDocument -> bsonDocument.containsKey("killCursors")), any(), any(), any(), any(), any());
-    }
-
-    @Test
-    void shouldSkipKillsCursorsCommandWhenTimeoutExceptionHaveNetworkErrorCause() {
-        //given
-        doAnswer(invocation -> {
-            SingleResultCallback argument = invocation.getArgument(6);
-            argument.onResult(null, new MongoOperationTimeoutException("test", new MongoSocketException("test", new ServerAddress())));
-            return null;
-        }).when(mockConnection).commandAsync(eq(NAMESPACE.getDatabaseName()), any(), any(), any(), any(), any(), any());
-        when(serverDescription.getType()).thenReturn(ServerType.LOAD_BALANCER);
-
-        AsyncCommandBatchCursor commandBatchCursor = createBatchCursor(0);
-
-        //when
-        commandBatchCursor.next((result, t) -> {
-            Assertions.assertNull(result);
-            Assertions.assertNotNull(t);
-            Assertions.assertEquals(MongoOperationTimeoutException.class, t.getClass());
-        });
-
-        commandBatchCursor.close();
-
-        //then
-        verify(mockConnection, times(1)).commandAsync(any(),
-                any(), any(), any(), any(), any(), any());
-        verify(mockConnection, times(1)).commandAsync(eq(NAMESPACE.getDatabaseName()),
-                argThat(bsonDocument -> bsonDocument.containsKey("getMore")), any(), any(), any(), any(), any());
-        verify(mockConnection, never()).commandAsync(eq(NAMESPACE.getDatabaseName()),
-                argThat(bsonDocument -> bsonDocument.containsKey("killCursors")), any(), any(), any(), any(), any());
-    }
-
-    @Test
+    @ParameterizedTest(name = "closeShouldResetTimeoutContextToDefaultMaxTime with maxTimeMS={0}")
     @SuppressWarnings("try")
-    void closeShouldResetTimeoutContextToDefaultMaxTime() {
-        long maxTimeMS = 10;
-        com.mongodb.assertions.Assertions.assertTrue(maxTimeMS < TIMEOUT.toMillis());
+    @ValueSource(ints = {10, 0})
+    void closeShouldResetTimeoutContextToDefaultMaxTime(final int maxTimeMS) {
+        //given
         try (AsyncCommandBatchCursor commandBatchCursor = createBatchCursor(maxTimeMS)) {
-            // verify that the `maxTimeMS` override was applied
-            timeoutContext.runMaxTimeMS(remainingMillis -> assertTrue(remainingMillis <= maxTimeMS));
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-        timeoutContext.runMaxTimeMS(remainingMillis -> {
-            // verify that the `maxTimeMS` override was reset
-            assertTrue(remainingMillis > maxTimeMS);
-            assertTrue(remainingMillis <= TIMEOUT.toMillis());
-        });
-    }
 
-    @ParameterizedTest
-    @ValueSource(booleans = {false, true})
-    void closeShouldNotResetOriginalTimeout(final boolean disableTimeoutResetWhenClosing) {
-        doAnswer(invocation -> {
-            SingleResultCallback argument = invocation.getArgument(6);
-            argument.onResult(null, null);
-            return null;
-        }).when(mockConnection).commandAsync(any(), any(), any(), any(), any(), any(), any());
-        Duration thirdOfTimeout = TIMEOUT.dividedBy(3);
-        com.mongodb.assertions.Assertions.assertTrue(thirdOfTimeout.toMillis() > 0);
-        try (AsyncCommandBatchCursor commandBatchCursor = createBatchCursor(0)) {
-            if (disableTimeoutResetWhenClosing) {
-                commandBatchCursor.disableTimeoutResetWhenClosing();
-            }
-            try {
-                Thread.sleep(thirdOfTimeout.toMillis());
-            } catch (InterruptedException e) {
-                throw interruptAndCreateMongoInterruptedException(null, e);
-            }
-            when(mockConnection.release()).then(invocation -> {
-                Thread.sleep(thirdOfTimeout.toMillis());
-                return null;
+            //when
+            commandBatchCursor.close();
+
+            // then verify that the `maxTimeMS` override was not applied
+            ArgumentCaptor operationContextArgumentCaptor = ArgumentCaptor.forClass(OperationContext.class);
+            verify(coreCursor).close(operationContextArgumentCaptor.capture());
+            OperationContext operationContextForNext = operationContextArgumentCaptor.getValue();
+            operationContextForNext.getTimeoutContext().runMaxTimeMS(remainingMillis -> {
+                // verify that the `maxTimeMS` override was reset
+                assertTrue(remainingMillis > maxTimeMS);
+                assertTrue(remainingMillis <= TIMEOUT.toMillis());
             });
-        } catch (Exception e) {
-            throw new RuntimeException(e);
+
         }
-        verify(mockConnection, times(1)).release();
-        // at this point at least (2 * thirdOfTimeout) have passed
-        com.mongodb.assertions.Assertions.assertNotNull(timeoutContext.getTimeout()).run(
-                MILLISECONDS,
-                com.mongodb.assertions.Assertions::fail,
-                remainingMillis -> {
-                    // Verify that the original timeout has not been intact.
-                    // If `close` had reset it, we would have observed more than `thirdOfTimeout` left.
-                    assertTrue(remainingMillis <= thirdOfTimeout.toMillis());
-                },
-                Assertions::fail);
     }
 
-
     private AsyncCommandBatchCursor createBatchCursor(final long maxTimeMS) {
-        return new AsyncCommandBatchCursor(
+        return new AsyncCommandBatchCursor<>(
                 TimeoutMode.CURSOR_LIFETIME,
-                COMMAND_CURSOR_DOCUMENT,
-                0,
                 maxTimeMS,
-                DOCUMENT_CODEC,
-                null,
-                connectionSource,
-                mockConnection);
+                operationContext,
+                coreCursor);
     }
 
 }
diff --git a/driver-core/src/test/functional/com/mongodb/internal/operation/AsyncCommandCoreCursorTest.java b/driver-core/src/test/functional/com/mongodb/internal/operation/AsyncCommandCoreCursorTest.java
new file mode 100644
index 00000000000..453166438eb
--- /dev/null
+++ b/driver-core/src/test/functional/com/mongodb/internal/operation/AsyncCommandCoreCursorTest.java
@@ -0,0 +1,211 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.operation;
+
+import com.mongodb.MongoClientSettings;
+import com.mongodb.MongoNamespace;
+import com.mongodb.MongoOperationTimeoutException;
+import com.mongodb.MongoSocketException;
+import com.mongodb.ServerAddress;
+import com.mongodb.connection.ConnectionDescription;
+import com.mongodb.connection.ServerDescription;
+import com.mongodb.connection.ServerType;
+import com.mongodb.connection.ServerVersion;
+import com.mongodb.internal.IgnorableRequestContext;
+import com.mongodb.internal.TimeoutContext;
+import com.mongodb.internal.TimeoutSettings;
+import com.mongodb.internal.async.SingleResultCallback;
+import com.mongodb.internal.binding.AsyncConnectionSource;
+import com.mongodb.internal.connection.AsyncConnection;
+import com.mongodb.internal.connection.NoOpSessionContext;
+import com.mongodb.internal.connection.OperationContext;
+import org.bson.BsonArray;
+import org.bson.BsonDocument;
+import org.bson.BsonInt32;
+import org.bson.BsonInt64;
+import org.bson.BsonString;
+import org.bson.Document;
+import org.bson.codecs.Decoder;
+import org.bson.codecs.DocumentCodec;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.time.Duration;
+
+import static com.mongodb.internal.operation.OperationUnitSpecification.getMaxWireVersionForServerVersion;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.argThat;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+class AsyncCommandCoreCursorTest {
+
+    private static final MongoNamespace NAMESPACE = new MongoNamespace("test", "test");
+    private static final BsonInt64 CURSOR_ID = new BsonInt64(1);
+    private static final BsonDocument COMMAND_CURSOR_DOCUMENT = new BsonDocument("ok", new BsonInt32(1))
+            .append("cursor",
+                    new BsonDocument("ns", new BsonString(NAMESPACE.getFullName()))
+                            .append("id", CURSOR_ID)
+                            .append("firstBatch", new BsonArrayWrapper<>(new BsonArray())));
+
+    private static final Decoder DOCUMENT_CODEC = new DocumentCodec();
+    private static final Duration TIMEOUT = Duration.ofMillis(3_000);
+
+
+    private AsyncConnection mockConnection;
+    private ConnectionDescription mockDescription;
+    private AsyncConnectionSource connectionSource;
+    private OperationContext operationContext;
+    private TimeoutContext timeoutContext;
+    private ServerDescription serverDescription;
+    private AsyncCoreCursor coreCursor;
+
+    @BeforeEach
+    void setUp() {
+        coreCursor = mock(AsyncCoreCursor.class);
+        timeoutContext = spy(new TimeoutContext(TimeoutSettings.create(
+                MongoClientSettings.builder().timeout(TIMEOUT.toMillis(), MILLISECONDS).build())));
+        operationContext = spy(new OperationContext(
+                IgnorableRequestContext.INSTANCE,
+                NoOpSessionContext.INSTANCE,
+                timeoutContext,
+                null));
+
+        ServerVersion serverVersion = new ServerVersion(3, 6);
+        mockConnection = mock(AsyncConnection.class, "connection");
+        mockDescription = mock(ConnectionDescription.class);
+        when(mockDescription.getMaxWireVersion()).thenReturn(getMaxWireVersionForServerVersion(serverVersion.getVersionList()));
+        when(mockDescription.getServerType()).thenReturn(ServerType.LOAD_BALANCER);
+        when(mockConnection.getDescription()).thenReturn(mockDescription);
+        when(mockConnection.retain()).thenReturn(mockConnection);
+
+        connectionSource = mock(AsyncConnectionSource.class);
+        serverDescription = mock(ServerDescription.class);
+        when(operationContext.getTimeoutContext()).thenReturn(timeoutContext);
+        doAnswer(invocation -> {
+            SingleResultCallback callback = invocation.getArgument(0);
+            callback.onResult(mockConnection, null);
+            return null;
+        }).when(connectionSource).getConnection(any(), any());
+        when(connectionSource.getServerDescription()).thenReturn(serverDescription);
+    }
+
+
+    @Test
+    void shouldSkipKillsCursorsCommandWhenNetworkErrorOccurs() {
+        //given
+        doAnswer(invocation -> {
+            SingleResultCallback argument = invocation.getArgument(6);
+            argument.onResult(null, new MongoSocketException("test", new ServerAddress()));
+            return null;
+        }).when(mockConnection).commandAsync(eq(NAMESPACE.getDatabaseName()), any(), any(), any(), any(), any(), any());
+        when(serverDescription.getType()).thenReturn(ServerType.LOAD_BALANCER);
+        AsyncCoreCursor commandBatchCursor = createBatchCursor();
+
+        //when
+        commandBatchCursor.next(operationContext, (result, t) -> {
+            Assertions.assertNull(result);
+            Assertions.assertNotNull(t);
+            Assertions.assertEquals(MongoSocketException.class, t.getClass());
+        });
+
+        //then
+        commandBatchCursor.close(operationContext);
+        verify(mockConnection, times(1)).commandAsync(eq(NAMESPACE.getDatabaseName()), any(), any(), any(), any(), any(), any());
+    }
+
+
+    @Test
+    void shouldNotSkipKillsCursorsCommandWhenTimeoutExceptionDoesNotHaveNetworkErrorCause() {
+        //given
+        doAnswer(invocation -> {
+            SingleResultCallback argument = invocation.getArgument(6);
+            argument.onResult(null, new MongoOperationTimeoutException("test"));
+            return null;
+        }).when(mockConnection).commandAsync(eq(NAMESPACE.getDatabaseName()), any(), any(), any(), any(), any(), any());
+        when(serverDescription.getType()).thenReturn(ServerType.LOAD_BALANCER);
+
+        AsyncCoreCursor commandBatchCursor = createBatchCursor();
+
+        //when
+        commandBatchCursor.next(operationContext, (result, t) -> {
+            Assertions.assertNull(result);
+            Assertions.assertNotNull(t);
+            Assertions.assertEquals(MongoOperationTimeoutException.class, t.getClass());
+        });
+
+        commandBatchCursor.close(operationContext);
+
+
+        //then
+        verify(mockConnection, times(2)).commandAsync(any(),
+                any(), any(), any(), any(), any(), any());
+        verify(mockConnection, times(1)).commandAsync(eq(NAMESPACE.getDatabaseName()),
+                argThat(bsonDocument -> bsonDocument.containsKey("getMore")), any(), any(), any(), any(), any());
+        verify(mockConnection, times(1)).commandAsync(eq(NAMESPACE.getDatabaseName()),
+                argThat(bsonDocument -> bsonDocument.containsKey("killCursors")), any(), any(), any(), any(), any());
+    }
+
+    @Test
+    void shouldSkipKillsCursorsCommandWhenTimeoutExceptionHaveNetworkErrorCause() {
+        //given
+        doAnswer(invocation -> {
+            SingleResultCallback argument = invocation.getArgument(6);
+            argument.onResult(null, new MongoOperationTimeoutException("test", new MongoSocketException("test", new ServerAddress())));
+            return null;
+        }).when(mockConnection).commandAsync(eq(NAMESPACE.getDatabaseName()), any(), any(), any(), any(), any(), any());
+        when(serverDescription.getType()).thenReturn(ServerType.LOAD_BALANCER);
+
+        AsyncCoreCursor commandBatchCursor = createBatchCursor();
+
+        //when
+        commandBatchCursor.next(operationContext, (result, t) -> {
+            Assertions.assertNull(result);
+            Assertions.assertNotNull(t);
+            Assertions.assertEquals(MongoOperationTimeoutException.class, t.getClass());
+        });
+
+        commandBatchCursor.close(operationContext);
+
+        //then
+        verify(mockConnection, times(1)).commandAsync(any(),
+                any(), any(), any(), any(), any(), any());
+        verify(mockConnection, times(1)).commandAsync(eq(NAMESPACE.getDatabaseName()),
+                argThat(bsonDocument -> bsonDocument.containsKey("getMore")), any(), any(), any(), any(), any());
+        verify(mockConnection, never()).commandAsync(eq(NAMESPACE.getDatabaseName()),
+                argThat(bsonDocument -> bsonDocument.containsKey("killCursors")), any(), any(), any(), any(), any());
+    }
+
+
+    private AsyncCoreCursor createBatchCursor() {
+        return new AsyncCommandCoreCursor<>(
+                COMMAND_CURSOR_DOCUMENT,
+                0,
+                DOCUMENT_CODEC,
+                null,
+                connectionSource,
+                mockConnection);
+    }
+}
diff --git a/driver-core/src/test/functional/com/mongodb/internal/operation/ChangeStreamOperationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/internal/operation/ChangeStreamOperationSpecification.groovy
index 9134375ffec..19285eda077 100644
--- a/driver-core/src/test/functional/com/mongodb/internal/operation/ChangeStreamOperationSpecification.groovy
+++ b/driver-core/src/test/functional/com/mongodb/internal/operation/ChangeStreamOperationSpecification.groovy
@@ -37,6 +37,7 @@ import com.mongodb.internal.binding.ReadBinding
 import com.mongodb.internal.client.model.changestream.ChangeStreamLevel
 import com.mongodb.internal.connection.AsyncConnection
 import com.mongodb.internal.connection.Connection
+import com.mongodb.internal.connection.OperationContext
 import com.mongodb.internal.session.SessionContext
 import org.bson.BsonArray
 import org.bson.BsonBoolean
@@ -641,10 +642,8 @@ class ChangeStreamOperationSpecification extends OperationFunctionalSpecificatio
                 })
         def changeStream
         def binding = Stub(ReadBinding) {
-            getOperationContext() >> operationContext
-            getReadConnectionSource() >> Stub(ConnectionSource) {
-                getOperationContext() >> operationContext
-                getConnection() >> Stub(Connection) {
+            getReadConnectionSource(_) >> Stub(ConnectionSource) {
+                getConnection(_) >> Stub(Connection) {
                      command(*_) >> {
                          changeStream = getChangeStream(it[1])
                          new BsonDocument('cursor', new BsonDocument('id', new BsonInt64(1))
@@ -662,7 +661,7 @@ class ChangeStreamOperationSpecification extends OperationFunctionalSpecificatio
         new ChangeStreamOperation(helper.getNamespace(), FullDocument.DEFAULT,
                 FullDocumentBeforeChange.DEFAULT, [], CODEC)
                 .resumeAfter(new BsonDocument())
-                .execute(binding)
+                .execute(binding, operationContext)
 
         then:
         changeStream.containsKey('resumeAfter')
@@ -672,7 +671,7 @@ class ChangeStreamOperationSpecification extends OperationFunctionalSpecificatio
         new ChangeStreamOperation(helper.getNamespace(), FullDocument.DEFAULT,
                 FullDocumentBeforeChange.DEFAULT, [], CODEC)
                 .startAfter(new BsonDocument())
-                .execute(binding)
+                .execute(binding, operationContext)
 
         then:
         changeStream.containsKey('startAfter')
@@ -683,7 +682,7 @@ class ChangeStreamOperationSpecification extends OperationFunctionalSpecificatio
         new ChangeStreamOperation(helper.getNamespace(), FullDocument.DEFAULT,
                 FullDocumentBeforeChange.DEFAULT, [], CODEC)
                 .startAtOperationTime(startAtTime)
-                .execute(binding)
+                .execute(binding, operationContext)
 
         then:
         changeStream.getTimestamp('startAtOperationTime') == startAtTime
@@ -698,11 +697,9 @@ class ChangeStreamOperationSpecification extends OperationFunctionalSpecificatio
                 })
         def changeStream
         def binding = Stub(AsyncReadBinding) {
-            getOperationContext() >> operationContext
-            getReadConnectionSource(_) >> {
+            getReadConnectionSource(_ as OperationContext, _ as SingleResultCallback) >> {
                 it.last().onResult(Stub(AsyncConnectionSource) {
-                    getOperationContext() >> operationContext
-                    getConnection(_) >> {
+                    getConnection(_ as OperationContext, _ as SingleResultCallback) >> {
                         it.last().onResult(Stub(AsyncConnection) {
                             commandAsync(*_) >> {
                                 changeStream = getChangeStream(it[1])
@@ -723,7 +720,7 @@ class ChangeStreamOperationSpecification extends OperationFunctionalSpecificatio
         new ChangeStreamOperation(helper.getNamespace(), FullDocument.DEFAULT,
                 FullDocumentBeforeChange.DEFAULT, [], CODEC)
                 .resumeAfter(new BsonDocument())
-                .executeAsync(binding, Stub(SingleResultCallback))
+                .executeAsync(binding, operationContext, Stub(SingleResultCallback))
 
         then:
         changeStream.containsKey('resumeAfter')
@@ -733,7 +730,7 @@ class ChangeStreamOperationSpecification extends OperationFunctionalSpecificatio
         new ChangeStreamOperation(helper.getNamespace(), FullDocument.DEFAULT,
                 FullDocumentBeforeChange.DEFAULT, [], CODEC)
                 .startAfter(new BsonDocument())
-                .executeAsync(binding, Stub(SingleResultCallback))
+                .executeAsync(binding, operationContext, Stub(SingleResultCallback))
 
         then:
         changeStream.containsKey('startAfter')
@@ -744,7 +741,7 @@ class ChangeStreamOperationSpecification extends OperationFunctionalSpecificatio
         new ChangeStreamOperation(helper.getNamespace(), FullDocument.DEFAULT,
                 FullDocumentBeforeChange.DEFAULT, [], CODEC)
                 .startAtOperationTime(startAtTime)
-                .executeAsync(binding, Stub(SingleResultCallback))
+                .executeAsync(binding, operationContext, Stub(SingleResultCallback))
 
         then:
         changeStream.getTimestamp('startAtOperationTime') == startAtTime
diff --git a/driver-core/src/test/functional/com/mongodb/internal/operation/CommandBatchCursorFunctionalTest.java b/driver-core/src/test/functional/com/mongodb/internal/operation/CommandBatchCursorFunctionalTest.java
index d9861c71659..3d0774d425a 100644
--- a/driver-core/src/test/functional/com/mongodb/internal/operation/CommandBatchCursorFunctionalTest.java
+++ b/driver-core/src/test/functional/com/mongodb/internal/operation/CommandBatchCursorFunctionalTest.java
@@ -16,6 +16,7 @@
 
 package com.mongodb.internal.operation;
 
+import com.mongodb.ClusterFixture;
 import com.mongodb.MongoCursorNotFoundException;
 import com.mongodb.MongoQueryException;
 import com.mongodb.ReadPreference;
@@ -54,6 +55,7 @@
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
+import static com.mongodb.ClusterFixture.OPERATION_CONTEXT;
 import static com.mongodb.ClusterFixture.checkReferenceCountReachesTarget;
 import static com.mongodb.ClusterFixture.getBinding;
 import static com.mongodb.ClusterFixture.getReferenceCountAfterTimeout;
@@ -85,8 +87,8 @@ void setup() {
                 .collect(Collectors.toList());
         getCollectionHelper().insertDocuments(documents);
 
-        connectionSource = getBinding().getWriteConnectionSource();
-        connection = connectionSource.getConnection();
+        connectionSource = getBinding().getWriteConnectionSource(ClusterFixture.OPERATION_CONTEXT);
+        connection = connectionSource.getConnection(ClusterFixture.OPERATION_CONTEXT);
     }
 
     @AfterEach
@@ -107,8 +109,8 @@ void cleanup() {
     void shouldExhaustCursorWithMultipleBatches() {
         // given
         BsonDocument commandResult = executeFindCommand(0, 3); // Fetch in batches of size 3
-        cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, commandResult, 3, 0, DOCUMENT_DECODER,
-                null, connectionSource, connection);
+        cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
+                new CommandCoreCursor<>(commandResult, 3, DOCUMENT_DECODER, null, connectionSource, connection));
 
         // when
         List> result = cursor.exhaust();
@@ -125,8 +127,8 @@ void shouldExhaustCursorWithMultipleBatches() {
     void shouldExhaustCursorWithClosedCursor() {
         // given
         BsonDocument commandResult = executeFindCommand(0, 3);
-        cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, commandResult, 3, 0, DOCUMENT_DECODER,
-                null, connectionSource, connection);
+        cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
+                new CommandCoreCursor<>(commandResult, 3, DOCUMENT_DECODER, null, connectionSource, connection));
         cursor.close();
 
         // when & then
@@ -141,8 +143,8 @@ void shouldExhaustCursorWithEmptyCursor() {
         getCollectionHelper().deleteMany(Filters.empty());
 
         BsonDocument commandResult = executeFindCommand(0, 3); // No documents to fetch
-        cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, commandResult, 3, 0, DOCUMENT_DECODER,
-                null, connectionSource, connection);
+        cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
+                new CommandCoreCursor<>(commandResult, 3, DOCUMENT_DECODER, null, connectionSource, connection));
 
         // when
         List> result = cursor.exhaust();
@@ -155,8 +157,8 @@ void shouldExhaustCursorWithEmptyCursor() {
     @DisplayName("server cursor should not be null")
     void theServerCursorShouldNotBeNull() {
         BsonDocument commandResult = executeFindCommand(2);
-        cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, commandResult, 0, 0, DOCUMENT_DECODER,
-                                          null, connectionSource, connection);
+        cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
+                new CommandCoreCursor<>(commandResult, 0, DOCUMENT_DECODER, null, connectionSource, connection));
 
         assertNotNull(cursor.getServerCursor());
     }
@@ -165,8 +167,8 @@ void theServerCursorShouldNotBeNull() {
     @DisplayName("test server address should not be null")
     void theServerAddressShouldNotNull() {
         BsonDocument commandResult = executeFindCommand();
-        cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, commandResult, 0, 0, DOCUMENT_DECODER,
-                                          null, connectionSource, connection);
+        cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
+                new CommandCoreCursor<>(commandResult, 0, DOCUMENT_DECODER, null, connectionSource, connection));
 
         assertNotNull(cursor.getServerAddress());
     }
@@ -175,8 +177,8 @@ void theServerAddressShouldNotNull() {
     @DisplayName("should get Exceptions for operations on the cursor after closing")
     void shouldGetExceptionsForOperationsOnTheCursorAfterClosing() {
         BsonDocument commandResult = executeFindCommand();
-        cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, commandResult, 0, 0, DOCUMENT_DECODER,
-                                          null, connectionSource, connection);
+        cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
+                new CommandCoreCursor<>(commandResult, 0, DOCUMENT_DECODER, null, connectionSource, connection));
 
         cursor.close();
 
@@ -190,8 +192,8 @@ void shouldGetExceptionsForOperationsOnTheCursorAfterClosing() {
     @DisplayName("should throw an Exception when going off the end")
     void shouldThrowAnExceptionWhenGoingOffTheEnd() {
         BsonDocument commandResult = executeFindCommand(1);
-        cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, commandResult, 0, 0, DOCUMENT_DECODER,
-                                          null, connectionSource, connection);
+        cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
+                new CommandCoreCursor<>(commandResult, 0, DOCUMENT_DECODER, null, connectionSource, connection));
 
         cursor.next();
         cursor.next();
@@ -202,8 +204,8 @@ void shouldThrowAnExceptionWhenGoingOffTheEnd() {
     @DisplayName("test cursor remove")
     void testCursorRemove() {
         BsonDocument commandResult = executeFindCommand();
-        cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, commandResult, 0, 0, DOCUMENT_DECODER,
-                                          null, connectionSource, connection);
+        cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
+                new CommandCoreCursor<>(commandResult, 0, DOCUMENT_DECODER, null, connectionSource, connection));
 
         assertThrows(UnsupportedOperationException.class, () -> cursor.remove());
     }
@@ -212,8 +214,8 @@ void testCursorRemove() {
     @DisplayName("test normal exhaustion")
     void testNormalExhaustion() {
         BsonDocument commandResult = executeFindCommand();
-        cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, commandResult, 0, 0, DOCUMENT_DECODER,
-                                          null, connectionSource, connection);
+        cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
+                new CommandCoreCursor<>(commandResult, 0, DOCUMENT_DECODER, null, connectionSource, connection));
 
         assertEquals(10, cursorFlatten().size());
     }
@@ -223,8 +225,8 @@ void testNormalExhaustion() {
     @DisplayName("test limit exhaustion")
     void testLimitExhaustion(final int limit, final int batchSize, final int expectedTotal) {
         BsonDocument commandResult = executeFindCommand(limit, batchSize);
-        cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, commandResult, batchSize, 0, DOCUMENT_DECODER,
-                                          null, connectionSource, connection);
+        cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
+                new CommandCoreCursor<>(commandResult, 0, DOCUMENT_DECODER, null, connectionSource, connection));
 
         assertEquals(expectedTotal, cursorFlatten().size());
 
@@ -242,8 +244,8 @@ void shouldBlockWaitingForNextBatchOnATailableCursor(final boolean awaitData, fi
 
         BsonDocument commandResult = executeFindCommand(new BsonDocument("ts",
                 new BsonDocument("$gte", new BsonTimestamp(5, 0))), 0, 2, true, awaitData);
-        cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, commandResult, 2, maxTimeMS, DOCUMENT_DECODER,
-                                          null, connectionSource, connection);
+        cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, maxTimeMS, OPERATION_CONTEXT,
+                new CommandCoreCursor<>(commandResult, 2, DOCUMENT_DECODER, null, connectionSource, connection));
 
         assertTrue(cursor.hasNext());
         assertEquals(1, cursor.next().get(0).get("_id"));
@@ -265,8 +267,8 @@ void testTryNextWithTailable() {
 
         BsonDocument commandResult = executeFindCommand(new BsonDocument("ts",
                 new BsonDocument("$gte", new BsonTimestamp(5, 0))), 0, 2, true, true);
-        cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, commandResult, 2, 0, DOCUMENT_DECODER,
-                                          null, connectionSource, connection);
+        cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
+                new CommandCoreCursor<>(commandResult, 2, DOCUMENT_DECODER, null, connectionSource, connection));
 
         List nextBatch = cursor.tryNext();
         assertNotNull(nextBatch);
@@ -291,8 +293,8 @@ void hasNextShouldThrowWhenCursorIsClosedInAnotherThread() throws InterruptedExc
 
         BsonDocument commandResult = executeFindCommand(new BsonDocument("ts",
                 new BsonDocument("$gte", new BsonTimestamp(5, 0))), 0, 2, true, true);
-        cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, commandResult, 2, 0, DOCUMENT_DECODER,
-                                          null, connectionSource, connection);
+        cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
+                new CommandCoreCursor<>(commandResult, 2, DOCUMENT_DECODER, null, connectionSource, connection));
 
         assertTrue(cursor.hasNext());
         assertEquals(1, cursor.next().get(0).get("_id"));
@@ -318,8 +320,8 @@ void testMaxTimeMS() {
         long maxTimeMS = 500;
         BsonDocument commandResult = executeFindCommand(new BsonDocument("ts",
                 new BsonDocument("$gte", new BsonTimestamp(5, 0))), 0, 2, true, true);
-        cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, commandResult, 2, maxTimeMS, DOCUMENT_DECODER,
-                                          null, connectionSource, connection);
+        cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, maxTimeMS, OPERATION_CONTEXT,
+                new CommandCoreCursor<>(commandResult, 2, DOCUMENT_DECODER, null, connectionSource, connection));
 
         List nextBatch = cursor.tryNext();
         assertNotNull(nextBatch);
@@ -342,8 +344,8 @@ void testTailableInterrupt() throws InterruptedException {
 
         BsonDocument commandResult = executeFindCommand(new BsonDocument("ts",
                 new BsonDocument("$gte", new BsonTimestamp(5, 0))), 0, 2, true, true);
-        cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, commandResult, 2, 0, DOCUMENT_DECODER,
-                                          null, connectionSource, connection);
+        cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
+                new CommandCoreCursor<>(commandResult, 2, DOCUMENT_DECODER, null, connectionSource, connection));
 
         CountDownLatch latch = new CountDownLatch(1);
         AtomicInteger seen = new AtomicInteger();
@@ -375,8 +377,8 @@ void testTailableInterrupt() throws InterruptedException {
     void shouldKillCursorIfLimitIsReachedOnInitialQuery() {
         assumeFalse(isSharded());
         BsonDocument commandResult = executeFindCommand(5, 10);
-        cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, commandResult, 0, 0, DOCUMENT_DECODER,
-                                          null, connectionSource, connection);
+        cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
+                new CommandCoreCursor<>(commandResult, 0, DOCUMENT_DECODER, null, connectionSource, connection));
 
         assertNotNull(cursor.next());
         assertFalse(cursor.hasNext());
@@ -388,8 +390,8 @@ void shouldKillCursorIfLimitIsReachedOnInitialQuery() {
     void shouldKillCursorIfLimitIsReachedOnGetMore() {
         assumeFalse(isSharded());
         BsonDocument commandResult = executeFindCommand(5, 3);
-        cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, commandResult, 3, 0, DOCUMENT_DECODER,
-                                          null, connectionSource, connection);
+        cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
+                new CommandCoreCursor<>(commandResult, 3, DOCUMENT_DECODER, null, connectionSource, connection));
 
         ServerCursor serverCursor = cursor.getServerCursor();
         assertNotNull(serverCursor);
@@ -407,8 +409,8 @@ void shouldKillCursorIfLimitIsReachedOnGetMore() {
     void shouldReleaseConnectionSourceIfLimitIsReachedOnInitialQuery() {
         assumeFalse(isSharded());
         BsonDocument commandResult = executeFindCommand(5, 10);
-        cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, commandResult, 0, 0, DOCUMENT_DECODER,
-                                          null, connectionSource, connection);
+        cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
+                new CommandCoreCursor<>(commandResult, 0, DOCUMENT_DECODER, null, connectionSource, connection));
 
         assertNull(cursor.getServerCursor());
         assertDoesNotThrow(() -> checkReferenceCountReachesTarget(connectionSource, 1));
@@ -420,8 +422,8 @@ void shouldReleaseConnectionSourceIfLimitIsReachedOnInitialQuery() {
     void shouldReleaseConnectionSourceIfLimitIsReachedOnGetMore() {
         assumeFalse(isSharded());
         BsonDocument commandResult = executeFindCommand(5, 3);
-        cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, commandResult, 3, 0, DOCUMENT_DECODER,
-                                          null, connectionSource, connection);
+        cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
+                new CommandCoreCursor<>(commandResult, 3, DOCUMENT_DECODER, null, connectionSource, connection));
 
         assertNotNull(cursor.next());
         assertNotNull(cursor.next());
@@ -433,8 +435,8 @@ void shouldReleaseConnectionSourceIfLimitIsReachedOnGetMore() {
     @DisplayName("test limit with get more")
     void testLimitWithGetMore() {
         BsonDocument commandResult = executeFindCommand(5, 2);
-        cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, commandResult, 2, 0, DOCUMENT_DECODER,
-                                          null, connectionSource, connection);
+        cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
+                new CommandCoreCursor<>(commandResult, 2, DOCUMENT_DECODER, null, connectionSource, connection));
 
         assertNotNull(cursor.next());
         assertNotNull(cursor.next());
@@ -454,8 +456,8 @@ void testLimitWithLargeDocuments() {
         );
 
         BsonDocument commandResult = executeFindCommand(300, 0);
-        cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, commandResult, 0, 0, DOCUMENT_DECODER,
-                                          null, connectionSource, connection);
+        cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
+                new CommandCoreCursor<>(commandResult, 0, DOCUMENT_DECODER, null, connectionSource, connection));
 
         assertEquals(300, cursorFlatten().size());
     }
@@ -464,8 +466,8 @@ void testLimitWithLargeDocuments() {
     @DisplayName("should respect batch size")
     void shouldRespectBatchSize() {
         BsonDocument commandResult = executeFindCommand(2);
-        cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, commandResult, 2, 0, DOCUMENT_DECODER,
-                                          null, connectionSource, connection);
+        cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
+                new CommandCoreCursor<>(commandResult, 2, DOCUMENT_DECODER, null, connectionSource, connection));
 
         assertEquals(2, cursor.getBatchSize());
         assertEquals(2, cursor.next().size());
@@ -481,16 +483,16 @@ void shouldRespectBatchSize() {
     @DisplayName("should throw cursor not found exception")
     void shouldThrowCursorNotFoundException() {
         BsonDocument commandResult = executeFindCommand(2);
-        cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, commandResult, 2, 0, DOCUMENT_DECODER,
-                                          null, connectionSource, connection);
+        cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
+                new CommandCoreCursor<>(commandResult, 2, DOCUMENT_DECODER, null, connectionSource, connection));
 
         ServerCursor serverCursor = cursor.getServerCursor();
         assertNotNull(serverCursor);
-        Connection localConnection = connectionSource.getConnection();
+        Connection localConnection = connectionSource.getConnection(OPERATION_CONTEXT);
         localConnection.command(getNamespace().getDatabaseName(),
                 new BsonDocument("killCursors", new BsonString(getNamespace().getCollectionName()))
                         .append("cursors", new BsonArray(singletonList(new BsonInt64(serverCursor.getId())))),
-                NoOpFieldNameValidator.INSTANCE, ReadPreference.primary(), new BsonDocumentCodec(), connectionSource.getOperationContext());
+                NoOpFieldNameValidator.INSTANCE, ReadPreference.primary(), new BsonDocumentCodec(), OPERATION_CONTEXT);
         localConnection.release();
 
         cursor.next();
@@ -504,8 +506,8 @@ void shouldThrowCursorNotFoundException() {
     @DisplayName("should report available documents")
     void shouldReportAvailableDocuments() {
         BsonDocument commandResult = executeFindCommand(3);
-        cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, commandResult, 2, 0, DOCUMENT_DECODER,
-                                          null, connectionSource, connection);
+        cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
+                new CommandCoreCursor<>(commandResult, 2, DOCUMENT_DECODER, null, connectionSource, connection));
 
         assertEquals(3, cursor.available());
 
@@ -582,7 +584,7 @@ private BsonDocument executeFindCommand(final BsonDocument filter, final int lim
         BsonDocument results = connection.command(getDatabaseName(), findCommand,
                 NoOpFieldNameValidator.INSTANCE, readPreference,
                 CommandResultDocumentCodec.create(DOCUMENT_DECODER, FIRST_BATCH),
-                connectionSource.getOperationContext());
+                OPERATION_CONTEXT);
 
         assertNotNull(results);
         return results;
diff --git a/driver-core/src/test/functional/com/mongodb/internal/operation/CountDocumentsOperationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/internal/operation/CountDocumentsOperationSpecification.groovy
index 8d13cba9f61..1e538b1af11 100644
--- a/driver-core/src/test/functional/com/mongodb/internal/operation/CountDocumentsOperationSpecification.groovy
+++ b/driver-core/src/test/functional/com/mongodb/internal/operation/CountDocumentsOperationSpecification.groovy
@@ -16,6 +16,7 @@
 
 package com.mongodb.internal.operation
 
+import com.mongodb.ClusterFixture
 import com.mongodb.MongoException
 import com.mongodb.MongoNamespace
 import com.mongodb.OperationFunctionalSpecification
@@ -26,6 +27,7 @@ import com.mongodb.connection.ClusterId
 import com.mongodb.connection.ConnectionDescription
 import com.mongodb.connection.ConnectionId
 import com.mongodb.connection.ServerId
+import com.mongodb.internal.async.SingleResultCallback
 import com.mongodb.internal.binding.AsyncConnectionSource
 import com.mongodb.internal.binding.AsyncReadBinding
 import com.mongodb.internal.binding.ConnectionSource
@@ -33,6 +35,7 @@ import com.mongodb.internal.binding.ReadBinding
 import com.mongodb.internal.bulk.IndexRequest
 import com.mongodb.internal.connection.AsyncConnection
 import com.mongodb.internal.connection.Connection
+import com.mongodb.internal.connection.OperationContext
 import com.mongodb.internal.session.SessionContext
 import org.bson.BsonArray
 import org.bson.BsonDocument
@@ -45,7 +48,6 @@ import org.bson.codecs.DocumentCodec
 
 import static com.mongodb.ClusterFixture.OPERATION_CONTEXT
 import static com.mongodb.ClusterFixture.executeAsync
-import static com.mongodb.ClusterFixture.getBinding
 import static com.mongodb.connection.ServerType.STANDALONE
 import static com.mongodb.internal.operation.OperationReadConcernHelper.appendReadConcernToCommand
 import static com.mongodb.internal.operation.ServerVersionHelper.UNKNOWN_WIRE_VERSION
@@ -151,8 +153,10 @@ class CountDocumentsOperationSpecification extends OperationFunctionalSpecificat
     def 'should use hint with the count'() {
         given:
         def indexDefinition = new BsonDocument('y', new BsonInt32(1))
+
+        def binding = ClusterFixture.getBinding()
         new CreateIndexesOperation(getNamespace(), [new IndexRequest(indexDefinition).sparse(true)], null)
-                .execute(getBinding())
+                .execute(binding, ClusterFixture.getOperationContext(binding.getReadPreference()))
         def operation = new CountDocumentsOperation(getNamespace()).hint(indexDefinition)
 
         when:
@@ -260,11 +264,9 @@ class CountDocumentsOperationSpecification extends OperationFunctionalSpecificat
         def source = Stub(ConnectionSource)
         def connection = Mock(Connection)
         binding.readPreference >> ReadPreference.primary()
-        binding.operationContext >> operationContext
-        binding.readConnectionSource >> source
-        source.connection >> connection
+        binding.getReadConnectionSource(_) >> source
+        source.getConnection(_) >> connection
         source.retain() >> source
-        source.operationContext >> operationContext
         def pipeline = new BsonArray([BsonDocument.parse('{ $match: {}}'), BsonDocument.parse('{$group: {_id: 1, n: {$sum: 1}}}')])
         def commandDocument = new BsonDocument('aggregate', new BsonString(getCollectionName()))
                 .append('pipeline', pipeline)
@@ -274,12 +276,12 @@ class CountDocumentsOperationSpecification extends OperationFunctionalSpecificat
         def operation = new CountDocumentsOperation(getNamespace())
 
         when:
-        operation.execute(binding)
+        operation.execute(binding, operationContext)
 
         then:
         _ * connection.description >> new ConnectionDescription(new ConnectionId(new ServerId(new ClusterId(), new ServerAddress())),
                 6, STANDALONE, 1000, 100000, 100000, [])
-        1 * connection.command(_, commandDocument, _, _, _, operationContext) >> helper.cursorResult
+        1 * connection.command(_, commandDocument, _, _, _, _) >> helper.cursorResult
         1 * connection.release()
 
         where:
@@ -300,11 +302,9 @@ class CountDocumentsOperationSpecification extends OperationFunctionalSpecificat
         def source = Stub(AsyncConnectionSource)
         def connection = Mock(AsyncConnection)
         binding.readPreference >> ReadPreference.primary()
-        binding.operationContext >> operationContext
-        binding.getReadConnectionSource(_) >> { it[0].onResult(source, null) }
-        source.getConnection(_) >> { it[0].onResult(connection, null) }
+        binding.getReadConnectionSource(_ as OperationContext, _ as SingleResultCallback) >> { it[1].onResult(source, null) }
+        source.getConnection(_ as OperationContext, _ as SingleResultCallback) >> { it[1].onResult(connection, null) }
         source.retain() >> source
-        source.operationContext >> operationContext
         def pipeline = new BsonArray([BsonDocument.parse('{ $match: {}}'), BsonDocument.parse('{$group: {_id: 1, n: {$sum: 1}}}')])
         def commandDocument = new BsonDocument('aggregate', new BsonString(getCollectionName()))
                 .append('pipeline', pipeline)
@@ -314,7 +314,7 @@ class CountDocumentsOperationSpecification extends OperationFunctionalSpecificat
         def operation = new CountDocumentsOperation(getNamespace())
 
         when:
-        executeAsync(operation, binding)
+        executeAsync(operation, binding, operationContext)
 
         then:
         _ * connection.description >> new ConnectionDescription(new ConnectionId(new ServerId(new ClusterId(), new ServerAddress())),
diff --git a/driver-core/src/test/functional/com/mongodb/internal/operation/CreateCollectionOperationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/internal/operation/CreateCollectionOperationSpecification.groovy
index b33ec785094..860ffb4a2bf 100644
--- a/driver-core/src/test/functional/com/mongodb/internal/operation/CreateCollectionOperationSpecification.groovy
+++ b/driver-core/src/test/functional/com/mongodb/internal/operation/CreateCollectionOperationSpecification.groovy
@@ -16,6 +16,7 @@
 
 package com.mongodb.internal.operation
 
+import com.mongodb.ClusterFixture
 import com.mongodb.MongoBulkWriteException
 import com.mongodb.MongoWriteConcernException
 import com.mongodb.OperationFunctionalSpecification
@@ -108,9 +109,13 @@ class CreateCollectionOperationSpecification extends OperationFunctionalSpecific
         when:
         execute(operation, async)
 
+
         then:
+        def binding = ClusterFixture.getBinding()
         new ListCollectionsOperation(getDatabaseName(), new BsonDocumentCodec())
-                .execute(getBinding()).next().find { it -> it.getString('name').value == getCollectionName() }
+                .execute(binding, ClusterFixture.getOperationContext(binding.getReadPreference()))
+                .next()
+                .find { it -> it.getString('name').value == getCollectionName() }
                 .getDocument('options').getDocument('storageEngine') == operation.storageEngineOptions
 
         where:
@@ -127,8 +132,11 @@ class CreateCollectionOperationSpecification extends OperationFunctionalSpecific
         execute(operation, async)
 
         then:
+        def binding = ClusterFixture.getBinding()
         new ListCollectionsOperation(getDatabaseName(), new BsonDocumentCodec())
-                .execute(getBinding()).next().find { it -> it.getString('name').value == getCollectionName() }
+                .execute(binding, ClusterFixture.getOperationContext(binding.getReadPreference()))
+                .next()
+                .find { it -> it.getString('name').value == getCollectionName() }
                 .getDocument('options').getDocument('storageEngine') == operation.storageEngineOptions
         where:
         async << [true, false]
@@ -244,8 +252,10 @@ class CreateCollectionOperationSpecification extends OperationFunctionalSpecific
     }
 
     def getCollectionInfo(String collectionName) {
+        def binding = getBinding()
         new ListCollectionsOperation(databaseName, new BsonDocumentCodec()).filter(new BsonDocument('name',
-                new BsonString(collectionName))).execute(getBinding()).tryNext()?.head()
+                new BsonString(collectionName))).execute(binding,
+                ClusterFixture.getOperationContext(binding.getReadPreference())).tryNext()?.head()
     }
 
     def collectionNameExists(String collectionName) {
@@ -255,15 +265,16 @@ class CreateCollectionOperationSpecification extends OperationFunctionalSpecific
 
     BsonDocument storageStats() {
         if (serverVersionLessThan(6, 2)) {
+            def binding = getBinding()
             return new CommandReadOperation<>(getDatabaseName(),
                     new BsonDocument('collStats', new BsonString(getCollectionName())),
-                    new BsonDocumentCodec()).execute(getBinding())
+                    new BsonDocumentCodec()).execute(binding, ClusterFixture.getOperationContext(binding.getReadPreference()))
         }
+        def binding = ClusterFixture.getBinding()
         BatchCursor cursor = new AggregateOperation(
-
                 getNamespace(),
                 singletonList(new BsonDocument('$collStats', new BsonDocument('storageStats', new BsonDocument()))),
-                new BsonDocumentCodec()).execute(getBinding())
+                new BsonDocumentCodec()).execute(binding, ClusterFixture.getOperationContext(binding.getReadPreference()))
         try {
             return cursor.next().first().getDocument('storageStats')
         } finally {
diff --git a/driver-core/src/test/functional/com/mongodb/internal/operation/CreateIndexesOperationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/internal/operation/CreateIndexesOperationSpecification.groovy
index 78a9914e022..fce0904b786 100644
--- a/driver-core/src/test/functional/com/mongodb/internal/operation/CreateIndexesOperationSpecification.groovy
+++ b/driver-core/src/test/functional/com/mongodb/internal/operation/CreateIndexesOperationSpecification.groovy
@@ -16,6 +16,7 @@
 
 package com.mongodb.internal.operation
 
+import com.mongodb.ClusterFixture
 import com.mongodb.CreateIndexCommitQuorum
 import com.mongodb.DuplicateKeyException
 import com.mongodb.MongoClientException
@@ -34,7 +35,6 @@ import org.bson.Document
 import org.bson.codecs.DocumentCodec
 import spock.lang.IgnoreIf
 
-import static com.mongodb.ClusterFixture.getBinding
 import static com.mongodb.ClusterFixture.isDiscoverableReplicaSet
 import static com.mongodb.ClusterFixture.serverVersionAtLeast
 import static com.mongodb.ClusterFixture.serverVersionLessThan
@@ -491,7 +491,10 @@ class CreateIndexesOperationSpecification extends OperationFunctionalSpecificati
 
     List getIndexes() {
         def indexes = []
-        def cursor = new ListIndexesOperation(getNamespace(), new DocumentCodec()).execute(getBinding())
+
+        def binding = ClusterFixture.getBinding()
+        def cursor = new ListIndexesOperation(getNamespace(), new DocumentCodec())
+                .execute(binding, ClusterFixture.getOperationContext(binding.getReadPreference()))
         while (cursor.hasNext()) {
             indexes.addAll(cursor.next())
         }
diff --git a/driver-core/src/test/functional/com/mongodb/internal/operation/CreateViewOperationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/internal/operation/CreateViewOperationSpecification.groovy
index 07a35800242..b8145de44b4 100644
--- a/driver-core/src/test/functional/com/mongodb/internal/operation/CreateViewOperationSpecification.groovy
+++ b/driver-core/src/test/functional/com/mongodb/internal/operation/CreateViewOperationSpecification.groovy
@@ -30,6 +30,7 @@ import org.bson.codecs.BsonDocumentCodec
 import spock.lang.IgnoreIf
 
 import static com.mongodb.ClusterFixture.getBinding
+import static com.mongodb.ClusterFixture.getOperationContext
 import static com.mongodb.ClusterFixture.isDiscoverableReplicaSet
 
 class CreateViewOperationSpecification extends OperationFunctionalSpecification {
@@ -121,8 +122,9 @@ class CreateViewOperationSpecification extends OperationFunctionalSpecification
     }
 
     def getCollectionInfo(String collectionName) {
+        def binding = getBinding()
         new ListCollectionsOperation(databaseName, new BsonDocumentCodec()).filter(new BsonDocument('name',
-                new BsonString(collectionName))).execute(getBinding()).tryNext()?.head()
+                new BsonString(collectionName))).execute(binding, getOperationContext(binding.getReadPreference())).tryNext()?.head()
     }
 
     def collectionNameExists(String collectionName) {
diff --git a/driver-core/src/test/functional/com/mongodb/internal/operation/DistinctOperationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/internal/operation/DistinctOperationSpecification.groovy
index 726a3723df5..f73c301d422 100644
--- a/driver-core/src/test/functional/com/mongodb/internal/operation/DistinctOperationSpecification.groovy
+++ b/driver-core/src/test/functional/com/mongodb/internal/operation/DistinctOperationSpecification.groovy
@@ -33,6 +33,7 @@ import com.mongodb.internal.binding.ConnectionSource
 import com.mongodb.internal.binding.ReadBinding
 import com.mongodb.internal.connection.AsyncConnection
 import com.mongodb.internal.connection.Connection
+import com.mongodb.internal.connection.OperationContext
 import com.mongodb.internal.session.SessionContext
 import org.bson.BsonBoolean
 import org.bson.BsonDocument
@@ -56,6 +57,7 @@ import static com.mongodb.connection.ServerType.STANDALONE
 import static com.mongodb.internal.operation.OperationReadConcernHelper.appendReadConcernToCommand
 import static com.mongodb.internal.operation.ServerVersionHelper.UNKNOWN_WIRE_VERSION
 import static org.bson.codecs.configuration.CodecRegistries.fromProviders
+import static org.junit.jupiter.api.Assertions.assertEquals
 
 class DistinctOperationSpecification extends OperationFunctionalSpecification {
 
@@ -230,11 +232,9 @@ class DistinctOperationSpecification extends OperationFunctionalSpecification {
         def source = Stub(ConnectionSource)
         def connection = Mock(Connection)
         binding.readPreference >> ReadPreference.primary()
-        binding.operationContext >> operationContext
-        binding.readConnectionSource >> source
-        source.connection >> connection
+        binding.getReadConnectionSource(_) >> source
+        source.getConnection(_) >> connection
         source.retain() >> source
-        source.operationContext >> operationContext
         def commandDocument = new BsonDocument('distinct', new BsonString(getCollectionName()))
                 .append('key', new BsonString('str'))
         appendReadConcernToCommand(sessionContext, UNKNOWN_WIRE_VERSION, commandDocument)
@@ -242,13 +242,15 @@ class DistinctOperationSpecification extends OperationFunctionalSpecification {
         def operation = new DistinctOperation(getNamespace(), 'str', new StringCodec())
 
         when:
-        operation.execute(binding)
+        operation.execute(binding, operationContext)
 
         then:
         _ * connection.description >> new ConnectionDescription(new ConnectionId(new ServerId(new ClusterId(), new ServerAddress())),
                 6, STANDALONE, 1000, 100000, 100000, [])
-        1 * connection.command(_, commandDocument, _, _, _, operationContext) >>
-                new BsonDocument('values', new BsonArrayWrapper([]))
+        1 * connection.command(_, commandDocument, _, _, _, _) >> {
+            assertEquals(((OperationContext) it[5]).getId(), operationContext.getId())
+            new BsonDocument('values', new BsonArrayWrapper([]))
+        }
         1 * connection.release()
 
         where:
@@ -269,10 +271,8 @@ class DistinctOperationSpecification extends OperationFunctionalSpecification {
         def source = Stub(AsyncConnectionSource)
         def connection = Mock(AsyncConnection)
         binding.readPreference >> ReadPreference.primary()
-        binding.getReadConnectionSource(_) >> { it[0].onResult(source, null) }
-        binding.operationContext >> operationContext
-        source.operationContext >> operationContext
-        source.getConnection(_) >> { it[0].onResult(connection, null) }
+        binding.getReadConnectionSource(_, _) >> { it[1].onResult(source, null) }
+        source.getConnection(_, _) >> { it[1].onResult(connection, null) }
         source.retain() >> source
         def commandDocument = new BsonDocument('distinct', new BsonString(getCollectionName()))
                 .append('key', new BsonString('str'))
@@ -281,12 +281,13 @@ class DistinctOperationSpecification extends OperationFunctionalSpecification {
         def operation = new DistinctOperation(getNamespace(), 'str', new StringCodec())
 
         when:
-        executeAsync(operation, binding)
+        executeAsync(operation, binding, operationContext)
 
         then:
         _ * connection.description >> new ConnectionDescription(new ConnectionId(new ServerId(new ClusterId(), new ServerAddress())),
                  6, STANDALONE, 1000, 100000, 100000, [])
-        1 * connection.commandAsync(_, commandDocument, _, _, _, operationContext, *_) >> {
+        1 * connection.commandAsync(_, commandDocument, _, _, _, _, *_) >> {
+            assertEquals(((OperationContext) it[5]).getId(), operationContext.getId())
             it.last().onResult(new BsonDocument('values', new BsonArrayWrapper([])), null)
         }
         1 * connection.release()
diff --git a/driver-core/src/test/functional/com/mongodb/internal/operation/DropCollectionOperationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/internal/operation/DropCollectionOperationSpecification.groovy
index 164dc66d654..eb8f3efa573 100644
--- a/driver-core/src/test/functional/com/mongodb/internal/operation/DropCollectionOperationSpecification.groovy
+++ b/driver-core/src/test/functional/com/mongodb/internal/operation/DropCollectionOperationSpecification.groovy
@@ -16,6 +16,7 @@
 
 package com.mongodb.internal.operation
 
+import com.mongodb.ClusterFixture
 import com.mongodb.MongoNamespace
 import com.mongodb.MongoWriteConcernException
 import com.mongodb.OperationFunctionalSpecification
@@ -36,7 +37,9 @@ class DropCollectionOperationSpecification extends OperationFunctionalSpecificat
         assert collectionNameExists(getCollectionName())
 
         when:
-        new DropCollectionOperation(getNamespace(), WriteConcern.ACKNOWLEDGED).execute(getBinding())
+        def binding = getBinding()
+        new DropCollectionOperation(getNamespace(), WriteConcern.ACKNOWLEDGED)
+                .execute(binding, ClusterFixture.getOperationContext(binding.getReadPreference()))
 
         then:
         !collectionNameExists(getCollectionName())
@@ -60,7 +63,8 @@ class DropCollectionOperationSpecification extends OperationFunctionalSpecificat
         def namespace = new MongoNamespace(getDatabaseName(), 'nonExistingCollection')
 
         when:
-        new DropCollectionOperation(namespace, WriteConcern.ACKNOWLEDGED).execute(getBinding())
+        new DropCollectionOperation(namespace, WriteConcern.ACKNOWLEDGED)
+                .execute(binding, ClusterFixture.getOperationContext(binding.getReadPreference()))
 
         then:
         !collectionNameExists('nonExistingCollection')
@@ -86,7 +90,8 @@ class DropCollectionOperationSpecification extends OperationFunctionalSpecificat
         def operation = new DropCollectionOperation(getNamespace(), new WriteConcern(5))
 
         when:
-        async ? executeAsync(operation) : operation.execute(getBinding())
+        def binding = getBinding()
+        async ? executeAsync(operation) : operation.execute(binding, ClusterFixture.getOperationContext(binding.getReadPreference()))
 
         then:
         def ex = thrown(MongoWriteConcernException)
@@ -98,7 +103,8 @@ class DropCollectionOperationSpecification extends OperationFunctionalSpecificat
     }
 
     def collectionNameExists(String collectionName) {
-        def cursor = new ListCollectionsOperation(databaseName, new DocumentCodec()).execute(getBinding())
+        def cursor = new ListCollectionsOperation(databaseName, new DocumentCodec())
+                .execute(binding, ClusterFixture.getOperationContext(binding.getReadPreference()))
         if (!cursor.hasNext()) {
             return false
         }
diff --git a/driver-core/src/test/functional/com/mongodb/internal/operation/DropDatabaseOperationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/internal/operation/DropDatabaseOperationSpecification.groovy
index d91ac02e8cc..b56e2c1fe50 100644
--- a/driver-core/src/test/functional/com/mongodb/internal/operation/DropDatabaseOperationSpecification.groovy
+++ b/driver-core/src/test/functional/com/mongodb/internal/operation/DropDatabaseOperationSpecification.groovy
@@ -16,6 +16,7 @@
 
 package com.mongodb.internal.operation
 
+
 import com.mongodb.MongoWriteConcernException
 import com.mongodb.OperationFunctionalSpecification
 import com.mongodb.WriteConcern
@@ -27,6 +28,7 @@ import spock.lang.IgnoreIf
 import static com.mongodb.ClusterFixture.configureFailPoint
 import static com.mongodb.ClusterFixture.executeAsync
 import static com.mongodb.ClusterFixture.getBinding
+import static com.mongodb.ClusterFixture.getOperationContext
 import static com.mongodb.ClusterFixture.isDiscoverableReplicaSet
 import static com.mongodb.ClusterFixture.isSharded
 
@@ -75,8 +77,10 @@ class DropDatabaseOperationSpecification extends OperationFunctionalSpecificatio
                 'data : {failCommands : ["dropDatabase"], ' +
                 'writeConcernError : {code : 100, errmsg : "failed"}}}'))
 
+
+        def binding = getBinding()
         when:
-        async ? executeAsync(operation) : operation.execute(getBinding())
+        async ? executeAsync(operation) : operation.execute(binding, getOperationContext(binding.getReadPreference()))
 
         then:
         def ex = thrown(MongoWriteConcernException)
@@ -88,7 +92,8 @@ class DropDatabaseOperationSpecification extends OperationFunctionalSpecificatio
     }
 
     def databaseNameExists(String databaseName) {
-        new ListDatabasesOperation(new DocumentCodec()).execute(getBinding()).next()*.name.contains(databaseName)
+        new ListDatabasesOperation(new DocumentCodec()).execute(binding,
+                getOperationContext(binding.getReadPreference())).next()*.name.contains(databaseName)
     }
 
 }
diff --git a/driver-core/src/test/functional/com/mongodb/internal/operation/DropIndexOperationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/internal/operation/DropIndexOperationSpecification.groovy
index 611c0197faf..4f128addff3 100644
--- a/driver-core/src/test/functional/com/mongodb/internal/operation/DropIndexOperationSpecification.groovy
+++ b/driver-core/src/test/functional/com/mongodb/internal/operation/DropIndexOperationSpecification.groovy
@@ -16,6 +16,7 @@
 
 package com.mongodb.internal.operation
 
+import com.mongodb.ClusterFixture
 import com.mongodb.MongoException
 import com.mongodb.MongoWriteConcernException
 import com.mongodb.OperationFunctionalSpecification
@@ -154,7 +155,9 @@ class DropIndexOperationSpecification extends OperationFunctionalSpecification {
 
     def getIndexes() {
         def indexes = []
-        def cursor = new ListIndexesOperation(getNamespace(), new DocumentCodec()).execute(getBinding())
+        def binding = getBinding()
+        def cursor = new ListIndexesOperation(getNamespace(), new DocumentCodec())
+                .execute(binding, ClusterFixture.getOperationContext(binding.getReadPreference()))
         while (cursor.hasNext()) {
             indexes.addAll(cursor.next())
         }
diff --git a/driver-core/src/test/functional/com/mongodb/internal/operation/FindOperationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/internal/operation/FindOperationSpecification.groovy
index f61ab70f2ae..5eb707201d5 100644
--- a/driver-core/src/test/functional/com/mongodb/internal/operation/FindOperationSpecification.groovy
+++ b/driver-core/src/test/functional/com/mongodb/internal/operation/FindOperationSpecification.groovy
@@ -31,6 +31,7 @@ import com.mongodb.connection.ConnectionDescription
 import com.mongodb.connection.ConnectionId
 import com.mongodb.connection.ServerId
 import com.mongodb.internal.TimeoutContext
+import com.mongodb.internal.async.SingleResultCallback
 import com.mongodb.internal.binding.AsyncClusterBinding
 import com.mongodb.internal.binding.AsyncConnectionSource
 import com.mongodb.internal.binding.AsyncReadBinding
@@ -39,6 +40,7 @@ import com.mongodb.internal.binding.ConnectionSource
 import com.mongodb.internal.binding.ReadBinding
 import com.mongodb.internal.connection.AsyncConnection
 import com.mongodb.internal.connection.Connection
+import com.mongodb.internal.connection.OperationContext
 import com.mongodb.internal.session.SessionContext
 import org.bson.BsonBoolean
 import org.bson.BsonDocument
@@ -55,10 +57,10 @@ import spock.lang.IgnoreIf
 import static com.mongodb.ClusterFixture.OPERATION_CONTEXT
 import static com.mongodb.ClusterFixture.executeAsync
 import static com.mongodb.ClusterFixture.executeSync
-import static com.mongodb.ClusterFixture.getAsyncBinding
 import static com.mongodb.ClusterFixture.getAsyncCluster
 import static com.mongodb.ClusterFixture.getBinding
 import static com.mongodb.ClusterFixture.getCluster
+import static com.mongodb.ClusterFixture.getOperationContext
 import static com.mongodb.ClusterFixture.isSharded
 import static com.mongodb.ClusterFixture.serverVersionLessThan
 import static com.mongodb.CursorType.NonTailable
@@ -385,8 +387,10 @@ class FindOperationSpecification extends OperationFunctionalSpecification {
     def 'should apply comment'() {
         given:
         def profileCollectionHelper = getCollectionHelper(new MongoNamespace(getDatabaseName(), 'system.profile'))
+
+        def binding = getBinding()
         new CommandReadOperation<>(getDatabaseName(), new BsonDocument('profile', new BsonInt32(2)),
-                new BsonDocumentCodec()).execute(getBinding())
+                new BsonDocumentCodec()).execute(binding, getOperationContext(binding.getReadPreference()))
         def expectedComment = 'this is a comment'
         def operation = new FindOperation(getNamespace(), new DocumentCodec())
                 .comment(new BsonString(expectedComment))
@@ -401,7 +405,7 @@ class FindOperationSpecification extends OperationFunctionalSpecification {
         cleanup:
         new CommandReadOperation<>(getDatabaseName(), new BsonDocument('profile', new BsonInt32(0)),
                 new BsonDocumentCodec())
-                .execute(getBinding())
+                .execute(binding, getOperationContext(binding.getReadPreference()))
         profileCollectionHelper.drop()
 
         where:
@@ -431,9 +435,8 @@ class FindOperationSpecification extends OperationFunctionalSpecification {
         given:
         collectionHelper.insertDocuments(new DocumentCodec(), new Document())
         def operation = new FindOperation(getNamespace(), new DocumentCodec())
-        def syncBinding = new ClusterBinding(getCluster(), ReadPreference.secondary(), ReadConcern.DEFAULT, OPERATION_CONTEXT)
-        def asyncBinding = new AsyncClusterBinding(getAsyncCluster(), ReadPreference.secondary(), ReadConcern.DEFAULT,
-                OPERATION_CONTEXT)
+        def syncBinding = new ClusterBinding(getCluster(), ReadPreference.secondary())
+        def asyncBinding = new AsyncClusterBinding(getAsyncCluster(), ReadPreference.secondary())
 
         when:
         def result = async ? executeAsync(operation, asyncBinding) : executeSync(operation, syncBinding)
@@ -457,8 +460,8 @@ class FindOperationSpecification extends OperationFunctionalSpecification {
         def hedgeOptions = isHedgeEnabled != null ?
                 ReadPreferenceHedgeOptions.builder().enabled(isHedgeEnabled as boolean).build() : null
         def readPreference = ReadPreference.primaryPreferred().withHedgeOptions(hedgeOptions)
-        def syncBinding = new ClusterBinding(getCluster(), readPreference, ReadConcern.DEFAULT, OPERATION_CONTEXT)
-        def asyncBinding = new AsyncClusterBinding(getAsyncCluster(), readPreference, ReadConcern.DEFAULT, OPERATION_CONTEXT)
+        def syncBinding = new ClusterBinding(getCluster(), readPreference)
+        def asyncBinding = new AsyncClusterBinding(getAsyncCluster(), readPreference)
         def cursor = async ? executeAsync(operation, asyncBinding) : executeSync(operation, syncBinding)
         def firstBatch = {
             if (async) {
@@ -484,26 +487,26 @@ class FindOperationSpecification extends OperationFunctionalSpecification {
         def source = Stub(ConnectionSource)
         def connection = Mock(Connection)
         binding.readPreference >> ReadPreference.primary()
-        binding.operationContext >> operationContext
-        binding.readConnectionSource >> source
-        source.connection >> connection
+        binding.getReadConnectionSource(_) >> source
+        source.getConnection(_) >> connection
         source.retain() >> source
-        source.operationContext >> operationContext
         def commandDocument = new BsonDocument('find', new BsonString(getCollectionName()))
         appendReadConcernToCommand(sessionContext, UNKNOWN_WIRE_VERSION, commandDocument)
 
         def operation = new FindOperation(getNamespace(), new DocumentCodec())
 
         when:
-        operation.execute(binding)
+        operation.execute(binding, operationContext)
 
         then:
         _ * connection.description >> new ConnectionDescription(new ConnectionId(new ServerId(new ClusterId(), new ServerAddress())),
                  6, STANDALONE, 1000, 100000, 100000, [])
-        1 * connection.command(_, commandDocument, _, _, _, operationContext) >>
-                new BsonDocument('cursor', new BsonDocument('id', new BsonInt64(1))
-                        .append('ns', new BsonString(getNamespace().getFullName()))
-                        .append('firstBatch', new BsonArrayWrapper([])))
+        1 * connection.command(_, commandDocument, _, _, _, _) >> {
+            assertEquals(((OperationContext) it[5]).getId(), operationContext.getId())
+            new BsonDocument('cursor', new BsonDocument('id', new BsonInt64(1))
+                    .append('ns', new BsonString(getNamespace().getFullName()))
+                    .append('firstBatch', new BsonArrayWrapper([])))
+        }
         1 * connection.release()
 
         where:
@@ -524,10 +527,8 @@ class FindOperationSpecification extends OperationFunctionalSpecification {
         def source = Stub(AsyncConnectionSource)
         def connection = Mock(AsyncConnection)
         binding.readPreference >> ReadPreference.primary()
-        binding.operationContext >> operationContext
-        binding.getReadConnectionSource(_) >> { it[0].onResult(source, null) }
-        source.operationContext >> operationContext
-        source.getConnection(_) >> { it[0].onResult(connection, null) }
+        binding.getReadConnectionSource(_ as OperationContext, _ as SingleResultCallback) >> { it[1].onResult(source, null) }
+        source.getConnection(_ as OperationContext, _ as SingleResultCallback) >> { it[1].onResult(connection, null) }
         source.retain() >> source
         def commandDocument = new BsonDocument('find', new BsonString(getCollectionName()))
         appendReadConcernToCommand(sessionContext, UNKNOWN_WIRE_VERSION, commandDocument)
@@ -535,12 +536,13 @@ class FindOperationSpecification extends OperationFunctionalSpecification {
         def operation = new FindOperation(getNamespace(), new DocumentCodec())
 
         when:
-        executeAsync(operation, binding)
+        executeAsync(operation, binding, operationContext)
 
         then:
         _ * connection.description >> new ConnectionDescription(new ConnectionId(new ServerId(new ClusterId(), new ServerAddress())),
                  6, STANDALONE, 1000, 100000, 100000, [])
-        1 * connection.commandAsync(_, commandDocument, _, _, _, operationContext, _) >> {
+        1 * connection.commandAsync(_, commandDocument, _, _, _, _, _) >> {
+            assertEquals(((OperationContext) it[5]).getId(), operationContext.getId())
             it.last().onResult(new BsonDocument('cursor', new BsonDocument('id', new BsonInt64(1))
                     .append('ns', new BsonString(getNamespace().getFullName()))
                     .append('firstBatch', new BsonArrayWrapper([]))), null)
@@ -565,26 +567,26 @@ class FindOperationSpecification extends OperationFunctionalSpecification {
         def source = Stub(ConnectionSource)
         def connection = Mock(Connection)
         binding.readPreference >> ReadPreference.primary()
-        binding.readConnectionSource >> source
-        binding.operationContext >> operationContext
-        source.connection >> connection
+        binding.getReadConnectionSource(_) >> source
+        source.getConnection(_) >> connection
         source.retain() >> source
-        source.operationContext >> operationContext
         def commandDocument = new BsonDocument('find', new BsonString(getCollectionName())).append('allowDiskUse', BsonBoolean.TRUE)
         appendReadConcernToCommand(sessionContext, UNKNOWN_WIRE_VERSION, commandDocument)
 
         def operation = new FindOperation(getNamespace(), new DocumentCodec()).allowDiskUse(true)
 
         when:
-        operation.execute(binding)
+        operation.execute(binding, operationContext)
 
         then:
         _ * connection.description >> new ConnectionDescription(new ConnectionId(new ServerId(new ClusterId(), new ServerAddress())),
                 6, STANDALONE, 1000, 100000, 100000, [])
-        1 * connection.command(_, commandDocument, _, _, _, operationContext) >>
-                new BsonDocument('cursor', new BsonDocument('id', new BsonInt64(1))
-                        .append('ns', new BsonString(getNamespace().getFullName()))
-                        .append('firstBatch', new BsonArrayWrapper([])))
+        1 * connection.command(_, commandDocument, _, _, _, _) >> {
+            assertEquals(((OperationContext) it[5]).getId(), operationContext.getId())
+            new BsonDocument('cursor', new BsonDocument('id', new BsonInt64(1))
+                    .append('ns', new BsonString(getNamespace().getFullName()))
+                    .append('firstBatch', new BsonArrayWrapper([])))
+        }
         1 * connection.release()
 
         where:
@@ -604,11 +606,9 @@ class FindOperationSpecification extends OperationFunctionalSpecification {
         def binding = Stub(AsyncReadBinding)
         def source = Stub(AsyncConnectionSource)
         def connection = Mock(AsyncConnection)
-        binding.operationContext >> operationContext
         binding.readPreference >> ReadPreference.primary()
-        binding.getReadConnectionSource(_) >> { it[0].onResult(source, null) }
-        source.operationContext >> operationContext
-        source.getConnection(_) >> { it[0].onResult(connection, null) }
+        binding.getReadConnectionSource(_, _) >> { it[1].onResult(source, null) }
+        source.getConnection(_, _) >> { it[1].onResult(connection, null) }
         source.retain() >> source
         def commandDocument = new BsonDocument('find', new BsonString(getCollectionName())).append('allowDiskUse', BsonBoolean.TRUE)
         appendReadConcernToCommand(sessionContext, UNKNOWN_WIRE_VERSION, commandDocument)
@@ -616,12 +616,13 @@ class FindOperationSpecification extends OperationFunctionalSpecification {
         def operation = new FindOperation(getNamespace(), new DocumentCodec()).allowDiskUse(true)
 
         when:
-        executeAsync(operation, binding)
+        executeAsync(operation, binding, operationContext)
 
         then:
         _ * connection.description >> new ConnectionDescription(new ConnectionId(new ServerId(new ClusterId(), new ServerAddress())),
                 6, STANDALONE, 1000, 100000, 100000, [])
-        1 * connection.commandAsync(_, commandDocument, _, _, _, operationContext, _) >> {
+        1 * connection.commandAsync(_, commandDocument, _, _, _, _, _) >> {
+            assertEquals(((OperationContext) it[5]).getId(), operationContext.getId())
             it.last().onResult(new BsonDocument('cursor', new BsonDocument('id', new BsonInt64(1))
                     .append('ns', new BsonString(getNamespace().getFullName()))
                     .append('firstBatch', new BsonArrayWrapper([]))), null)
@@ -644,7 +645,7 @@ class FindOperationSpecification extends OperationFunctionalSpecification {
         given:
         def (cursorType, long maxAwaitTimeMS, long maxTimeMSForCursor) = cursorDetails
         def timeoutSettings = ClusterFixture.TIMEOUT_SETTINGS_WITH_INFINITE_TIMEOUT.withMaxAwaitTimeMS(maxAwaitTimeMS)
-        def timeoutContext = Spy(TimeoutContext, constructorArgs: [timeoutSettings])
+        def timeoutContext = new TimeoutContext(timeoutSettings)
         def operationContext = OPERATION_CONTEXT.withTimeoutContext(timeoutContext)
 
         collectionHelper.create(getCollectionName(), new CreateCollectionOptions().capped(true).sizeInBytes(1000))
@@ -652,14 +653,19 @@ class FindOperationSpecification extends OperationFunctionalSpecification {
                 .cursorType(cursorType)
 
         when:
+        def cursor;
         if (async) {
-            execute(operation, getBinding(operationContext))
+             cursor = execute(operation, ClusterFixture.getAsyncBinding(operationContext), operationContext)
         } else {
-            execute(operation, getAsyncBinding(operationContext))
+             cursor = execute(operation, ClusterFixture.getBinding(operationContext), operationContext)
         }
 
         then:
-        timeoutContext.setMaxTimeOverride(maxTimeMSForCursor)
+        cursor.operationContext.getTimeoutContext().getMaxAwaitTimeMS() == maxAwaitTimeMS
+        // should have maxTimeMS override
+        cursor.operationContext.getTimeoutContext().runMaxTimeMS { long actualMaxTimeMs ->
+            assertEquals(maxTimeMSForCursor, actualMaxTimeMs)
+        }
 
         where:
         [async, cursorDetails] << [
diff --git a/driver-core/src/test/functional/com/mongodb/internal/operation/ListCollectionsOperationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/internal/operation/ListCollectionsOperationSpecification.groovy
index 0d2688e0da6..ad55b706ba2 100644
--- a/driver-core/src/test/functional/com/mongodb/internal/operation/ListCollectionsOperationSpecification.groovy
+++ b/driver-core/src/test/functional/com/mongodb/internal/operation/ListCollectionsOperationSpecification.groovy
@@ -33,6 +33,7 @@ import com.mongodb.internal.binding.ConnectionSource
 import com.mongodb.internal.binding.ReadBinding
 import com.mongodb.internal.connection.AsyncConnection
 import com.mongodb.internal.connection.Connection
+import com.mongodb.internal.connection.OperationContext
 import org.bson.BsonBoolean
 import org.bson.BsonDocument
 import org.bson.BsonDouble
@@ -45,6 +46,8 @@ import org.bson.codecs.DocumentCodec
 import static com.mongodb.ClusterFixture.OPERATION_CONTEXT
 import static com.mongodb.ClusterFixture.executeAsync
 import static com.mongodb.ClusterFixture.getBinding
+import static com.mongodb.ClusterFixture.getOperationContext
+import static org.junit.jupiter.api.Assertions.assertEquals
 
 class ListCollectionsOperationSpecification extends OperationFunctionalSpecification {
 
@@ -54,8 +57,10 @@ class ListCollectionsOperationSpecification extends OperationFunctionalSpecifica
         given:
         def operation = new ListCollectionsOperation(madeUpDatabase, new DocumentCodec())
 
+
+        def binding = getBinding()
         when:
-        def cursor = operation.execute(getBinding())
+        def cursor = operation.execute(binding, getOperationContext(binding.getReadPreference()))
 
         then:
         !cursor.hasNext()
@@ -90,8 +95,10 @@ class ListCollectionsOperationSpecification extends OperationFunctionalSpecifica
         helper.insertDocuments(codec, ['a': 1] as Document)
         helper2.insertDocuments(codec, ['a': 1] as Document)
 
+
+        def binding = getBinding()
         when:
-        def cursor = operation.execute(getBinding())
+        def cursor = operation.execute(binding, getOperationContext(binding.getReadPreference()))
         def collections = cursor.next()
         def names = collections*.get('name')
 
@@ -111,8 +118,11 @@ class ListCollectionsOperationSpecification extends OperationFunctionalSpecifica
         helper.insertDocuments(codec, ['a': 1] as Document)
         helper2.insertDocuments(codec, ['a': 1] as Document)
 
+
+        def binding = getBinding()
         when:
-        def cursor = operation.execute(getBinding())
+        def cursor = operation.execute(binding, getOperationContext(binding.getReadPreference())
+        )
         def collections = cursor.next()
         def names = collections*.get('name')
 
@@ -130,8 +140,10 @@ class ListCollectionsOperationSpecification extends OperationFunctionalSpecifica
         def codec = new DocumentCodec()
         helper.insertDocuments(codec, ['a': 1] as Document)
 
+
+        def binding = getBinding()
         when:
-        def cursor = operation.execute(getBinding())
+        def cursor = operation.execute(binding, getOperationContext(binding.getReadPreference()))
         def collections = cursor.next()
         def names = collections*.get('name')
 
@@ -146,8 +158,10 @@ class ListCollectionsOperationSpecification extends OperationFunctionalSpecifica
                 .nameOnly(true)
         getCollectionHelper().create('collection5', new CreateCollectionOptions())
 
+
+        def binding = getBinding()
         when:
-        def cursor = operation.execute(getBinding())
+        def cursor = operation.execute(binding, getOperationContext(binding.getReadPreference()))
         def collection = cursor.next()[0]
 
         then:
@@ -161,8 +175,10 @@ class ListCollectionsOperationSpecification extends OperationFunctionalSpecifica
                 .authorizedCollections(true)
         getCollectionHelper().create('collection6', new CreateCollectionOptions())
 
+
+        def binding = getBinding()
         when:
-        def cursor = operation.execute(getBinding())
+        def cursor = operation.execute(binding, getOperationContext(binding.getReadPreference()))
         def collection = cursor.next()[0]
 
         then:
@@ -176,8 +192,10 @@ class ListCollectionsOperationSpecification extends OperationFunctionalSpecifica
                 .authorizedCollections(true)
         getCollectionHelper().create('collection8', new CreateCollectionOptions())
 
+
+        def binding = getBinding()
         when:
-        def cursor = operation.execute(getBinding())
+        def cursor = operation.execute(binding, getOperationContext(binding.getReadPreference()))
         def collection = cursor.next()[0]
 
         then:
@@ -206,13 +224,17 @@ class ListCollectionsOperationSpecification extends OperationFunctionalSpecifica
     }
 
     def 'should filter indexes when calling hasNext before next'() {
+        def binding = getBinding()
         given:
-        new DropDatabaseOperation(databaseName, WriteConcern.ACKNOWLEDGED).execute(getBinding())
+        new DropDatabaseOperation(databaseName, WriteConcern.ACKNOWLEDGED)
+                .execute(binding, getOperationContext(binding.getReadPreference()))
         addSeveralIndexes()
         def operation = new ListCollectionsOperation(databaseName, new DocumentCodec()).batchSize(2)
 
+
         when:
-        def cursor = operation.execute(getBinding())
+        binding = getBinding()
+        def cursor = operation.execute(binding, getOperationContext(binding.getReadPreference()))
 
         then:
         cursor.hasNext()
@@ -222,13 +244,16 @@ class ListCollectionsOperationSpecification extends OperationFunctionalSpecifica
     }
 
     def 'should filter indexes without calling hasNext before next'() {
+        def binding = getBinding()
         given:
-        new DropDatabaseOperation(databaseName, WriteConcern.ACKNOWLEDGED).execute(getBinding())
+        new DropDatabaseOperation(databaseName, WriteConcern.ACKNOWLEDGED)
+                .execute(binding, getOperationContext(binding.getReadPreference()))
         addSeveralIndexes()
         def operation = new ListCollectionsOperation(databaseName, new DocumentCodec()).batchSize(2)
 
         when:
-        def cursor = operation.execute(getBinding())
+        binding = getBinding()
+        def cursor = operation.execute(binding, getOperationContext(binding.getReadPreference()))
         def list = cursorToListWithNext(cursor)
 
         then:
@@ -244,13 +269,17 @@ class ListCollectionsOperationSpecification extends OperationFunctionalSpecifica
     }
 
     def 'should filter indexes when calling hasNext before tryNext'() {
+        def binding = getBinding()
         given:
-        new DropDatabaseOperation(databaseName, WriteConcern.ACKNOWLEDGED).execute(getBinding())
+        new DropDatabaseOperation(databaseName, WriteConcern.ACKNOWLEDGED)
+                .execute(binding, getOperationContext(binding.getReadPreference()))
         addSeveralIndexes()
         def operation = new ListCollectionsOperation(databaseName, new DocumentCodec()).batchSize(2)
 
+
         when:
-        def cursor = operation.execute(getBinding())
+        binding = getBinding()
+        def cursor = operation.execute(binding, getOperationContext(binding.getReadPreference()))
 
         then:
         cursor.hasNext()
@@ -267,12 +296,15 @@ class ListCollectionsOperationSpecification extends OperationFunctionalSpecifica
 
     def 'should filter indexes without calling hasNext before tryNext'() {
         given:
-        new DropDatabaseOperation(databaseName, WriteConcern.ACKNOWLEDGED).execute(getBinding())
+        def binding = getBinding()
+        new DropDatabaseOperation(databaseName, WriteConcern.ACKNOWLEDGED)
+                .execute(binding, getOperationContext(binding.getReadPreference()))
         addSeveralIndexes()
         def operation = new ListCollectionsOperation(databaseName, new DocumentCodec()).batchSize(2)
 
         when:
-        def cursor = operation.execute(getBinding())
+        binding = getBinding()
+        def cursor = operation.execute(binding, getOperationContext(binding.getReadPreference()))
         def list = cursorToListWithTryNext(cursor)
 
         then:
@@ -284,7 +316,9 @@ class ListCollectionsOperationSpecification extends OperationFunctionalSpecifica
 
     def 'should filter indexes asynchronously'() {
         given:
-        new DropDatabaseOperation(databaseName, WriteConcern.ACKNOWLEDGED).execute(getBinding())
+        def binding = getBinding()
+        new DropDatabaseOperation(databaseName, WriteConcern.ACKNOWLEDGED)
+                .execute(binding, getOperationContext(binding.getReadPreference()))
         addSeveralIndexes()
         def operation = new ListCollectionsOperation(databaseName, new DocumentCodec()).batchSize(2)
 
@@ -307,8 +341,10 @@ class ListCollectionsOperationSpecification extends OperationFunctionalSpecifica
         getCollectionHelper(new MongoNamespace(databaseName, 'collection4')).insertDocuments(codec, ['a': 1] as Document)
         getCollectionHelper(new MongoNamespace(databaseName, 'collection5')).insertDocuments(codec, ['a': 1] as Document)
 
+
         when:
-        def cursor = operation.execute(getBinding())
+        def binding = getBinding()
+        def cursor = operation.execute(binding, getOperationContext(binding.getReadPreference()))
         def collections = cursor.next()
 
         then:
@@ -364,23 +400,24 @@ class ListCollectionsOperationSpecification extends OperationFunctionalSpecifica
         given:
         def connection = Mock(Connection)
         def connectionSource = Stub(ConnectionSource) {
-            getConnection() >> connection
+            getConnection(_) >> connection
             getReadPreference() >> readPreference
-            getOperationContext() >> OPERATION_CONTEXT
         }
         def readBinding = Stub(ReadBinding) {
-            getReadConnectionSource() >> connectionSource
+            getReadConnectionSource(_) >> connectionSource
             getReadPreference() >> readPreference
-            getOperationContext() >> OPERATION_CONTEXT
         }
         def operation = new ListCollectionsOperation(helper.dbName, helper.decoder)
 
         when: '3.6.0'
-        operation.execute(readBinding)
+        operation.execute(readBinding, OPERATION_CONTEXT)
 
         then:
         _ * connection.getDescription() >> helper.threeSixConnectionDescription
-        1 * connection.command(_, _, _, readPreference, _, OPERATION_CONTEXT) >> helper.commandResult
+        1 * connection.command(_, _, _, readPreference, _, _) >> {
+            assertEquals(((OperationContext) it[5]).getId(), OPERATION_CONTEXT.getId())
+            helper.commandResult
+        }
         1 * connection.release()
 
         where:
@@ -391,23 +428,22 @@ class ListCollectionsOperationSpecification extends OperationFunctionalSpecifica
         given:
         def connection = Mock(AsyncConnection)
         def connectionSource = Stub(AsyncConnectionSource) {
-            getConnection(_) >> { it[0].onResult(connection, null) }
+            getConnection(_, _) >> { it[1].onResult(connection, null) }
             getReadPreference() >> readPreference
-            getOperationContext() >> OPERATION_CONTEXT
         }
         def readBinding = Stub(AsyncReadBinding) {
-            getReadConnectionSource(_) >> { it[0].onResult(connectionSource, null) }
+            getReadConnectionSource(_, _) >> { it[1].onResult(connectionSource, null) }
             getReadPreference() >> readPreference
-            getOperationContext() >> OPERATION_CONTEXT
         }
         def operation = new ListCollectionsOperation(helper.dbName, helper.decoder)
 
         when: '3.6.0'
-        operation.executeAsync(readBinding, Stub(SingleResultCallback))
+        operation.executeAsync(readBinding, OPERATION_CONTEXT, Stub(SingleResultCallback))
 
         then:
         _ * connection.getDescription() >> helper.threeSixConnectionDescription
-        1 * connection.commandAsync(helper.dbName, _, _, readPreference, _, OPERATION_CONTEXT, *_) >> {
+        1 * connection.commandAsync(helper.dbName, _, _, readPreference, _, _, *_) >> {
+            assertEquals(((OperationContext) it[5]).getId(), OPERATION_CONTEXT.getId())
             it.last().onResult(helper.commandResult, null) }
 
         where:
diff --git a/driver-core/src/test/functional/com/mongodb/internal/operation/ListDatabasesOperationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/internal/operation/ListDatabasesOperationSpecification.groovy
index 740f9073dcd..55504d0babc 100644
--- a/driver-core/src/test/functional/com/mongodb/internal/operation/ListDatabasesOperationSpecification.groovy
+++ b/driver-core/src/test/functional/com/mongodb/internal/operation/ListDatabasesOperationSpecification.groovy
@@ -72,23 +72,21 @@ class ListDatabasesOperationSpecification extends OperationFunctionalSpecificati
         given:
         def connection = Mock(Connection)
         def connectionSource = Stub(ConnectionSource) {
-            getConnection() >> connection
+            getConnection(_) >> connection
             getReadPreference() >> readPreference
-            getOperationContext() >> OPERATION_CONTEXT
         }
         def readBinding = Stub(ReadBinding) {
-            getReadConnectionSource() >> connectionSource
+            getReadConnectionSource(_) >> connectionSource
             getReadPreference() >> readPreference
-            getOperationContext() >> OPERATION_CONTEXT
         }
         def operation = new ListDatabasesOperation(helper.decoder)
 
         when:
-        operation.execute(readBinding)
+        operation.execute(readBinding, OPERATION_CONTEXT)
 
         then:
         _ * connection.getDescription() >> helper.connectionDescription
-        1 * connection.command(_, _, _, readPreference, _, OPERATION_CONTEXT) >> helper.commandResult
+        1 * connection.command(_, _, _, readPreference, _, _) >> helper.commandResult
         1 * connection.release()
 
         where:
@@ -100,16 +98,16 @@ class ListDatabasesOperationSpecification extends OperationFunctionalSpecificati
         def connection = Mock(AsyncConnection)
         def connectionSource = Stub(AsyncConnectionSource) {
             getReadPreference() >> readPreference
-            getConnection(_) >> { it[0].onResult(connection, null) }
+            getConnection(_, _) >> { it[1].onResult(connection, null) }
         }
         def readBinding = Stub(AsyncReadBinding) {
             getReadPreference() >> readPreference
-            getReadConnectionSource(_) >> { it[0].onResult(connectionSource, null) }
+            getReadConnectionSource(_, _) >> { it[1].onResult(connectionSource, null) }
         }
         def operation = new ListDatabasesOperation(helper.decoder)
 
         when:
-        operation.executeAsync(readBinding, Stub(SingleResultCallback))
+        operation.executeAsync(readBinding, OPERATION_CONTEXT, Stub(SingleResultCallback))
 
         then:
         _ * connection.getDescription() >> helper.connectionDescription
diff --git a/driver-core/src/test/functional/com/mongodb/internal/operation/ListIndexesOperationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/internal/operation/ListIndexesOperationSpecification.groovy
index 462bf367e50..c11d67bcf22 100644
--- a/driver-core/src/test/functional/com/mongodb/internal/operation/ListIndexesOperationSpecification.groovy
+++ b/driver-core/src/test/functional/com/mongodb/internal/operation/ListIndexesOperationSpecification.groovy
@@ -33,6 +33,7 @@ import com.mongodb.internal.binding.ReadBinding
 import com.mongodb.internal.bulk.IndexRequest
 import com.mongodb.internal.connection.AsyncConnection
 import com.mongodb.internal.connection.Connection
+import com.mongodb.internal.connection.OperationContext
 import org.bson.BsonDocument
 import org.bson.BsonDouble
 import org.bson.BsonInt32
@@ -41,10 +42,12 @@ import org.bson.BsonString
 import org.bson.Document
 import org.bson.codecs.Decoder
 import org.bson.codecs.DocumentCodec
+import org.junit.jupiter.api.Assertions
 
 import static com.mongodb.ClusterFixture.OPERATION_CONTEXT
 import static com.mongodb.ClusterFixture.executeAsync
 import static com.mongodb.ClusterFixture.getBinding
+import static com.mongodb.ClusterFixture.getOperationContext
 
 class ListIndexesOperationSpecification extends OperationFunctionalSpecification {
 
@@ -52,8 +55,10 @@ class ListIndexesOperationSpecification extends OperationFunctionalSpecification
         given:
         def operation = new ListIndexesOperation(getNamespace(), new DocumentCodec())
 
+
+        def binding = getBinding()
         when:
-        def cursor = operation.execute(getBinding())
+        def cursor = operation.execute(binding, getOperationContext(binding.getReadPreference()))
 
         then:
         !cursor.hasNext()
@@ -79,8 +84,10 @@ class ListIndexesOperationSpecification extends OperationFunctionalSpecification
         def operation = new ListIndexesOperation(getNamespace(), new DocumentCodec())
         getCollectionHelper().insertDocuments(new DocumentCodec(), new Document('documentThat', 'forces creation of the Collection'))
 
+
+        def binding = getBinding()
         when:
-        BatchCursor indexes = operation.execute(getBinding())
+        BatchCursor indexes = operation.execute(binding, getOperationContext(binding.getReadPreference()))
 
         then:
         def firstBatch = indexes.next()
@@ -111,11 +118,15 @@ class ListIndexesOperationSpecification extends OperationFunctionalSpecification
         def operation = new ListIndexesOperation(getNamespace(), new DocumentCodec())
         collectionHelper.createIndex(new BsonDocument('theField', new BsonInt32(1)))
         collectionHelper.createIndex(new BsonDocument('compound', new BsonInt32(1)).append('index', new BsonInt32(-1)))
+
+        def binding = getBinding()
         new CreateIndexesOperation(namespace,
-                [new IndexRequest(new BsonDocument('unique', new BsonInt32(1))).unique(true)], null).execute(getBinding())
+                [new IndexRequest(new BsonDocument('unique', new BsonInt32(1))).unique(true)], null).execute(binding,
+                getOperationContext(binding.getReadPreference()))
 
         when:
-        BatchCursor cursor = operation.execute(getBinding())
+        binding = getBinding()
+        BatchCursor cursor = operation.execute(binding, getOperationContext(binding.getReadPreference()))
 
         then:
         def indexes = cursor.next()
@@ -131,8 +142,11 @@ class ListIndexesOperationSpecification extends OperationFunctionalSpecification
         def operation = new ListIndexesOperation(getNamespace(), new DocumentCodec())
         collectionHelper.createIndex(new BsonDocument('theField', new BsonInt32(1)))
         collectionHelper.createIndex(new BsonDocument('compound', new BsonInt32(1)).append('index', new BsonInt32(-1)))
+
+        def binding = getBinding()
         new CreateIndexesOperation(namespace,
-                [new IndexRequest(new BsonDocument('unique', new BsonInt32(1))).unique(true)], null).execute(getBinding())
+                [new IndexRequest(new BsonDocument('unique', new BsonInt32(1))).unique(true)], null).execute(binding,
+                getOperationContext(binding.getReadPreference()))
 
         when:
         def cursor = executeAsync(operation)
@@ -155,8 +169,10 @@ class ListIndexesOperationSpecification extends OperationFunctionalSpecification
         collectionHelper.createIndex(new BsonDocument('collection4', new BsonInt32(1)))
         collectionHelper.createIndex(new BsonDocument('collection5', new BsonInt32(1)))
 
+
+        def binding = getBinding()
         when:
-        def cursor = operation.execute(getBinding())
+        def cursor = operation.execute(binding, getOperationContext(binding.getReadPreference()))
         def collections = cursor.next()
 
         then:
@@ -211,23 +227,24 @@ class ListIndexesOperationSpecification extends OperationFunctionalSpecification
         given:
         def connection = Mock(Connection)
         def connectionSource = Stub(ConnectionSource) {
-            getConnection() >> connection
+            getConnection(_) >> connection
             getReadPreference() >> readPreference
-            getOperationContext() >> OPERATION_CONTEXT
         }
         def readBinding = Stub(ReadBinding) {
-            getReadConnectionSource() >> connectionSource
+            getReadConnectionSource(_) >> connectionSource
             getReadPreference() >> readPreference
-            getOperationContext() >> OPERATION_CONTEXT
         }
         def operation = new ListIndexesOperation(helper.namespace, helper.decoder)
 
         when: '3.6.0'
-        operation.execute(readBinding)
+        operation.execute(readBinding, OPERATION_CONTEXT)
 
         then:
         _ * connection.getDescription() >> helper.threeSixConnectionDescription
-        1 * connection.command(_, _, _, readPreference, _, OPERATION_CONTEXT) >> helper.commandResult
+        1 * connection.command(_, _, _, readPreference, _, _) >> {
+            Assertions.assertEquals(((OperationContext) it[5]).getId(), OPERATION_CONTEXT.getId())
+            helper.commandResult
+        }
         1 * connection.release()
 
         where:
@@ -239,16 +256,16 @@ class ListIndexesOperationSpecification extends OperationFunctionalSpecification
         def connection = Mock(AsyncConnection)
         def connectionSource = Stub(AsyncConnectionSource) {
             getReadPreference() >> readPreference
-            getConnection(_) >> { it[0].onResult(connection, null) }
+            getConnection(_, _) >> { it[1].onResult(connection, null) }
         }
         def readBinding = Stub(AsyncReadBinding) {
             getReadPreference() >> readPreference
-            getReadConnectionSource(_) >> { it[0].onResult(connectionSource, null) }
+            getReadConnectionSource(_, _) >> { it[1].onResult(connectionSource, null) }
         }
         def operation = new ListIndexesOperation(helper.namespace, helper.decoder)
 
         when: '3.6.0'
-        operation.executeAsync(readBinding, Stub(SingleResultCallback))
+        operation.executeAsync(readBinding, OPERATION_CONTEXT, Stub(SingleResultCallback))
 
         then:
         _ * connection.getDescription() >> helper.threeSixConnectionDescription
diff --git a/driver-core/src/test/functional/com/mongodb/internal/operation/MapReduceToCollectionOperationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/internal/operation/MapReduceToCollectionOperationSpecification.groovy
index 0f48042da47..5d6be781d1f 100644
--- a/driver-core/src/test/functional/com/mongodb/internal/operation/MapReduceToCollectionOperationSpecification.groovy
+++ b/driver-core/src/test/functional/com/mongodb/internal/operation/MapReduceToCollectionOperationSpecification.groovy
@@ -16,6 +16,7 @@
 
 package com.mongodb.internal.operation
 
+import com.mongodb.ClusterFixture
 import com.mongodb.MongoCommandException
 import com.mongodb.MongoNamespace
 import com.mongodb.MongoWriteConcernException
@@ -62,9 +63,12 @@ class MapReduceToCollectionOperationSpecification extends OperationFunctionalSpe
     }
 
     def cleanup() {
-        new DropCollectionOperation(mapReduceInputNamespace, WriteConcern.ACKNOWLEDGED).execute(getBinding())
+        def binding = getBinding()
+        def operationContext = ClusterFixture.getOperationContext(binding.getReadPreference())
+        new DropCollectionOperation(mapReduceInputNamespace, WriteConcern.ACKNOWLEDGED)
+                .execute(binding, operationContext)
         new DropCollectionOperation(mapReduceOutputNamespace, WriteConcern.ACKNOWLEDGED)
-                .execute(getBinding())
+                .execute(binding, operationContext)
     }
 
     def 'should have the correct defaults'() {
diff --git a/driver-core/src/test/functional/com/mongodb/internal/operation/MapReduceWithInlineResultsOperationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/internal/operation/MapReduceWithInlineResultsOperationSpecification.groovy
index 17b3c28f637..8efd4e00f6c 100644
--- a/driver-core/src/test/functional/com/mongodb/internal/operation/MapReduceWithInlineResultsOperationSpecification.groovy
+++ b/driver-core/src/test/functional/com/mongodb/internal/operation/MapReduceWithInlineResultsOperationSpecification.groovy
@@ -26,12 +26,14 @@ import com.mongodb.connection.ClusterId
 import com.mongodb.connection.ConnectionDescription
 import com.mongodb.connection.ConnectionId
 import com.mongodb.connection.ServerId
+import com.mongodb.internal.async.SingleResultCallback
 import com.mongodb.internal.binding.AsyncConnectionSource
 import com.mongodb.internal.binding.AsyncReadBinding
 import com.mongodb.internal.binding.ConnectionSource
 import com.mongodb.internal.binding.ReadBinding
 import com.mongodb.internal.connection.AsyncConnection
 import com.mongodb.internal.connection.Connection
+import com.mongodb.internal.connection.OperationContext
 import com.mongodb.internal.session.SessionContext
 import org.bson.BsonBoolean
 import org.bson.BsonDocument
@@ -220,11 +222,9 @@ class MapReduceWithInlineResultsOperationSpecification extends OperationFunction
         def source = Stub(ConnectionSource)
         def connection = Mock(Connection)
         binding.readPreference >> ReadPreference.primary()
-        binding.operationContext >> operationContext
-        binding.readConnectionSource >> source
-        source.connection >> connection
+        binding.getReadConnectionSource(_) >> source
+        source.getConnection(_) >> connection
         source.retain() >> source
-        source.operationContext >> operationContext
         def commandDocument = BsonDocument.parse('''
             { "mapReduce" : "coll",
               "map" : { "$code" : "function(){ }" },
@@ -237,12 +237,12 @@ class MapReduceWithInlineResultsOperationSpecification extends OperationFunction
                 new BsonJavaScript('function(){ }'), new BsonJavaScript('function(key, values){ }'), bsonDocumentCodec)
 
         when:
-        operation.execute(binding)
+        operation.execute(binding, operationContext)
 
         then:
         _ * connection.description >> new ConnectionDescription(new ConnectionId(new ServerId(new ClusterId(), new ServerAddress())),
                  6, STANDALONE, 1000, 100000, 100000, [])
-        1 * connection.command(_, commandDocument, _, _, _, operationContext) >>
+        1 * connection.command(_, commandDocument, _, _, _, _) >>
                 new BsonDocument('results', new BsonArrayWrapper([]))
                         .append('counts',
                         new BsonDocument('input', new BsonInt32(0))
@@ -269,10 +269,8 @@ class MapReduceWithInlineResultsOperationSpecification extends OperationFunction
         def source = Stub(AsyncConnectionSource)
         def connection = Mock(AsyncConnection)
         binding.readPreference >> ReadPreference.primary()
-        binding.operationContext >> operationContext
-        binding.getReadConnectionSource(_) >> { it[0].onResult(source, null) }
-        source.operationContext >> operationContext
-        source.getConnection(_) >> { it[0].onResult(connection, null) }
+        binding.getReadConnectionSource(_ as OperationContext, _ as SingleResultCallback) >> { it[1].onResult(source, null) }
+        source.getConnection(_ as OperationContext, _ as SingleResultCallback) >> { it[1].onResult(connection, null) }
         source.retain() >> source
         def commandDocument = BsonDocument.parse('''
             { "mapReduce" : "coll",
@@ -286,12 +284,12 @@ class MapReduceWithInlineResultsOperationSpecification extends OperationFunction
                 new BsonJavaScript('function(){ }'), new BsonJavaScript('function(key, values){ }'), bsonDocumentCodec)
 
         when:
-        executeAsync(operation, binding)
+        executeAsync(operation, binding, operationContext)
 
         then:
         _ * connection.description >> new ConnectionDescription(new ConnectionId(new ServerId(new ClusterId(), new ServerAddress())),
                  6, STANDALONE, 1000, 100000, 100000, [])
-        1 * connection.commandAsync(_, commandDocument, _, _, _, operationContext, _) >> {
+        1 * connection.commandAsync(_, commandDocument, _, _, _, _, _) >> {
             it.last().onResult(new BsonDocument('results', new BsonArrayWrapper([]))
                     .append('counts',
                     new BsonDocument('input', new BsonInt32(0))
diff --git a/driver-core/src/test/functional/com/mongodb/internal/operation/RenameCollectionOperationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/internal/operation/RenameCollectionOperationSpecification.groovy
index f2e75a235df..bc55bf5a134 100644
--- a/driver-core/src/test/functional/com/mongodb/internal/operation/RenameCollectionOperationSpecification.groovy
+++ b/driver-core/src/test/functional/com/mongodb/internal/operation/RenameCollectionOperationSpecification.groovy
@@ -16,6 +16,7 @@
 
 package com.mongodb.internal.operation
 
+
 import com.mongodb.MongoNamespace
 import com.mongodb.MongoServerException
 import com.mongodb.MongoWriteConcernException
@@ -27,6 +28,7 @@ import spock.lang.IgnoreIf
 
 import static com.mongodb.ClusterFixture.executeAsync
 import static com.mongodb.ClusterFixture.getBinding
+import static com.mongodb.ClusterFixture.getOperationContext
 import static com.mongodb.ClusterFixture.isDiscoverableReplicaSet
 import static com.mongodb.ClusterFixture.isSharded
 
@@ -34,8 +36,9 @@ import static com.mongodb.ClusterFixture.isSharded
 class RenameCollectionOperationSpecification extends OperationFunctionalSpecification {
 
     def cleanup() {
+        def binding = getBinding()
         new DropCollectionOperation(new MongoNamespace(getDatabaseName(), 'newCollection'),
-                WriteConcern.ACKNOWLEDGED).execute(getBinding())
+                WriteConcern.ACKNOWLEDGED).execute(binding, getOperationContext(binding.getReadPreference()))
     }
 
     def 'should return rename a collection'() {
@@ -81,8 +84,10 @@ class RenameCollectionOperationSpecification extends OperationFunctionalSpecific
         def operation = new RenameCollectionOperation(getNamespace(),
                 new MongoNamespace(getDatabaseName(), 'newCollection'), new WriteConcern(5))
 
+
+        def binding = getBinding()
         when:
-        async ? executeAsync(operation) : operation.execute(getBinding())
+        async ? executeAsync(operation) : operation.execute(binding, getOperationContext(binding.getReadPreference()))
 
         then:
         def ex = thrown(MongoWriteConcernException)
@@ -94,7 +99,9 @@ class RenameCollectionOperationSpecification extends OperationFunctionalSpecific
     }
 
     def collectionNameExists(String collectionName) {
-        def cursor = new ListCollectionsOperation(databaseName, new DocumentCodec()).execute(getBinding())
+        def binding = getBinding()
+        def cursor = new ListCollectionsOperation(databaseName, new DocumentCodec()).execute(binding,
+                getOperationContext(binding.getReadPreference()))
         if (!cursor.hasNext()) {
             return false
         }
diff --git a/driver-core/src/test/resources/logback-test.xml b/driver-core/src/test/resources/logback-test.xml
index dde5eeba5aa..6941b8913e0 100644
--- a/driver-core/src/test/resources/logback-test.xml
+++ b/driver-core/src/test/resources/logback-test.xml
@@ -11,7 +11,7 @@
     
     
 
-    
+    
         
     
 
diff --git a/driver-core/src/test/unit/com/mongodb/internal/TimeoutContextTest.java b/driver-core/src/test/unit/com/mongodb/internal/TimeoutContextTest.java
index 130d408076e..be4526aada7 100644
--- a/driver-core/src/test/unit/com/mongodb/internal/TimeoutContextTest.java
+++ b/driver-core/src/test/unit/com/mongodb/internal/TimeoutContextTest.java
@@ -228,9 +228,9 @@ void testValidatedMinRoundTripTime() {
         Supplier supplier = () -> new TimeoutContext(TIMEOUT_SETTINGS.withTimeoutMS(100L));
 
         assertTrue(getMaxTimeMS(supplier.get()) <= 100);
-        assertTrue(getMaxTimeMS(supplier.get().minRoundTripTimeMS(10)) <= 90);
-        assertThrows(MongoOperationTimeoutException.class, () -> getMaxTimeMS(supplier.get().minRoundTripTimeMS(101)));
-        assertThrows(MongoOperationTimeoutException.class, () -> getMaxTimeMS(supplier.get().minRoundTripTimeMS(100)));
+        assertTrue(getMaxTimeMS(supplier.get().withMinRoundTripTime(10)) <= 90);
+        assertThrows(MongoOperationTimeoutException.class, () -> getMaxTimeMS(supplier.get().withMinRoundTripTimeMS(101)));
+        assertThrows(MongoOperationTimeoutException.class, () -> getMaxTimeMS(supplier.get().withMinRoundTripTimeMS(100)));
     }
 
     @Test
@@ -277,7 +277,7 @@ void testCreateTimeoutContextWithTimeout() {
     void shouldOverrideMaximeMS() {
         TimeoutContext timeoutContext = new TimeoutContext(TIMEOUT_SETTINGS.withTimeoutMS(100L).withMaxTimeMS(1));
 
-        timeoutContext.setMaxTimeOverride(2L);
+        timeoutContext = timeoutContext.withMaxTimeOverride(2L);
 
         assertEquals(2, getMaxTimeMS(timeoutContext));
     }
@@ -286,9 +286,9 @@ void shouldOverrideMaximeMS() {
     @DisplayName("should reset maxTimeMS to default behaviour")
     void shouldResetMaximeMS() {
         TimeoutContext timeoutContext = new TimeoutContext(TIMEOUT_SETTINGS.withTimeoutMS(100L).withMaxTimeMS(1));
-        timeoutContext.setMaxTimeOverride(1L);
+        timeoutContext = timeoutContext.withMaxTimeOverride(1L);
 
-        timeoutContext.resetToDefaultMaxTime();
+        timeoutContext = timeoutContext.withDefaultMaxTime();
 
         assertTrue(getMaxTimeMS(timeoutContext) > 1);
     }
diff --git a/driver-core/src/test/unit/com/mongodb/internal/binding/SingleServerBindingSpecification.groovy b/driver-core/src/test/unit/com/mongodb/internal/binding/SingleServerBindingSpecification.groovy
index 824a724ee81..d52fb593a70 100644
--- a/driver-core/src/test/unit/com/mongodb/internal/binding/SingleServerBindingSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/internal/binding/SingleServerBindingSpecification.groovy
@@ -41,22 +41,12 @@ class SingleServerBindingSpecification extends Specification {
                             .build())
         }
         def address = new ServerAddress()
-        def operationContext = OPERATION_CONTEXT
 
         when:
-
-        def binding = new SingleServerBinding(cluster, address, operationContext)
+        def binding = new SingleServerBinding(cluster, address)
 
         then:
         binding.readPreference == ReadPreference.primary()
-        binding.getOperationContext() == operationContext
-
-
-        when:
-        def source = binding.getReadConnectionSource()
-
-        then:
-        source.getOperationContext() == operationContext
     }
 
     def 'should increment and decrement reference counts'() {
@@ -72,13 +62,13 @@ class SingleServerBindingSpecification extends Specification {
         def address = new ServerAddress()
 
         when:
-        def binding = new SingleServerBinding(cluster, address, OPERATION_CONTEXT)
+        def binding = new SingleServerBinding(cluster, address)
 
         then:
         binding.count == 1
 
         when:
-        def source = binding.getReadConnectionSource()
+        def source = binding.getReadConnectionSource(OPERATION_CONTEXT)
 
         then:
         source.count == 1
@@ -106,7 +96,7 @@ class SingleServerBindingSpecification extends Specification {
         binding.count == 1
 
         when:
-        source = binding.getWriteConnectionSource()
+        source = binding.getWriteConnectionSource(OPERATION_CONTEXT)
 
         then:
         source.count == 1
diff --git a/driver-core/src/test/unit/com/mongodb/internal/connection/AbstractConnectionPoolTest.java b/driver-core/src/test/unit/com/mongodb/internal/connection/AbstractConnectionPoolTest.java
index 92e224df835..69a2c236048 100644
--- a/driver-core/src/test/unit/com/mongodb/internal/connection/AbstractConnectionPoolTest.java
+++ b/driver-core/src/test/unit/com/mongodb/internal/connection/AbstractConnectionPoolTest.java
@@ -77,6 +77,7 @@
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.stream.Collectors;
 
+import static com.mongodb.ClusterFixture.OPERATION_CONTEXT;
 import static com.mongodb.ClusterFixture.OPERATION_CONTEXT_FACTORY;
 import static com.mongodb.ClusterFixture.TIMEOUT_SETTINGS;
 import static com.mongodb.assertions.Assertions.assertFalse;
@@ -541,7 +542,7 @@ private  Event getNextEvent(final Iterator eventsIterator, final
 
     private static void executeAdminCommand(final BsonDocument command) {
         new CommandReadOperation<>("admin", command, new BsonDocumentCodec())
-                .execute(ClusterFixture.getBinding());
+                .execute(ClusterFixture.getBinding(), OPERATION_CONTEXT);
     }
 
     private void setFailPoint() {
diff --git a/driver-core/src/test/unit/com/mongodb/internal/connection/DefaultServerSpecification.groovy b/driver-core/src/test/unit/com/mongodb/internal/connection/DefaultServerSpecification.groovy
index 6552a69a70d..3910da575f0 100644
--- a/driver-core/src/test/unit/com/mongodb/internal/connection/DefaultServerSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/internal/connection/DefaultServerSpecification.groovy
@@ -16,7 +16,6 @@
 
 package com.mongodb.internal.connection
 
-
 import com.mongodb.MongoException
 import com.mongodb.MongoNodeIsRecoveringException
 import com.mongodb.MongoNotPrimaryException
@@ -351,7 +350,7 @@ class DefaultServerSpecification extends Specification {
         clusterClock.advance(clusterClockClusterTime)
         def server = new DefaultServer(serverId, SINGLE, Mock(ConnectionPool), new TestConnectionFactory(), Mock(ServerMonitor),
                 Mock(SdamServerDescriptionManager), Mock(ServerListener), Mock(CommandListener), clusterClock, false)
-        def testConnection = (TestConnection) server.getConnection()
+        def testConnection = (TestConnection) server.getConnection(OPERATION_CONTEXT)
         def sessionContext = new TestSessionContext(initialClusterTime)
         def response = BsonDocument.parse(
                 '''{
diff --git a/driver-core/src/test/unit/com/mongodb/internal/mockito/InsufficientStubbingDetectorDemoTest.java b/driver-core/src/test/unit/com/mongodb/internal/mockito/InsufficientStubbingDetectorDemoTest.java
index 40d33c31288..5d8bd8e61b1 100644
--- a/driver-core/src/test/unit/com/mongodb/internal/mockito/InsufficientStubbingDetectorDemoTest.java
+++ b/driver-core/src/test/unit/com/mongodb/internal/mockito/InsufficientStubbingDetectorDemoTest.java
@@ -40,33 +40,33 @@ void beforeEach() {
     @Test
     void mockObjectWithDefaultAnswer() {
         ReadBinding binding = Mockito.mock(ReadBinding.class);
-        assertThrows(NullPointerException.class, () -> operation.execute(binding));
+        assertThrows(NullPointerException.class, () -> operation.execute(binding, OPERATION_CONTEXT));
     }
 
     @Test
     void mockObjectWithThrowsException() {
         ReadBinding binding = Mockito.mock(ReadBinding.class,
                 new ThrowsException(new AssertionError("Insufficient stubbing for " + ReadBinding.class)));
-        assertThrows(AssertionError.class, () -> operation.execute(binding));
+        assertThrows(AssertionError.class, () -> operation.execute(binding, OPERATION_CONTEXT));
     }
 
     @Test
     void mockObjectWithInsufficientStubbingDetector() {
         ReadBinding binding = MongoMockito.mock(ReadBinding.class);
-        assertThrows(AssertionError.class, () -> operation.execute(binding));
+        assertThrows(AssertionError.class, () -> operation.execute(binding, OPERATION_CONTEXT));
     }
 
     @Test
     void stubbingWithThrowsException() {
         ReadBinding binding = Mockito.mock(ReadBinding.class,
                 new ThrowsException(new AssertionError("Unfortunately, you cannot do stubbing")));
-        assertThrows(AssertionError.class, () -> when(binding.getOperationContext()).thenReturn(OPERATION_CONTEXT));
+        assertThrows(AssertionError.class, () -> when(binding.getReadConnectionSource(OPERATION_CONTEXT)).thenReturn(null));
     }
 
     @Test
     void stubbingWithInsufficientStubbingDetector() {
         MongoMockito.mock(ReadBinding.class, bindingMock ->
-                when(bindingMock.getOperationContext()).thenReturn(OPERATION_CONTEXT)
+                when(bindingMock.getReadConnectionSource(OPERATION_CONTEXT)).thenReturn(null)
         );
     }
 }
diff --git a/driver-core/src/test/unit/com/mongodb/internal/operation/AsyncChangeStreamBatchCursorSpecification.groovy b/driver-core/src/test/unit/com/mongodb/internal/operation/AsyncChangeStreamBatchCursorSpecification.groovy
index 998c0a28b6e..37a7220a851 100644
--- a/driver-core/src/test/unit/com/mongodb/internal/operation/AsyncChangeStreamBatchCursorSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/internal/operation/AsyncChangeStreamBatchCursorSpecification.groovy
@@ -16,32 +16,37 @@
 
 package com.mongodb.internal.operation
 
+import com.mongodb.MongoClientSettings
 import com.mongodb.MongoException
 import com.mongodb.async.FutureResultCallback
+import com.mongodb.internal.IgnorableRequestContext
 import com.mongodb.internal.TimeoutContext
+import com.mongodb.internal.TimeoutSettings
 import com.mongodb.internal.async.SingleResultCallback
 import com.mongodb.internal.binding.AsyncReadBinding
+import com.mongodb.internal.connection.NoOpSessionContext
 import com.mongodb.internal.connection.OperationContext
 import org.bson.Document
+import org.bson.RawBsonDocument
 import spock.lang.Specification
 
+import java.util.concurrent.TimeUnit
+
 import static java.util.concurrent.TimeUnit.SECONDS
 
 class AsyncChangeStreamBatchCursorSpecification extends Specification {
 
     def 'should call the underlying AsyncCommandBatchCursor'() {
         given:
-        def changeStreamOpertation = Stub(ChangeStreamOperation)
+        def changeStreamOperation = Stub(ChangeStreamOperation)
         def binding = Mock(AsyncReadBinding)
-        def operationContext = Mock(OperationContext)
-        def timeoutContext = Mock(TimeoutContext)
-        binding.getOperationContext() >> operationContext
-        operationContext.getTimeoutContext() >> timeoutContext
-        timeoutContext.hasTimeoutMS() >> hasTimeoutMS
+        def operationContext = getOperationContext()
+        operationContext.getTimeoutContext().hasTimeoutMS() >> hasTimeoutMS
 
-        def wrapped = Mock(AsyncCommandBatchCursor)
         def callback = Stub(SingleResultCallback)
-        def cursor = new AsyncChangeStreamBatchCursor(changeStreamOpertation, wrapped, binding, null,
+        AsyncCoreCursor wrapped = Mock(AsyncCoreCursor)
+        def cursor = new AsyncChangeStreamBatchCursor(changeStreamOperation,
+                wrapped, binding, operationContext, null,
                 ServerVersionHelper.FOUR_DOT_FOUR_WIRE_VERSION)
 
         when:
@@ -54,13 +59,13 @@ class AsyncChangeStreamBatchCursorSpecification extends Specification {
         cursor.next(callback)
 
         then:
-        1 * wrapped.next(_) >> { it[0].onResult([], null) }
+        1 * wrapped.next(_ as OperationContext, _) >> { it[1].onResult([], null) }
 
         when:
         cursor.close()
 
         then:
-        1 * wrapped.close()
+        1 * wrapped.close(_)
         1 * binding.release()
 
         when:
@@ -77,24 +82,23 @@ class AsyncChangeStreamBatchCursorSpecification extends Specification {
     def 'should not close the cursor in next if the cursor was closed before next completed'() {
         def changeStreamOpertation = Stub(ChangeStreamOperation)
         def binding = Mock(AsyncReadBinding)
-        def operationContext = Mock(OperationContext)
-        def timeoutContext = Mock(TimeoutContext)
-        binding.getOperationContext() >> operationContext
-        operationContext.getTimeoutContext() >> timeoutContext
-        timeoutContext.hasTimeoutMS() >> hasTimeoutMS
-        def wrapped = Mock(AsyncCommandBatchCursor)
+        def operationContext = getOperationContext()
+        operationContext.getTimeoutContext().hasTimeoutMS() >> hasTimeoutMS
+
         def callback = Stub(SingleResultCallback)
-        def cursor = new AsyncChangeStreamBatchCursor(changeStreamOpertation, wrapped, binding, null,
+        AsyncCoreCursor wrapped = Mock(AsyncCoreCursor)
+        def cursor = new AsyncChangeStreamBatchCursor(changeStreamOpertation,
+                wrapped, binding, operationContext, null,
                 ServerVersionHelper.FOUR_DOT_FOUR_WIRE_VERSION)
 
         when:
         cursor.next(callback)
 
         then:
-        1 * wrapped.next(_) >> {
+        1 * wrapped.next(_ as OperationContext, _) >> {
             // Simulate the user calling close while wrapped.next() is in flight
             cursor.close()
-            it[0].onResult([], null)
+            it[1].onResult([], null)
         }
 
         then:
@@ -110,13 +114,12 @@ class AsyncChangeStreamBatchCursorSpecification extends Specification {
     def 'should throw a MongoException when next/tryNext is called after the cursor is closed'() {
         def changeStreamOpertation = Stub(ChangeStreamOperation)
         def binding = Mock(AsyncReadBinding)
-        def operationContext = Mock(OperationContext)
-        def timeoutContext = Mock(TimeoutContext)
-        binding.getOperationContext() >> operationContext
-        operationContext.getTimeoutContext() >> timeoutContext
-        timeoutContext.hasTimeoutMS() >> hasTimeoutMS
-        def wrapped = Mock(AsyncCommandBatchCursor)
-        def cursor = new AsyncChangeStreamBatchCursor(changeStreamOpertation, wrapped, binding, null,
+        def operationContext = getOperationContext()
+        operationContext.getTimeoutContext().hasTimeoutMS() >> hasTimeoutMS
+
+        AsyncCoreCursor wrapped = Mock(AsyncCoreCursor)
+        def cursor = new AsyncChangeStreamBatchCursor(changeStreamOpertation,
+                wrapped, binding, operationContext, null,
                 ServerVersionHelper.FOUR_DOT_FOUR_WIRE_VERSION)
 
         given:
@@ -138,4 +141,13 @@ class AsyncChangeStreamBatchCursorSpecification extends Specification {
         cursor.next(futureResultCallback)
         futureResultCallback.get(1, SECONDS)
     }
+
+    OperationContext getOperationContext() {
+        def timeoutContext = Spy(new TimeoutContext(TimeoutSettings.create(
+                MongoClientSettings.builder().timeout(3, TimeUnit.SECONDS).build())))
+        Spy(new OperationContext(
+                IgnorableRequestContext.INSTANCE,
+                NoOpSessionContext.INSTANCE,
+                timeoutContext, null))
+    }
 }
diff --git a/driver-core/src/test/unit/com/mongodb/internal/operation/AsyncCommandBatchCursorSpecification.groovy b/driver-core/src/test/unit/com/mongodb/internal/operation/AsyncCommandBatchCursorSpecification.groovy
index d2bcd0804bb..901c2607ead 100644
--- a/driver-core/src/test/unit/com/mongodb/internal/operation/AsyncCommandBatchCursorSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/internal/operation/AsyncCommandBatchCursorSpecification.groovy
@@ -16,6 +16,7 @@
 
 package com.mongodb.internal.operation
 
+
 import com.mongodb.MongoClientSettings
 import com.mongodb.MongoCommandException
 import com.mongodb.MongoException
@@ -29,11 +30,13 @@ import com.mongodb.connection.ServerConnectionState
 import com.mongodb.connection.ServerDescription
 import com.mongodb.connection.ServerType
 import com.mongodb.connection.ServerVersion
+import com.mongodb.internal.IgnorableRequestContext
 import com.mongodb.internal.TimeoutContext
 import com.mongodb.internal.TimeoutSettings
 import com.mongodb.internal.async.SingleResultCallback
 import com.mongodb.internal.binding.AsyncConnectionSource
 import com.mongodb.internal.connection.AsyncConnection
+import com.mongodb.internal.connection.NoOpSessionContext
 import com.mongodb.internal.connection.OperationContext
 import org.bson.BsonArray
 import org.bson.BsonDocument
@@ -58,7 +61,8 @@ class AsyncCommandBatchCursorSpecification extends Specification {
         def initialConnection = referenceCountedAsyncConnection()
         def connection = referenceCountedAsyncConnection()
         def connectionSource = getAsyncConnectionSource(connection)
-        def timeoutContext = connectionSource.getOperationContext().getTimeoutContext()
+        def operationContext = getOperationContext()
+        def timeoutContext = operationContext.getTimeoutContext()
         def firstBatch = createCommandResult([])
         def expectedCommand = new BsonDocument('getMore': new BsonInt64(CURSOR_ID))
                 .append('collection', new BsonString(NAMESPACE.getCollectionName()))
@@ -69,10 +73,10 @@ class AsyncCommandBatchCursorSpecification extends Specification {
         def reply =  getMoreResponse([], 0)
 
         when:
-        def cursor = new AsyncCommandBatchCursor(TimeoutMode.CURSOR_LIFETIME, firstBatch, batchSize, maxTimeMS, CODEC,
-                null, connectionSource, initialConnection)
+        def commandCoreCursor = new AsyncCommandCoreCursor<>(firstBatch, batchSize, CODEC, null, connectionSource, initialConnection)
+        def cursor = new AsyncCommandBatchCursor(TimeoutMode.CURSOR_LIFETIME, maxTimeMS, operationContext, commandCoreCursor)
         then:
-        1 * timeoutContext.setMaxTimeOverride(*_)
+        1 * timeoutContext.withMaxTimeOverride(*_)
 
         when:
         def batch = nextBatch(cursor)
@@ -107,15 +111,17 @@ class AsyncCommandBatchCursorSpecification extends Specification {
         def serverVersion = new ServerVersion([3, 6, 0])
         def connection = referenceCountedAsyncConnection(serverVersion)
         def connectionSource = getAsyncConnectionSource(connection)
-        def cursor = new AsyncCommandBatchCursor(TimeoutMode.CURSOR_LIFETIME, firstBatch, 0, 0, CODEC,
-                null, connectionSource, initialConnection)
+        def operationContext = getOperationContext()
+        def commandCoreCursor = new AsyncCommandCoreCursor<>(firstBatch, 0, CODEC, null, connectionSource, initialConnection)
+        def cursor = new AsyncCommandBatchCursor(TimeoutMode.CURSOR_LIFETIME, 0, operationContext, commandCoreCursor)
 
         when:
         cursor.close()
 
         then:
-        if (cursor.getServerCursor() != null) {
-            1 * connection.commandAsync(NAMESPACE.databaseName, createKillCursorsDocument(cursor.getServerCursor()), _, primary(), *_) >> {
+        if (commandCoreCursor.getServerCursor() != null) {
+            1 * connection.commandAsync(NAMESPACE.databaseName,
+                    createKillCursorsDocument(commandCoreCursor.getServerCursor()), _, primary(), *_) >> {
                 it.last().onResult(null, null)
             }
         }
@@ -137,8 +143,8 @@ class AsyncCommandBatchCursorSpecification extends Specification {
 
         when:
         def firstBatch = createCommandResult(FIRST_BATCH, 0)
-        def cursor = new AsyncCommandBatchCursor(TimeoutMode.CURSOR_LIFETIME, firstBatch, 0, 0, CODEC,
-                null, connectionSource, initialConnection)
+        def commandCoreCursor = new AsyncCommandCoreCursor<>(firstBatch, 0, CODEC, null, connectionSource, initialConnection)
+        def cursor = new AsyncCommandBatchCursor(TimeoutMode.CURSOR_LIFETIME, 0, operationContext, commandCoreCursor)
 
         then:
         nextBatch(cursor) == FIRST_BATCH
@@ -167,8 +173,8 @@ class AsyncCommandBatchCursorSpecification extends Specification {
 
         when:
         def firstBatch = createCommandResult([], CURSOR_ID)
-        def cursor = new AsyncCommandBatchCursor(TimeoutMode.CURSOR_LIFETIME, firstBatch, 0, 0, CODEC,
-                null, connectionSource, initialConnection)
+        def commandCoreCursor = new AsyncCommandCoreCursor<>(firstBatch, 0, CODEC, null, connectionSource, initialConnection)
+        def cursor = new AsyncCommandBatchCursor(TimeoutMode.CURSOR_LIFETIME, 0, operationContext, commandCoreCursor)
         def batch = nextBatch(cursor)
 
         then:
@@ -213,8 +219,8 @@ class AsyncCommandBatchCursorSpecification extends Specification {
         def firstBatch = createCommandResult()
 
         when:
-        def cursor = new AsyncCommandBatchCursor(TimeoutMode.CURSOR_LIFETIME, firstBatch, 0, 0, CODEC,
-                null, connectionSource, initialConnection)
+        def commandCoreCursor = new AsyncCommandCoreCursor<>(firstBatch, 0, CODEC, null, connectionSource, initialConnection)
+        def cursor = new AsyncCommandBatchCursor(TimeoutMode.CURSOR_LIFETIME, 0, operationContext, commandCoreCursor)
         def batch = nextBatch(cursor)
 
         then:
@@ -267,8 +273,9 @@ class AsyncCommandBatchCursorSpecification extends Specification {
         def connectionSource = getAsyncConnectionSource(connectionA, connectionB)
 
         when:
-        def cursor = new AsyncCommandBatchCursor(TimeoutMode.CURSOR_LIFETIME, createCommandResult(FIRST_BATCH, 42), 0, 0, CODEC,
-                null, connectionSource, initialConnection)
+        def commandCoreCursor = new AsyncCommandCoreCursor<>(createCommandResult(FIRST_BATCH, 42), 0,
+                CODEC, null, connectionSource, initialConnection)
+        def cursor = new AsyncCommandBatchCursor(TimeoutMode.CURSOR_LIFETIME, 0, operationContext, commandCoreCursor)
         def batch = nextBatch(cursor)
 
         then:
@@ -303,8 +310,8 @@ class AsyncCommandBatchCursorSpecification extends Specification {
         def firstBatch = createCommandResult()
 
         when:
-        def cursor = new AsyncCommandBatchCursor(TimeoutMode.CURSOR_LIFETIME, firstBatch, 0, 0, CODEC,
-                null, connectionSource, initialConnection)
+        def commandCoreCursor = new AsyncCommandCoreCursor<>(firstBatch, 0, CODEC, null, connectionSource, initialConnection)
+        def cursor = new AsyncCommandBatchCursor(TimeoutMode.CURSOR_LIFETIME, 0, operationContext, commandCoreCursor)
         def batch = nextBatch(cursor)
 
         then:
@@ -343,8 +350,8 @@ class AsyncCommandBatchCursorSpecification extends Specification {
         def initialConnection = referenceCountedAsyncConnection()
         def connectionSource = getAsyncConnectionSourceWithResult(ServerType.STANDALONE) { [null, MONGO_EXCEPTION] }
         def firstBatch = createCommandResult()
-        def cursor = new AsyncCommandBatchCursor(TimeoutMode.CURSOR_LIFETIME, firstBatch, 0, 0, CODEC,
-                null, connectionSource, initialConnection)
+        def commandCoreCursor = new AsyncCommandCoreCursor<>(firstBatch, 0, CODEC, null, connectionSource, initialConnection)
+        def cursor = new AsyncCommandBatchCursor(TimeoutMode.CURSOR_LIFETIME, 0, operationContext, commandCoreCursor)
 
         when:
         cursor.close()
@@ -363,8 +370,8 @@ class AsyncCommandBatchCursorSpecification extends Specification {
 
         when:
         def firstBatch = createCommandResult()
-        def cursor = new AsyncCommandBatchCursor(TimeoutMode.CURSOR_LIFETIME, firstBatch, 0, 0, CODEC,
-                null, connectionSource, initialConnection)
+        def commandCoreCursor = new AsyncCommandCoreCursor<>(firstBatch, 0, CODEC, null, connectionSource, initialConnection)
+        def cursor = new AsyncCommandBatchCursor(TimeoutMode.CURSOR_LIFETIME, 0, operationContext, commandCoreCursor)
 
         then:
         nextBatch(cursor)
@@ -390,8 +397,8 @@ class AsyncCommandBatchCursorSpecification extends Specification {
 
         when:
         def firstBatch = createCommandResult()
-        def cursor = new AsyncCommandBatchCursor(TimeoutMode.CURSOR_LIFETIME, firstBatch, 0, 0, CODEC,
-                null, connectionSource, initialConnection)
+        def commandCoreCursor = new AsyncCommandCoreCursor<>(firstBatch, 0, CODEC, null, connectionSource, initialConnection)
+        def cursor = new AsyncCommandBatchCursor(TimeoutMode.CURSOR_LIFETIME, 0, operationContext, commandCoreCursor)
 
         then:
         connectionSource.getCount() == 1
@@ -523,17 +530,12 @@ class AsyncCommandBatchCursorSpecification extends Specification {
                     .state(ServerConnectionState.CONNECTED)
                     .build()
         }
-        OperationContext operationContext = Mock(OperationContext)
-        def timeoutContext = Spy(new TimeoutContext(TimeoutSettings.create(
-                MongoClientSettings.builder().timeout(3, TimeUnit.SECONDS).build())))
-        operationContext.getTimeoutContext() >> timeoutContext
-        mock.getOperationContext() >> operationContext
-        mock.getConnection(_) >> {
+        mock.getConnection(_ as OperationContext, _ as SingleResultCallback) >> {
             if (counter == 0) {
                 throw new IllegalStateException('Tried to use released AsyncConnectionSource')
             }
             def (result, error) = connectionCallbackResults()
-            it[0].onResult(result, error)
+            it[1].onResult(result, error)
         }
         mock.retain() >> {
             if (released) {
@@ -555,4 +557,13 @@ class AsyncCommandBatchCursorSpecification extends Specification {
         mock.getCount() >> { counter }
         mock
     }
+
+    OperationContext getOperationContext() {
+        def timeoutContext = Spy(new TimeoutContext(TimeoutSettings.create(
+                MongoClientSettings.builder().timeout(3, TimeUnit.SECONDS).build())))
+        Spy(new OperationContext(
+                IgnorableRequestContext.INSTANCE,
+                NoOpSessionContext.INSTANCE,
+                timeoutContext, null))
+    }
 }
diff --git a/driver-core/src/test/unit/com/mongodb/internal/operation/AsyncOperationHelperSpecification.groovy b/driver-core/src/test/unit/com/mongodb/internal/operation/AsyncOperationHelperSpecification.groovy
index ba69097cffa..d573822cab7 100644
--- a/driver-core/src/test/unit/com/mongodb/internal/operation/AsyncOperationHelperSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/internal/operation/AsyncOperationHelperSpecification.groovy
@@ -27,6 +27,7 @@ import com.mongodb.internal.binding.AsyncConnectionSource
 import com.mongodb.internal.binding.AsyncReadBinding
 import com.mongodb.internal.binding.AsyncWriteBinding
 import com.mongodb.internal.connection.AsyncConnection
+import com.mongodb.internal.connection.OperationContext
 import com.mongodb.internal.session.SessionContext
 import com.mongodb.internal.validator.NoOpFieldNameValidator
 import org.bson.BsonDocument
@@ -80,17 +81,15 @@ class AsyncOperationHelperSpecification extends Specification {
                     getReadConcern() >> ReadConcern.DEFAULT
                 })
         def connectionSource = Stub(AsyncConnectionSource) {
-            getConnection(_) >> { it[0].onResult(connection, null) }
+            getConnection(_ as OperationContext, _ as SingleResultCallback) >> { it[1].onResult(connection, null) }
             getServerDescription() >> serverDescription
-            getOperationContext() >> operationContext
         }
         def asyncWriteBinding = Stub(AsyncWriteBinding) {
-            getWriteConnectionSource(_) >> { it[0].onResult(connectionSource, null) }
-            getOperationContext() >> operationContext
+            getWriteConnectionSource(_ as OperationContext, _ as SingleResultCallback) >> { it[1].onResult(connectionSource, null) }
         }
 
         when:
-        executeRetryableWriteAsync(asyncWriteBinding, dbName, primary(),
+        executeRetryableWriteAsync(asyncWriteBinding, operationContext, dbName, primary(),
                 NoOpFieldNameValidator.INSTANCE, decoder, commandCreator, FindAndModifyHelper.asyncTransformer(),
                 { cmd -> cmd }, callback)
 
@@ -109,15 +108,15 @@ class AsyncOperationHelperSpecification extends Specification {
         def callback = Stub(SingleResultCallback)
         def connection = Mock(AsyncConnection)
         def connectionSource = Stub(AsyncConnectionSource) {
-            getConnection(_) >> { it[0].onResult(connection, null) }
+            getConnection(_ as OperationContext, _ as SingleResultCallback) >> { it[1].onResult(connection, null) }
         }
         def asyncWriteBinding = Stub(AsyncWriteBinding) {
-            getWriteConnectionSource(_) >> { it[0].onResult(connectionSource, null) }
+            getWriteConnectionSource(_ as OperationContext, _ as SingleResultCallback) >> { it[1].onResult(connectionSource, null) }
         }
         def connectionDescription = Stub(ConnectionDescription)
 
         when:
-        executeCommandAsync(asyncWriteBinding, dbName, command, connection, { t, conn -> t }, callback)
+        executeCommandAsync(asyncWriteBinding, OPERATION_CONTEXT, dbName, command, connection, { t, conn -> t }, callback)
 
         then:
         _ * connection.getDescription() >> connectionDescription
@@ -135,18 +134,16 @@ class AsyncOperationHelperSpecification extends Specification {
         def function = Stub(CommandReadTransformerAsync)
         def connection = Mock(AsyncConnection)
         def connectionSource = Stub(AsyncConnectionSource) {
-            getOperationContext() >> OPERATION_CONTEXT
-            getConnection(_) >> { it[0].onResult(connection, null) }
+            getConnection(_ as OperationContext, _ as SingleResultCallback) >> { it[1].onResult(connection, null) }
             getReadPreference() >> readPreference
         }
         def asyncReadBinding = Stub(AsyncReadBinding) {
-            getOperationContext() >> OPERATION_CONTEXT
-            getReadConnectionSource(_)  >> { it[0].onResult(connectionSource, null) }
+            getReadConnectionSource(_ as OperationContext, _ as SingleResultCallback)  >> { it[1].onResult(connectionSource, null) }
         }
         def connectionDescription = Stub(ConnectionDescription)
 
         when:
-        executeRetryableReadAsync(asyncReadBinding, dbName, commandCreator, decoder, function, false, callback)
+        executeRetryableReadAsync(asyncReadBinding, OPERATION_CONTEXT, dbName, commandCreator, decoder, function, false, callback)
 
         then:
         _ * connection.getDescription() >> connectionDescription
diff --git a/driver-core/src/test/unit/com/mongodb/internal/operation/ChangeStreamBatchCursorSpecification.groovy b/driver-core/src/test/unit/com/mongodb/internal/operation/ChangeStreamBatchCursorSpecification.groovy
index 09c6ff221b6..919258a57c7 100644
--- a/driver-core/src/test/unit/com/mongodb/internal/operation/ChangeStreamBatchCursorSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/internal/operation/ChangeStreamBatchCursorSpecification.groovy
@@ -16,11 +16,20 @@
 
 package com.mongodb.internal.operation
 
+import com.mongodb.MongoClientSettings
+import com.mongodb.internal.IgnorableRequestContext
+import com.mongodb.internal.TimeoutContext
+import com.mongodb.internal.TimeoutSettings
 import com.mongodb.internal.binding.ReadBinding
+import com.mongodb.internal.connection.NoOpSessionContext
+import com.mongodb.internal.connection.OperationContext
 import org.bson.BsonDocument
 import org.bson.BsonInt32
+import org.bson.RawBsonDocument
 import spock.lang.Specification
 
+import java.util.concurrent.TimeUnit
+
 import static java.util.Collections.emptyList
 
 class ChangeStreamBatchCursorSpecification extends Specification {
@@ -29,11 +38,14 @@ class ChangeStreamBatchCursorSpecification extends Specification {
         given:
         def changeStreamOperation = Stub(ChangeStreamOperation)
         def binding = Stub(ReadBinding)
-        def wrapped = Mock(CommandBatchCursor)
         def resumeToken = new BsonDocument('_id': new BsonInt32(1))
-        def cursor = new ChangeStreamBatchCursor(changeStreamOperation, wrapped, binding, resumeToken,
+        def operationContext = getOperationContext()
+        CoreCursor wrapped = Mock(CoreCursor)
+        def cursor = new ChangeStreamBatchCursor(changeStreamOperation,
+                wrapped, binding, operationContext, resumeToken,
                 ServerVersionHelper.FOUR_DOT_FOUR_WIRE_VERSION)
 
+
         when:
         cursor.setBatchSize(10)
 
@@ -44,27 +56,35 @@ class ChangeStreamBatchCursorSpecification extends Specification {
         cursor.tryNext()
 
         then:
-        1 * wrapped.tryNext()
+        1 * wrapped.tryNext(_ as OperationContext)
         1 * wrapped.getPostBatchResumeToken()
 
         when:
         cursor.next()
 
         then:
-        1 * wrapped.next() >> emptyList()
+        1 * wrapped.next(_ as OperationContext) >> emptyList()
         1 * wrapped.getPostBatchResumeToken()
 
         when:
         cursor.close()
 
         then:
-        1 * wrapped.close()
+        1 * wrapped.close(_ as OperationContext)
 
         when:
         cursor.close()
 
         then:
-        0 * wrapped.close()
+        0 * wrapped.close(_ as OperationContext)
     }
 
+    OperationContext getOperationContext() {
+        def timeoutContext = Spy(new TimeoutContext(TimeoutSettings.create(
+                MongoClientSettings.builder().timeout(3, TimeUnit.SECONDS).build())))
+        Spy(new OperationContext(
+                IgnorableRequestContext.INSTANCE,
+                NoOpSessionContext.INSTANCE,
+                timeoutContext, null));
+    }
 }
diff --git a/driver-core/src/test/unit/com/mongodb/internal/operation/ChangeStreamBatchCursorTest.java b/driver-core/src/test/unit/com/mongodb/internal/operation/ChangeStreamBatchCursorTest.java
index 48c3a50e79a..b0cc6bc4c96 100644
--- a/driver-core/src/test/unit/com/mongodb/internal/operation/ChangeStreamBatchCursorTest.java
+++ b/driver-core/src/test/unit/com/mongodb/internal/operation/ChangeStreamBatchCursorTest.java
@@ -20,34 +20,47 @@
 import com.mongodb.MongoOperationTimeoutException;
 import com.mongodb.ServerAddress;
 import com.mongodb.connection.ServerDescription;
+import com.mongodb.internal.IgnorableRequestContext;
 import com.mongodb.internal.TimeoutContext;
+import com.mongodb.internal.TimeoutSettings;
 import com.mongodb.internal.binding.ConnectionSource;
 import com.mongodb.internal.binding.ReadBinding;
 import com.mongodb.internal.connection.Connection;
+import com.mongodb.internal.connection.NoOpSessionContext;
 import com.mongodb.internal.connection.OperationContext;
 import org.bson.BsonDocument;
 import org.bson.BsonInt32;
 import org.bson.Document;
 import org.bson.RawBsonDocument;
+import org.bson.assertions.Assertions;
 import org.bson.codecs.DocumentCodec;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentCaptor;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Consumer;
 
+import static com.mongodb.ClusterFixture.sleep;
 import static com.mongodb.internal.operation.CommandBatchCursorHelper.MESSAGE_IF_CLOSED_AS_CURSOR;
+import static java.lang.String.format;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.atLeastOnce;
 import static org.mockito.Mockito.clearInvocations;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoInteractions;
@@ -57,6 +70,8 @@
 final class ChangeStreamBatchCursorTest {
 
     private static final List RESULT_FROM_NEW_CURSOR = new ArrayList<>();
+    private static final long TIMEOUT_MILLISECONDS = TimeUnit.MINUTES.toMillis(10);
+    private static final int TIMEOUT_CONSUMPTION_SLEEP_MS = 100;
     private final int maxWireVersion = ServerVersionHelper.SIX_DOT_ZERO_WIRE_VERSION;
     private ServerDescription serverDescription;
     private TimeoutContext timeoutContext;
@@ -65,26 +80,29 @@ final class ChangeStreamBatchCursorTest {
     private ConnectionSource connectionSource;
     private ReadBinding readBinding;
     private BsonDocument resumeToken;
-    private CommandBatchCursor commandBatchCursor;
-    private CommandBatchCursor newCommandBatchCursor;
+    private CoreCursor coreCursor;
+    private CoreCursor newCoreCursor;
     private ChangeStreamBatchCursor newChangeStreamCursor;
     private ChangeStreamOperation changeStreamOperation;
 
     @Test
     @DisplayName("should return result on next")
     void shouldReturnResultOnNext() {
-        when(commandBatchCursor.next()).thenReturn(RESULT_FROM_NEW_CURSOR);
+        when(coreCursor.next(any())).thenReturn(RESULT_FROM_NEW_CURSOR);
         ChangeStreamBatchCursor cursor = createChangeStreamCursor();
 
         //when
+        sleep(TIMEOUT_CONSUMPTION_SLEEP_MS); // Simulate some delay to ensure timeout is reset.
         List next = cursor.next();
 
         //then
         assertEquals(RESULT_FROM_NEW_CURSOR, next);
-        verify(timeoutContext, times(1)).resetTimeoutIfPresent();
-        verify(commandBatchCursor, times(1)).next();
-        verify(commandBatchCursor, atLeastOnce()).getPostBatchResumeToken();
-        verifyNoMoreInteractions(commandBatchCursor);
+        assertTimeoutWasRefreshedForOperation(operationContextCaptor ->
+                verify(coreCursor).next(operationContextCaptor.capture()));
+
+        verify(coreCursor, times(1)).next(any());
+        verify(coreCursor, atLeastOnce()).getPostBatchResumeToken();
+        verifyNoMoreInteractions(coreCursor);
         verify(changeStreamOperation, times(1)).getDecoder();
         verifyNoMoreInteractions(changeStreamOperation);
     }
@@ -92,37 +110,79 @@ void shouldReturnResultOnNext() {
     @Test
     @DisplayName("should throw timeout exception without resume attempt on next")
     void shouldThrowTimeoutExceptionWithoutResumeAttemptOnNext() {
-        when(commandBatchCursor.next()).thenThrow(new MongoOperationTimeoutException("timeout"));
+        when(coreCursor.next(any())).thenThrow(new MongoOperationTimeoutException("timeout"));
         ChangeStreamBatchCursor cursor = createChangeStreamCursor();
         //when
         assertThrows(MongoOperationTimeoutException.class, cursor::next);
 
         //then
-        verify(timeoutContext, times(1)).resetTimeoutIfPresent();
-        verify(commandBatchCursor, times(1)).next();
-        verify(commandBatchCursor, atLeastOnce()).getPostBatchResumeToken();
-        verifyNoMoreInteractions(commandBatchCursor);
+        verify(coreCursor, times(1)).next(any());
+        verify(coreCursor, atLeastOnce()).getPostBatchResumeToken();
+        verifyNoMoreInteractions(coreCursor);
         verifyNoResumeAttemptCalled();
     }
 
+    @Test
+    @DisplayName("should not refresh timeout on next() after cursor close() when resume attempt is made")
+    void shouldNotRefreshTimeoutOnNextAfterCloseWhenResumeAttemptIsMade() {
+        // given
+        when(coreCursor.next(any())).thenThrow(new MongoOperationTimeoutException("timeout"));
+        ChangeStreamBatchCursor cursor = createChangeStreamCursor();
+        // when
+        assertThrows(MongoOperationTimeoutException.class, cursor::next);
+        // trigger resume attempt to close the cursor
+        cursor.next();
+
+        // then
+        TimeoutContext timeoutContextForClose = captureTimeoutContext(captor -> verify(coreCursor)
+                .close(captor.capture()));
+        TimeoutContext timeoutContextForNext = captureTimeoutContext(captor -> verify(newCoreCursor)
+                .next(captor.capture()));
+        assertEquals(timeoutContextForNext.getTimeout(), timeoutContextForClose.getTimeout(),
+                "Timeout should not be refreshed on close after resume attempt");
+    }
+
+    @Test
+    @DisplayName("should not refresh timeout on close() after cursor next() when resume attempt is made")
+    void shouldNotRefreshTimeoutOnCloseAfterNextWhenResumeAttemptIsMade() {
+        // given
+        when(coreCursor.next(any())).thenThrow(new MongoNotPrimaryException(new BsonDocument(), new ServerAddress()));
+        ChangeStreamBatchCursor cursor = createChangeStreamCursor();
+
+        // when
+        cursor.next();
+
+        // then
+        TimeoutContext timeoutContextForNext = captureTimeoutContext(captor -> verify(coreCursor)
+                .next(captor.capture()));
+        TimeoutContext timeoutContextForClose = captureTimeoutContext(captor -> verify(coreCursor)
+                .close(captor.capture()));
+        assertEquals(timeoutContextForNext.getTimeout(), timeoutContextForClose.getTimeout(),
+                "Timeout should not be refreshed on close after resume attempt");
+    }
+
     @Test
     @DisplayName("should perform resume attempt on next when resumable error is thrown")
     void shouldPerformResumeAttemptOnNextWhenResumableErrorIsThrown() {
-        when(commandBatchCursor.next()).thenThrow(new MongoNotPrimaryException(new BsonDocument(), new ServerAddress()));
+        when(coreCursor.next(any())).thenThrow(new MongoNotPrimaryException(new BsonDocument(), new ServerAddress()));
         ChangeStreamBatchCursor cursor = createChangeStreamCursor();
+
         //when
+        sleep(TIMEOUT_CONSUMPTION_SLEEP_MS);
         List next = cursor.next();
 
         //then
         assertEquals(RESULT_FROM_NEW_CURSOR, next);
-        verify(timeoutContext, times(1)).resetTimeoutIfPresent();
-        verify(commandBatchCursor, times(1)).next();
-        verify(commandBatchCursor, atLeastOnce()).getPostBatchResumeToken();
+        assertTimeoutWasRefreshedForOperation(operationContextCaptor ->
+                verify(newCoreCursor).next(operationContextCaptor.capture()));
+        verify(coreCursor, times(1)).next(any());
+        verify(coreCursor, atLeastOnce()).getPostBatchResumeToken();
         verifyResumeAttemptCalled();
         verify(changeStreamOperation, times(1)).getDecoder();
-        verify(newCommandBatchCursor, times(1)).next();
-        verify(newCommandBatchCursor, atLeastOnce()).getPostBatchResumeToken();
-        verifyNoMoreInteractions(newCommandBatchCursor);
+        verify(newCoreCursor, times(1)).next(any());
+        verify(newCoreCursor, atLeastOnce()).getPostBatchResumeToken();
+
+        verifyNoMoreInteractions(newCoreCursor);
         verifyNoMoreInteractions(changeStreamOperation);
     }
 
@@ -130,45 +190,50 @@ void shouldPerformResumeAttemptOnNextWhenResumableErrorIsThrown() {
     @Test
     @DisplayName("should resume only once on subsequent calls after timeout error")
     void shouldResumeOnlyOnceOnSubsequentCallsAfterTimeoutError() {
-        when(commandBatchCursor.next()).thenThrow(new MongoOperationTimeoutException("timeout"));
+        when(coreCursor.next(any())).thenThrow(new MongoOperationTimeoutException("timeout"));
         ChangeStreamBatchCursor cursor = createChangeStreamCursor();
         //when
         assertThrows(MongoOperationTimeoutException.class, cursor::next);
 
         //then
-        verify(timeoutContext, times(1)).resetTimeoutIfPresent();
-        verify(commandBatchCursor, times(1)).next();
-        verify(commandBatchCursor, atLeastOnce()).getPostBatchResumeToken();
-        verifyNoMoreInteractions(commandBatchCursor);
+        assertTimeoutWasRefreshedForOperation(operationContextCaptor ->
+                verify(coreCursor).next(operationContextCaptor.capture()));
+        verify(coreCursor, times(1)).next(any());
+        verify(coreCursor, atLeastOnce()).getPostBatchResumeToken();
+        verifyNoMoreInteractions(coreCursor);
         verifyNoResumeAttemptCalled();
-        clearInvocations(commandBatchCursor, newCommandBatchCursor, timeoutContext, changeStreamOperation, readBinding);
+        clearInvocations(coreCursor, newCoreCursor, timeoutContext, changeStreamOperation, readBinding);
 
         //when seconds next is called. Resume is attempted.
+        sleep(TIMEOUT_CONSUMPTION_SLEEP_MS);
         List next = cursor.next();
 
         //then
         assertEquals(Collections.emptyList(), next);
-        verify(timeoutContext, times(1)).resetTimeoutIfPresent();
-        verify(commandBatchCursor, times(1)).close();
-        verifyNoMoreInteractions(commandBatchCursor);
+        verify(coreCursor, times(1)).close(any());
+        verifyNoMoreInteractions(coreCursor);
+        assertTimeoutWasRefreshedForOperation(operationContextCaptor ->
+                verify(newCoreCursor).next(operationContextCaptor.capture()));
         verify(changeStreamOperation).setChangeStreamOptionsForResume(resumeToken, maxWireVersion);
         verify(changeStreamOperation, times(1)).getDecoder();
-        verify(changeStreamOperation, times(1)).execute(readBinding);
+        verify(changeStreamOperation, times(1)).execute(eq(readBinding), any());
         verifyNoMoreInteractions(changeStreamOperation);
-        verify(newCommandBatchCursor, times(1)).next();
-        verify(newCommandBatchCursor, atLeastOnce()).getPostBatchResumeToken();
-        clearInvocations(commandBatchCursor, newCommandBatchCursor, timeoutContext, changeStreamOperation, readBinding);
+        verify(newCoreCursor, times(1)).next(any());
+        verify(newCoreCursor, atLeastOnce()).getPostBatchResumeToken();
+        clearInvocations(coreCursor, newCoreCursor, timeoutContext, changeStreamOperation, readBinding);
 
         //when third next is called. No resume is attempted.
+        sleep(TIMEOUT_CONSUMPTION_SLEEP_MS);
         List next2 = cursor.next();
 
         //then
         assertEquals(Collections.emptyList(), next2);
-        verifyNoInteractions(commandBatchCursor);
-        verify(timeoutContext, times(1)).resetTimeoutIfPresent();
-        verify(newCommandBatchCursor, times(1)).next();
-        verify(newCommandBatchCursor, atLeastOnce()).getPostBatchResumeToken();
-        verifyNoMoreInteractions(newCommandBatchCursor);
+        verifyNoInteractions(coreCursor);
+        assertTimeoutWasRefreshedForOperation(operationContextCaptor ->
+                verify(newCoreCursor).next(operationContextCaptor.capture()));
+        verify(newCoreCursor, times(1)).next(any());
+        verify(newCoreCursor, atLeastOnce()).getPostBatchResumeToken();
+        verifyNoMoreInteractions(newCoreCursor);
         verify(changeStreamOperation, times(1)).getDecoder();
         verifyNoMoreInteractions(changeStreamOperation);
         verifyNoInteractions(readBinding);
@@ -178,21 +243,20 @@ void shouldResumeOnlyOnceOnSubsequentCallsAfterTimeoutError() {
     @Test
     @DisplayName("should propagate any errors occurred in aggregate operation during creating new change stream when previous next timed out")
     void shouldPropagateAnyErrorsOccurredInAggregateOperation() {
-        when(commandBatchCursor.next()).thenThrow(new MongoOperationTimeoutException("timeout"));
+        when(coreCursor.next(any())).thenThrow(new MongoOperationTimeoutException("timeout"));
         MongoNotPrimaryException resumableError = new MongoNotPrimaryException(new BsonDocument(), new ServerAddress());
-        when(changeStreamOperation.execute(readBinding)).thenThrow(resumableError);
+        when(changeStreamOperation.execute(eq(readBinding), any())).thenThrow(resumableError);
 
         ChangeStreamBatchCursor cursor = createChangeStreamCursor();
         //when
         assertThrows(MongoOperationTimeoutException.class, cursor::next);
-        clearInvocations(commandBatchCursor, newCommandBatchCursor, timeoutContext, changeStreamOperation, readBinding);
+        clearInvocations(coreCursor, newCoreCursor, timeoutContext, changeStreamOperation, readBinding);
         assertThrows(MongoNotPrimaryException.class, cursor::next);
 
         //then
-        verify(timeoutContext, times(1)).resetTimeoutIfPresent();
         verifyResumeAttemptCalled();
         verifyNoMoreInteractions(changeStreamOperation);
-        verifyNoInteractions(newCommandBatchCursor);
+        verifyNoInteractions(newCoreCursor);
     }
 
 
@@ -203,31 +267,33 @@ void shouldResumeAfterTimeoutInAggregateOnNextCall() {
         ChangeStreamBatchCursor cursor = createChangeStreamCursor();
 
         //first next operation times out on getMore
-        when(commandBatchCursor.next()).thenThrow(new MongoOperationTimeoutException("timeout during next call"));
+        when(coreCursor.next(any())).thenThrow(new MongoOperationTimeoutException("timeout during next call"));
         assertThrows(MongoOperationTimeoutException.class, cursor::next);
-        clearInvocations(commandBatchCursor, newCommandBatchCursor, timeoutContext, changeStreamOperation, readBinding);
+        clearInvocations(coreCursor, newCoreCursor, timeoutContext, changeStreamOperation, readBinding);
 
         //second next operation times out on resume attempt when creating change stream
-        when(changeStreamOperation.execute(readBinding)).thenThrow(new MongoOperationTimeoutException("timeout during resumption"));
+        when(changeStreamOperation.execute(eq(readBinding), any())).thenThrow(
+                new MongoOperationTimeoutException("timeout during resumption"));
         assertThrows(MongoOperationTimeoutException.class, cursor::next);
-        clearInvocations(commandBatchCursor, newCommandBatchCursor, timeoutContext, changeStreamOperation);
+        clearInvocations(coreCursor, newCoreCursor, timeoutContext, changeStreamOperation);
 
-        doReturn(newChangeStreamCursor).when(changeStreamOperation).execute(readBinding);
+        doReturn(newChangeStreamCursor).when(changeStreamOperation).execute(eq(readBinding), any());
 
         //when third operation succeeds to resume and call next
+        sleep(TIMEOUT_CONSUMPTION_SLEEP_MS);
         List next = cursor.next();
 
         //then
         assertEquals(RESULT_FROM_NEW_CURSOR, next);
-        verify(timeoutContext, times(1)).resetTimeoutIfPresent();
-
         verifyResumeAttemptCalled();
         verify(changeStreamOperation, times(1)).getDecoder();
         verifyNoMoreInteractions(changeStreamOperation);
 
-        verify(newCommandBatchCursor, times(1)).next();
-        verify(newCommandBatchCursor, atLeastOnce()).getPostBatchResumeToken();
-        verifyNoMoreInteractions(newCommandBatchCursor);
+        assertTimeoutWasRefreshedForOperation(operationContextCaptor ->
+                verify(newCoreCursor).next(operationContextCaptor.capture()));
+        verify(newCoreCursor, times(1)).next(any());
+        verify(newCoreCursor, atLeastOnce()).getPostBatchResumeToken();
+        verifyNoMoreInteractions(newCoreCursor);
     }
 
     @Test
@@ -237,51 +303,49 @@ void shouldCloseChangeStreamWhenResumeOperationFailsDueToNonTimeoutError() {
         ChangeStreamBatchCursor cursor = createChangeStreamCursor();
 
         //first next operation times out on getMore
-        when(commandBatchCursor.next()).thenThrow(new MongoOperationTimeoutException("timeout during next call"));
+        when(coreCursor.next(any())).thenThrow(new MongoOperationTimeoutException("timeout during next call"));
         assertThrows(MongoOperationTimeoutException.class, cursor::next);
-        clearInvocations(commandBatchCursor, newCommandBatchCursor, timeoutContext, changeStreamOperation, readBinding);
+        clearInvocations(coreCursor, newCoreCursor, timeoutContext, changeStreamOperation, readBinding);
 
         //when second next operation errors on resume attempt when creating change stream
-        when(changeStreamOperation.execute(readBinding)).thenThrow(new MongoNotPrimaryException(new BsonDocument(), new ServerAddress()));
+        when(changeStreamOperation.execute(eq(readBinding), any())).thenThrow(
+                new MongoNotPrimaryException(new BsonDocument(), new ServerAddress()));
         assertThrows(MongoNotPrimaryException.class, cursor::next);
 
         //then
-        verify(timeoutContext, times(1)).resetTimeoutIfPresent();
         verifyResumeAttemptCalled();
         verifyNoMoreInteractions(changeStreamOperation);
-        verifyNoInteractions(newCommandBatchCursor);
-        clearInvocations(commandBatchCursor, newCommandBatchCursor, timeoutContext, changeStreamOperation, readBinding);
-
+        verifyNoInteractions(newCoreCursor);
+        clearInvocations(coreCursor, newCoreCursor, timeoutContext, changeStreamOperation, readBinding);
 
         //when third next operation errors with cursor closed exception
-        doThrow(new IllegalStateException(MESSAGE_IF_CLOSED_AS_CURSOR)).when(commandBatchCursor).next();
+        doThrow(new IllegalStateException(MESSAGE_IF_CLOSED_AS_CURSOR)).when(coreCursor).next(any());
         MongoException mongoException = assertThrows(MongoException.class, cursor::next);
 
         //then
         assertEquals(MESSAGE_IF_CLOSED_AS_CURSOR, mongoException.getMessage());
-        verify(timeoutContext, times(1)).resetTimeoutIfPresent();
         verifyNoResumeAttemptCalled();
     }
 
     private ChangeStreamBatchCursor createChangeStreamCursor() {
         ChangeStreamBatchCursor cursor =
-                new ChangeStreamBatchCursor<>(changeStreamOperation, commandBatchCursor, readBinding, null, maxWireVersion);
-        clearInvocations(commandBatchCursor, newCommandBatchCursor, timeoutContext, changeStreamOperation, readBinding);
+                new ChangeStreamBatchCursor<>(changeStreamOperation, coreCursor, readBinding, operationContext, null, maxWireVersion);
+        clearInvocations(coreCursor, newCoreCursor, timeoutContext, changeStreamOperation, readBinding);
         return cursor;
     }
 
     private void verifyNoResumeAttemptCalled() {
         verifyNoInteractions(changeStreamOperation);
-        verifyNoInteractions(newCommandBatchCursor);
+        verifyNoInteractions(newCoreCursor);
         verifyNoInteractions(readBinding);
     }
 
 
     private void verifyResumeAttemptCalled() {
-        verify(commandBatchCursor, times(1)).close();
+        verify(coreCursor, times(1)).close(any());
         verify(changeStreamOperation).setChangeStreamOptionsForResume(resumeToken, maxWireVersion);
-        verify(changeStreamOperation, times(1)).execute(readBinding);
-        verifyNoMoreInteractions(commandBatchCursor);
+        verify(changeStreamOperation, times(1)).execute(eq(readBinding), any());
+        verifyNoMoreInteractions(coreCursor);
     }
 
     @BeforeEach
@@ -291,42 +355,76 @@ void setUp() {
         serverDescription = mock(ServerDescription.class);
         when(serverDescription.getMaxWireVersion()).thenReturn(maxWireVersion);
 
-        timeoutContext = mock(TimeoutContext.class);
+        timeoutContext = spy(new TimeoutContext(new TimeoutSettings(
+                10, 10, 10, TIMEOUT_MILLISECONDS, 0
+        )));
         when(timeoutContext.hasTimeoutMS()).thenReturn(true);
-        doNothing().when(timeoutContext).resetTimeoutIfPresent();
 
-        operationContext = mock(OperationContext.class);
-        when(operationContext.getTimeoutContext()).thenReturn(timeoutContext);
+        operationContext = spy(new OperationContext(
+                IgnorableRequestContext.INSTANCE,
+                NoOpSessionContext.INSTANCE,
+                timeoutContext,
+                null));
+
         connection = mock(Connection.class);
         when(connection.command(any(), any(), any(), any(), any(), any())).thenReturn(null);
         connectionSource = mock(ConnectionSource.class);
-        when(connectionSource.getConnection()).thenReturn(connection);
+        when(connectionSource.getConnection(any())).thenReturn(connection);
         when(connectionSource.release()).thenReturn(1);
         when(connectionSource.getServerDescription()).thenReturn(serverDescription);
 
         readBinding = mock(ReadBinding.class);
-        when(readBinding.getOperationContext()).thenReturn(operationContext);
         when(readBinding.retain()).thenReturn(readBinding);
         when(readBinding.release()).thenReturn(1);
-        when(readBinding.getReadConnectionSource()).thenReturn(connectionSource);
+        when(readBinding.getReadConnectionSource(any())).thenReturn(connectionSource);
 
 
-        commandBatchCursor = mock(CommandBatchCursor.class);
-        when(commandBatchCursor.getPostBatchResumeToken()).thenReturn(resumeToken);
-        doNothing().when(commandBatchCursor).close();
+        coreCursor = mock(CoreCursor.class);
+        when(coreCursor.getPostBatchResumeToken()).thenReturn(resumeToken);
+        doNothing().when(coreCursor).close(any());
 
-        newCommandBatchCursor = mock(CommandBatchCursor.class);
-        when(newCommandBatchCursor.getPostBatchResumeToken()).thenReturn(resumeToken);
-        when(newCommandBatchCursor.next()).thenReturn(RESULT_FROM_NEW_CURSOR);
-        doNothing().when(newCommandBatchCursor).close();
+        newCoreCursor = mock(CoreCursor.class);
+        when(newCoreCursor.getPostBatchResumeToken()).thenReturn(resumeToken);
+        when(newCoreCursor.next(any())).thenReturn(RESULT_FROM_NEW_CURSOR);
+        doNothing().when(newCoreCursor).close(any());
 
         newChangeStreamCursor = mock(ChangeStreamBatchCursor.class);
-        when(newChangeStreamCursor.getWrapped()).thenReturn(newCommandBatchCursor);
+        when(newChangeStreamCursor.getWrapped()).thenReturn(newCoreCursor);
 
         changeStreamOperation = mock(ChangeStreamOperation.class);
         when(changeStreamOperation.getDecoder()).thenReturn(new DocumentCodec());
         doNothing().when(changeStreamOperation).setChangeStreamOptionsForResume(resumeToken, maxWireVersion);
-        when(changeStreamOperation.execute(readBinding)).thenReturn(newChangeStreamCursor);
+        when(changeStreamOperation.execute(eq(readBinding), any())).thenReturn(newChangeStreamCursor);
     }
 
+
+    private void assertTimeoutWasRefreshedForOperation(final TimeoutContext timeoutContextUsedForOperation) {
+        assertNotNull(timeoutContextUsedForOperation.getTimeout(), "TimeoutMs was not set");
+        timeoutContextUsedForOperation.getTimeout().run(TimeUnit.MILLISECONDS, () -> {
+                    Assertions.fail("Non-infinite timeout was not expected to be refreshed to infinity");
+                },
+                (remainingMs) -> {
+                    int allowedDifference = 20;
+                    boolean originalAndRefreshedTimeoutDifference = TIMEOUT_MILLISECONDS - remainingMs < allowedDifference;
+                    assertTrue(originalAndRefreshedTimeoutDifference, format("Timeout was expected to be refreshed "
+                                    + "to original timeout: %d, but remaining time was: %d. Allowed difference was: %d ",
+                            TIMEOUT_MILLISECONDS,
+                            remainingMs,
+                            allowedDifference));
+                },
+                () -> {
+                    Assertions.fail("Timeout was expected to be refreshed");
+                });
+    }
+
+    private void assertTimeoutWasRefreshedForOperation(final Consumer> capturerConsumer) {
+        assertTimeoutWasRefreshedForOperation(captureTimeoutContext(capturerConsumer));
+    }
+
+    private static TimeoutContext captureTimeoutContext(final Consumer> capturerConsumer) {
+        ArgumentCaptor operationContextCaptor = ArgumentCaptor.forClass(OperationContext.class);
+        capturerConsumer.accept(operationContextCaptor);
+        TimeoutContext timeoutContextUsedForOperation = operationContextCaptor.getValue().getTimeoutContext();
+        return timeoutContextUsedForOperation;
+    }
 }
diff --git a/driver-core/src/test/unit/com/mongodb/internal/operation/CommandBatchCursorSpecification.groovy b/driver-core/src/test/unit/com/mongodb/internal/operation/CommandBatchCursorSpecification.groovy
index c95a119134a..c81c9ad759c 100644
--- a/driver-core/src/test/unit/com/mongodb/internal/operation/CommandBatchCursorSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/internal/operation/CommandBatchCursorSpecification.groovy
@@ -30,10 +30,12 @@ import com.mongodb.connection.ServerConnectionState
 import com.mongodb.connection.ServerDescription
 import com.mongodb.connection.ServerType
 import com.mongodb.connection.ServerVersion
+import com.mongodb.internal.IgnorableRequestContext
 import com.mongodb.internal.TimeoutContext
 import com.mongodb.internal.TimeoutSettings
 import com.mongodb.internal.binding.ConnectionSource
 import com.mongodb.internal.connection.Connection
+import com.mongodb.internal.connection.NoOpSessionContext
 import com.mongodb.internal.connection.OperationContext
 import org.bson.BsonArray
 import org.bson.BsonDocument
@@ -58,7 +60,8 @@ class CommandBatchCursorSpecification extends Specification {
         def initialConnection = referenceCountedConnection()
         def connection = referenceCountedConnection()
         def connectionSource = getConnectionSource(connection)
-        def timeoutContext = connectionSource.getOperationContext().getTimeoutContext()
+        def operationContext = getOperationContext()
+        def timeoutContext = operationContext.getTimeoutContext()
 
         def firstBatch = createCommandResult([])
         def expectedCommand = new BsonDocument('getMore': new BsonInt64(CURSOR_ID))
@@ -70,11 +73,11 @@ class CommandBatchCursorSpecification extends Specification {
         def reply =  getMoreResponse([], 0)
 
         when:
-        def cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, firstBatch, batchSize, maxTimeMS, CODEC,
-                null, connectionSource, initialConnection)
+        def commandCoreCursor = new CommandCoreCursor<>(firstBatch, batchSize, CODEC, null, connectionSource, initialConnection)
+        def cursor = new CommandBatchCursor(TimeoutMode.CURSOR_LIFETIME, maxTimeMS, operationContext, commandCoreCursor)
 
         then:
-        1 * timeoutContext.setMaxTimeOverride(*_)
+        1 * timeoutContext.withMaxTimeOverride(*_)
 
         when:
         cursor.hasNext()
@@ -83,7 +86,7 @@ class CommandBatchCursorSpecification extends Specification {
         1 * connection.command(NAMESPACE.getDatabaseName(), expectedCommand, *_) >>  reply
 
         then:
-        !cursor.isClosed()
+        !commandCoreCursor.isClosed()
 
         when:
         cursor.close()
@@ -106,8 +109,8 @@ class CommandBatchCursorSpecification extends Specification {
         def serverVersion = new ServerVersion([3, 6, 0])
         def connection = referenceCountedConnection(serverVersion)
         def connectionSource = getConnectionSource(connection)
-        def cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, firstBatch, 0, 0, CODEC,
-                null, connectionSource, initialConnection)
+        def commandCoreCursor = new CommandCoreCursor<>(firstBatch, 0, CODEC, null, connectionSource, initialConnection)
+        def cursor = new CommandBatchCursor(TimeoutMode.CURSOR_LIFETIME, 0, operationContext, commandCoreCursor)
 
         when:
         cursor.close()
@@ -134,8 +137,8 @@ class CommandBatchCursorSpecification extends Specification {
 
         when:
         def firstBatch = createCommandResult(FIRST_BATCH, 0)
-        def cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, firstBatch, 0, 0, CODEC,
-                null, connectionSource, initialConnection)
+        def commandCoreCursor = new CommandCoreCursor<>(firstBatch, 0, CODEC, null, connectionSource, initialConnection)
+        def cursor = new CommandBatchCursor(TimeoutMode.CURSOR_LIFETIME, 0, operationContext, commandCoreCursor)
 
         then:
         cursor.next() == FIRST_BATCH
@@ -146,7 +149,7 @@ class CommandBatchCursorSpecification extends Specification {
 
         then:
         // Unlike the AsyncCommandBatchCursor - the cursor isn't automatically closed
-        !cursor.isClosed()
+        !commandCoreCursor.isClosed()
     }
 
     def 'should handle getMore when there are empty results but there is a cursor'() {
@@ -158,8 +161,8 @@ class CommandBatchCursorSpecification extends Specification {
 
         when:
         def firstBatch = createCommandResult([], CURSOR_ID)
-        def cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, firstBatch, 0, 0, CODEC,
-                null, connectionSource, initialConnection)
+        def commandCoreCursor = new CommandCoreCursor<>(firstBatch, 0, CODEC, null, connectionSource, initialConnection)
+        def cursor = new CommandBatchCursor(TimeoutMode.CURSOR_LIFETIME, 0, operationContext, commandCoreCursor)
         def batch = cursor.next()
 
         then:
@@ -212,8 +215,8 @@ class CommandBatchCursorSpecification extends Specification {
         def firstBatch = createCommandResult()
 
         when:
-        def cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, firstBatch, 0, 0, CODEC,
-                null, connectionSource, initialConnection)
+        def commandCoreCursor = new CommandCoreCursor<>(firstBatch, 0, CODEC, null, connectionSource, initialConnection)
+        def cursor = new CommandBatchCursor(TimeoutMode.CURSOR_LIFETIME, 0, operationContext, commandCoreCursor)
         List batch = cursor.next()
 
         then:
@@ -245,7 +248,7 @@ class CommandBatchCursorSpecification extends Specification {
         connectionB.getCount() == 0
         initialConnection.getCount() == 0
         connectionSource.getCount() == 0
-        cursor.isClosed()
+        commandCoreCursor.isClosed()
 
         where:
         serverType               | responseCursorId
@@ -264,8 +267,9 @@ class CommandBatchCursorSpecification extends Specification {
         def connectionSource = getConnectionSource(connectionA, connectionB)
 
         when:
-        def cursor = new CommandBatchCursor(TimeoutMode.CURSOR_LIFETIME, createCommandResult(FIRST_BATCH, 42), 0, 0, CODEC,
+        def commandCoreCursor = new CommandCoreCursor<>(createCommandResult(FIRST_BATCH, 42), 0, CODEC,
                 null, connectionSource, initialConnection)
+        def cursor = new CommandBatchCursor(TimeoutMode.CURSOR_LIFETIME, 0, operationContext, commandCoreCursor)
         def batch = cursor.next()
 
         then:
@@ -300,8 +304,8 @@ class CommandBatchCursorSpecification extends Specification {
         def firstBatch = createCommandResult()
 
         when:
-        def cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, firstBatch, 0, 0, CODEC,
-                null, connectionSource, initialConnection)
+        def commandCoreCursor = new CommandCoreCursor<>(firstBatch, 0, CODEC, null, connectionSource, initialConnection)
+        def cursor = new CommandBatchCursor(TimeoutMode.CURSOR_LIFETIME, 0, operationContext, commandCoreCursor)
         def batch = cursor.next()
 
         then:
@@ -328,7 +332,7 @@ class CommandBatchCursorSpecification extends Specification {
 
         then:
         connectionA.getCount() == 0
-        cursor.isClosed()
+        commandCoreCursor.isClosed()
 
         where:
         serverType << [ServerType.LOAD_BALANCER, ServerType.STANDALONE]
@@ -339,14 +343,14 @@ class CommandBatchCursorSpecification extends Specification {
         def initialConnection = referenceCountedConnection()
         def connectionSource = getConnectionSourceWithResult(ServerType.STANDALONE) { throw MONGO_EXCEPTION }
         def firstBatch = createCommandResult()
-        def cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, firstBatch, 0, 0, CODEC,
-                null, connectionSource, initialConnection)
+        def commandCoreCursor = new CommandCoreCursor<>(firstBatch, 0, CODEC, null, connectionSource, initialConnection)
+        def cursor = new CommandBatchCursor(TimeoutMode.CURSOR_LIFETIME, 0, operationContext, commandCoreCursor)
 
         when:
         cursor.close()
 
         then:
-        cursor.isClosed()
+        commandCoreCursor.isClosed()
         initialConnection.getCount() == 0
         connectionSource.getCount() == 0
     }
@@ -360,8 +364,8 @@ class CommandBatchCursorSpecification extends Specification {
 
         when:
         def firstBatch = createCommandResult()
-        def cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, firstBatch, 0, 0, CODEC,
-                null, connectionSource, initialConnection)
+        def commandCoreCursor = new CommandCoreCursor<>(firstBatch, 0, CODEC, null, connectionSource, initialConnection)
+        def cursor = new CommandBatchCursor(TimeoutMode.CURSOR_LIFETIME, 0, operationContext, commandCoreCursor)
 
         then:
         cursor.next()
@@ -387,9 +391,8 @@ class CommandBatchCursorSpecification extends Specification {
 
         when:
         def firstBatch = createCommandResult()
-        def cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, firstBatch, 0, 0, CODEC,
-                null, connectionSource, initialConnection)
-
+        def commandCoreCursor = new CommandCoreCursor<>(firstBatch, 0, CODEC, null, connectionSource, initialConnection)
+        def cursor = new CommandBatchCursor(TimeoutMode.CURSOR_LIFETIME, 0, operationContext, commandCoreCursor)
         then:
         connectionSource.getCount() == 1
 
@@ -442,13 +445,13 @@ class CommandBatchCursorSpecification extends Specification {
         }
         def connectionSource = Stub(ConnectionSource) {
             getServerApi() >> null
-            getConnection() >> { connection }
+            getConnection(_) >> { connection }
         }
         connectionSource.retain() >> connectionSource
 
         def initialResults = createCommandResult([])
-        def cursor = new CommandBatchCursor(TimeoutMode.CURSOR_LIFETIME, initialResults, 2, 100, CODEC,
-                null, connectionSource, initialConnection)
+        def commandCoreCursor = new CommandCoreCursor<>(initialResults, 2, CODEC, null, connectionSource, initialConnection)
+        def cursor = new CommandBatchCursor(TimeoutMode.CURSOR_LIFETIME, 100, operationContext, commandCoreCursor)
 
         when:
         cursor.close()
@@ -467,14 +470,14 @@ class CommandBatchCursorSpecification extends Specification {
         given:
         def initialConnection = referenceCountedConnection()
         def connectionSource = Stub(ConnectionSource) {
-            getConnection() >> { throw new MongoSocketOpenException("can't open socket", SERVER_ADDRESS, new IOException()) }
+            getConnection(_) >> { throw new MongoSocketOpenException("can't open socket", SERVER_ADDRESS, new IOException()) }
             getServerApi() >> null
         }
         connectionSource.retain() >> connectionSource
 
         def initialResults = createCommandResult([])
-        def cursor = new CommandBatchCursor(TimeoutMode.CURSOR_LIFETIME, initialResults, 2, 100, CODEC,
-                null, connectionSource, initialConnection)
+        def commandCoreCursor = new CommandCoreCursor<>(initialResults, 2, CODEC, null, connectionSource, initialConnection)
+        def cursor = new CommandBatchCursor(TimeoutMode.CURSOR_LIFETIME, 100, operationContext, commandCoreCursor)
 
         when:
         cursor.close()
@@ -573,12 +576,7 @@ class CommandBatchCursorSpecification extends Specification {
                     .state(ServerConnectionState.CONNECTED)
                     .build()
         }
-        OperationContext operationContext = Mock(OperationContext)
-        def timeoutContext = Spy(new TimeoutContext(TimeoutSettings.create(
-                MongoClientSettings.builder().timeout(3, TimeUnit.SECONDS).build())))
-        operationContext.getTimeoutContext() >> timeoutContext
-        mock.getOperationContext() >> operationContext
-        mock.getConnection() >> {
+        mock.getConnection(_ as OperationContext) >> {
             if (counter == 0) {
                 throw new IllegalStateException('Tried to use released ConnectionSource')
             }
@@ -605,4 +603,13 @@ class CommandBatchCursorSpecification extends Specification {
         mock
     }
 
+    OperationContext getOperationContext() {
+        def timeoutContext = Spy(new TimeoutContext(TimeoutSettings.create(
+                MongoClientSettings.builder().timeout(3, TimeUnit.SECONDS).build())))
+        Spy(new OperationContext(
+                IgnorableRequestContext.INSTANCE,
+                NoOpSessionContext.INSTANCE,
+                timeoutContext, null))
+    }
+
 }
diff --git a/driver-core/src/test/unit/com/mongodb/internal/operation/CommandBatchCursorTest.java b/driver-core/src/test/unit/com/mongodb/internal/operation/CommandBatchCursorTest.java
index c3bec291432..78f65e04328 100644
--- a/driver-core/src/test/unit/com/mongodb/internal/operation/CommandBatchCursorTest.java
+++ b/driver-core/src/test/unit/com/mongodb/internal/operation/CommandBatchCursorTest.java
@@ -17,216 +17,159 @@
 package com.mongodb.internal.operation;
 
 import com.mongodb.MongoClientSettings;
-import com.mongodb.MongoNamespace;
-import com.mongodb.MongoOperationTimeoutException;
-import com.mongodb.MongoSocketException;
-import com.mongodb.ServerAddress;
 import com.mongodb.client.cursor.TimeoutMode;
-import com.mongodb.connection.ConnectionDescription;
-import com.mongodb.connection.ServerDescription;
-import com.mongodb.connection.ServerType;
-import com.mongodb.connection.ServerVersion;
+import com.mongodb.internal.IgnorableRequestContext;
 import com.mongodb.internal.TimeoutContext;
 import com.mongodb.internal.TimeoutSettings;
-import com.mongodb.internal.binding.ConnectionSource;
-import com.mongodb.internal.connection.Connection;
+import com.mongodb.internal.connection.NoOpSessionContext;
 import com.mongodb.internal.connection.OperationContext;
-import org.bson.BsonArray;
-import org.bson.BsonDocument;
-import org.bson.BsonInt32;
-import org.bson.BsonInt64;
-import org.bson.BsonString;
 import org.bson.Document;
-import org.bson.codecs.Decoder;
-import org.bson.codecs.DocumentCodec;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
+import org.mockito.ArgumentCaptor;
 
 import java.time.Duration;
 
-import static com.mongodb.internal.operation.OperationUnitSpecification.getMaxWireVersionForServerVersion;
-import static com.mongodb.internal.thread.InterruptionUtil.interruptAndCreateMongoInterruptedException;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.argThat;
-import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
 
 class CommandBatchCursorTest {
-
-    private static final MongoNamespace NAMESPACE = new MongoNamespace("test", "test");
-    private static final BsonInt64 CURSOR_ID = new BsonInt64(1);
-    private static final BsonDocument COMMAND_CURSOR_DOCUMENT = new BsonDocument("ok", new BsonInt32(1))
-            .append("cursor",
-                    new BsonDocument("ns", new BsonString(NAMESPACE.getFullName()))
-                            .append("id", CURSOR_ID)
-                            .append("firstBatch", new BsonArrayWrapper<>(new BsonArray())));
-
-    private static final Decoder DOCUMENT_CODEC = new DocumentCodec();
     private static final Duration TIMEOUT = Duration.ofMillis(3_000);
-
-    private Connection mockConnection;
-    private ConnectionDescription mockDescription;
-    private ConnectionSource connectionSource;
     private OperationContext operationContext;
     private TimeoutContext timeoutContext;
-    private ServerDescription serverDescription;
+    private CoreCursor coreCursor;
 
     @BeforeEach
     void setUp() {
-        ServerVersion serverVersion = new ServerVersion(3, 6);
-
-        mockConnection = mock(Connection.class, "connection");
-        mockDescription = mock(ConnectionDescription.class);
-        when(mockDescription.getMaxWireVersion()).thenReturn(getMaxWireVersionForServerVersion(serverVersion.getVersionList()));
-        when(mockDescription.getServerType()).thenReturn(ServerType.LOAD_BALANCER);
-        when(mockConnection.getDescription()).thenReturn(mockDescription);
-        when(mockConnection.retain()).thenReturn(mockConnection);
-
-        connectionSource = mock(ConnectionSource.class);
-        operationContext = mock(OperationContext.class);
-        timeoutContext = new TimeoutContext(TimeoutSettings.create(
-                MongoClientSettings.builder().timeout(TIMEOUT.toMillis(), MILLISECONDS).build()));
-        serverDescription = mock(ServerDescription.class);
-        when(operationContext.getTimeoutContext()).thenReturn(timeoutContext);
-        when(connectionSource.getOperationContext()).thenReturn(operationContext);
-        when(connectionSource.getConnection()).thenReturn(mockConnection);
-        when(connectionSource.getServerDescription()).thenReturn(serverDescription);
-    }
-
-
-    @Test
-    void shouldSkipKillsCursorsCommandWhenNetworkErrorOccurs() {
-        //given
-        when(mockConnection.command(eq(NAMESPACE.getDatabaseName()), any(), any(), any(), any(), any())).thenThrow(
-                new MongoSocketException("test", new ServerAddress()));
-        when(serverDescription.getType()).thenReturn(ServerType.LOAD_BALANCER);
-
-        CommandBatchCursor commandBatchCursor = createBatchCursor(0);
-        //when
-        assertThrows(MongoSocketException.class, commandBatchCursor::next);
-
-        //then
-        commandBatchCursor.close();
-        verify(mockConnection, times(1)).command(eq(NAMESPACE.getDatabaseName()), any(), any(), any(), any(), any());
+        coreCursor = mock(CoreCursor.class);
+        timeoutContext = spy(new TimeoutContext(TimeoutSettings.create(
+                MongoClientSettings.builder().timeout(TIMEOUT.toMillis(), MILLISECONDS).build())));
+        operationContext = spy(new OperationContext(
+                IgnorableRequestContext.INSTANCE,
+                NoOpSessionContext.INSTANCE,
+                timeoutContext,
+                null));
     }
 
     private CommandBatchCursor createBatchCursor(final long maxTimeMS) {
         return new CommandBatchCursor<>(
                 TimeoutMode.CURSOR_LIFETIME,
-                COMMAND_CURSOR_DOCUMENT,
-                0,
                 maxTimeMS,
-                DOCUMENT_CODEC,
-                null,
-                connectionSource,
-                mockConnection);
+                operationContext,
+                coreCursor);
     }
 
     @Test
-    void shouldNotSkipKillsCursorsCommandWhenTimeoutExceptionDoesNotHaveNetworkErrorCause() {
+    @SuppressWarnings("try")
+    void nextShouldUseTimeoutContextWithMaxTimeOverride() {
         //given
-        when(mockConnection.command(eq(NAMESPACE.getDatabaseName()), any(), any(), any(), any(), any())).thenThrow(
-                new MongoOperationTimeoutException("test"));
-        when(serverDescription.getType()).thenReturn(ServerType.LOAD_BALANCER);
+        long maxTimeMS = 10;
+        com.mongodb.assertions.Assertions.assertTrue(maxTimeMS < TIMEOUT.toMillis());
 
-        CommandBatchCursor commandBatchCursor = createBatchCursor(0);
+        try (CommandBatchCursor commandBatchCursor = createBatchCursor(maxTimeMS)) {
 
-        //when
-        assertThrows(MongoOperationTimeoutException.class, commandBatchCursor::next);
+            //when
+            commandBatchCursor.next();
 
-        commandBatchCursor.close();
+            // then verify that the `maxTimeMS` override was applied
+            ArgumentCaptor operationContextArgumentCaptor = ArgumentCaptor.forClass(OperationContext.class);
+            verify(coreCursor).next(operationContextArgumentCaptor.capture());
+            OperationContext operationContextForNext = operationContextArgumentCaptor.getValue();
+            operationContextForNext.getTimeoutContext()
+                    .runMaxTimeMS(remainingMillis -> assertEquals(maxTimeMS, remainingMillis, "MaxTieMs override not applied"));
+        }
+    }
 
+    @Test
+    @SuppressWarnings("try")
+    void tryNextShouldUseTimeoutContextWithMaxTimeOverride() {
+        //given
+        long maxTimeMS = 10;
+        com.mongodb.assertions.Assertions.assertTrue(maxTimeMS < TIMEOUT.toMillis());
+
+        try (CommandBatchCursor commandBatchCursor = createBatchCursor(maxTimeMS)) {
 
-        //then
-        verify(mockConnection, times(2)).command(any(),
-                any(), any(), any(), any(), any());
-        verify(mockConnection, times(1)).command(eq(NAMESPACE.getDatabaseName()),
-                argThat(bsonDocument -> bsonDocument.containsKey("getMore")), any(), any(), any(), any());
-        verify(mockConnection, times(1)).command(eq(NAMESPACE.getDatabaseName()),
-                argThat(bsonDocument -> bsonDocument.containsKey("killCursors")), any(), any(), any(), any());
+            //when
+            commandBatchCursor.tryNext();
+
+            // then verify that the `maxTimeMS` override was applied
+            ArgumentCaptor operationContextArgumentCaptor = ArgumentCaptor.forClass(OperationContext.class);
+            verify(coreCursor).tryNext(operationContextArgumentCaptor.capture());
+            OperationContext operationContextForNext = operationContextArgumentCaptor.getValue();
+            operationContextForNext.getTimeoutContext()
+                    .runMaxTimeMS(remainingMillis -> assertEquals(maxTimeMS, remainingMillis, "MaxTieMs override not applied"));
+        }
     }
 
     @Test
-    void shouldSkipKillsCursorsCommandWhenTimeoutExceptionHaveNetworkErrorCause() {
+    @SuppressWarnings("try")
+    void nextShouldNotUseTimeoutContextWithMaxTimeOverride() {
         //given
-        when(mockConnection.command(eq(NAMESPACE.getDatabaseName()), any(), any(), any(), any(), any())).thenThrow(
-                new MongoOperationTimeoutException("test", new MongoSocketException("test", new ServerAddress())));
-        when(serverDescription.getType()).thenReturn(ServerType.LOAD_BALANCER);
-
-        CommandBatchCursor commandBatchCursor = createBatchCursor(0);
-
-        //when
-        assertThrows(MongoOperationTimeoutException.class, commandBatchCursor::next);
-        commandBatchCursor.close();
-
-        //then
-        verify(mockConnection, times(1)).command(any(),
-                any(), any(), any(), any(), any());
-        verify(mockConnection, times(1)).command(eq(NAMESPACE.getDatabaseName()),
-                argThat(bsonDocument -> bsonDocument.containsKey("getMore")), any(), any(), any(), any());
-        verify(mockConnection, never()).command(eq(NAMESPACE.getDatabaseName()),
-                argThat(bsonDocument -> bsonDocument.containsKey("killCursors")), any(), any(), any(), any());
+        int maxTimeMS = 0;
+        try (CommandBatchCursor commandBatchCursor = createBatchCursor(maxTimeMS)) {
+
+            //when
+            commandBatchCursor.next();
+
+            // then verify that the `maxTimeMS` override was not applied
+            ArgumentCaptor operationContextArgumentCaptor = ArgumentCaptor.forClass(OperationContext.class);
+            verify(coreCursor).next(operationContextArgumentCaptor.capture());
+            OperationContext operationContextForNext = operationContextArgumentCaptor.getValue();
+            operationContextForNext.getTimeoutContext().runMaxTimeMS(remainingMillis -> {
+                // verify that the `maxTimeMS` override was reset
+                assertTrue(remainingMillis > maxTimeMS);
+                assertTrue(remainingMillis <= TIMEOUT.toMillis());
+            });
+        }
     }
 
     @Test
     @SuppressWarnings("try")
-    void closeShouldResetTimeoutContextToDefaultMaxTime() {
-        long maxTimeMS = 10;
-        com.mongodb.assertions.Assertions.assertTrue(maxTimeMS < TIMEOUT.toMillis());
+    void tryNextShouldNotUseTimeoutContextWithMaxTimeOverride() {
+        //given
+        int maxTimeMS = 0;
         try (CommandBatchCursor commandBatchCursor = createBatchCursor(maxTimeMS)) {
-            // verify that the `maxTimeMS` override was applied
-            timeoutContext.runMaxTimeMS(remainingMillis -> assertTrue(remainingMillis <= maxTimeMS));
-        } catch (Exception e) {
-            throw new RuntimeException(e);
+
+            //when
+            commandBatchCursor.tryNext();
+
+            // then verify that the `maxTimeMS` override was not applied
+            ArgumentCaptor operationContextArgumentCaptor = ArgumentCaptor.forClass(OperationContext.class);
+            verify(coreCursor).tryNext(operationContextArgumentCaptor.capture());
+            OperationContext operationContextForNext = operationContextArgumentCaptor.getValue();
+            operationContextForNext.getTimeoutContext().runMaxTimeMS(remainingMillis -> {
+                // verify that the `maxTimeMS` override was reset
+                assertTrue(remainingMillis > maxTimeMS);
+                assertTrue(remainingMillis <= TIMEOUT.toMillis());
+            });
         }
-        timeoutContext.runMaxTimeMS(remainingMillis -> {
-            // verify that the `maxTimeMS` override was reset
-            assertTrue(remainingMillis > maxTimeMS);
-            assertTrue(remainingMillis <= TIMEOUT.toMillis());
-        });
     }
 
-    @ParameterizedTest
-    @ValueSource(booleans = {false, true})
-    void closeShouldNotResetOriginalTimeout(final boolean disableTimeoutResetWhenClosing) {
-        Duration thirdOfTimeout = TIMEOUT.dividedBy(3);
-        com.mongodb.assertions.Assertions.assertTrue(thirdOfTimeout.toMillis() > 0);
-        try (CommandBatchCursor commandBatchCursor = createBatchCursor(0)) {
-            if (disableTimeoutResetWhenClosing) {
-                commandBatchCursor.disableTimeoutResetWhenClosing();
-            }
-            try {
-                Thread.sleep(thirdOfTimeout.toMillis());
-            } catch (InterruptedException e) {
-                throw interruptAndCreateMongoInterruptedException(null, e);
-            }
-            when(mockConnection.release()).then(invocation -> {
-                Thread.sleep(thirdOfTimeout.toMillis());
-                return null;
+    @ParameterizedTest(name = "closeShouldResetTimeoutContextToDefaultMaxTime with maxTimeMS={0}")
+    @SuppressWarnings("try")
+    @ValueSource(ints = {10, 0})
+    void closeShouldResetTimeoutContextToDefaultMaxTime(final int maxTimeMS) {
+        //given
+        try (CommandBatchCursor commandBatchCursor = createBatchCursor(maxTimeMS)) {
+
+            //when
+            commandBatchCursor.close();
+
+            // then verify that the `maxTimeMS` override was not applied
+            ArgumentCaptor operationContextArgumentCaptor = ArgumentCaptor.forClass(OperationContext.class);
+            verify(coreCursor).close(operationContextArgumentCaptor.capture());
+            OperationContext operationContextForNext = operationContextArgumentCaptor.getValue();
+            operationContextForNext.getTimeoutContext().runMaxTimeMS(remainingMillis -> {
+                // verify that the `maxTimeMS` override was reset
+                assertTrue(remainingMillis > maxTimeMS);
+                assertTrue(remainingMillis <= TIMEOUT.toMillis());
             });
-        } catch (Exception e) {
-            throw new RuntimeException(e);
         }
-        verify(mockConnection, times(1)).release();
-        // at this point at least (2 * thirdOfTimeout) have passed
-        com.mongodb.assertions.Assertions.assertNotNull(timeoutContext.getTimeout()).run(
-                MILLISECONDS,
-                com.mongodb.assertions.Assertions::fail,
-                remainingMillis -> {
-                    // Verify that the original timeout has not been intact.
-                    // If `close` had reset it, we would have observed more than `thirdOfTimeout` left.
-                    assertTrue(remainingMillis <= thirdOfTimeout.toMillis());
-                },
-                Assertions::fail);
     }
 }
diff --git a/driver-core/src/test/unit/com/mongodb/internal/operation/CommandCoreCursorTest.java b/driver-core/src/test/unit/com/mongodb/internal/operation/CommandCoreCursorTest.java
new file mode 100644
index 00000000000..b6b7e22a616
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/internal/operation/CommandCoreCursorTest.java
@@ -0,0 +1,177 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.operation;
+
+import com.mongodb.MongoClientSettings;
+import com.mongodb.MongoNamespace;
+import com.mongodb.MongoOperationTimeoutException;
+import com.mongodb.MongoSocketException;
+import com.mongodb.ServerAddress;
+import com.mongodb.connection.ConnectionDescription;
+import com.mongodb.connection.ServerDescription;
+import com.mongodb.connection.ServerType;
+import com.mongodb.connection.ServerVersion;
+import com.mongodb.internal.IgnorableRequestContext;
+import com.mongodb.internal.TimeoutContext;
+import com.mongodb.internal.TimeoutSettings;
+import com.mongodb.internal.binding.ConnectionSource;
+import com.mongodb.internal.connection.Connection;
+import com.mongodb.internal.connection.NoOpSessionContext;
+import com.mongodb.internal.connection.OperationContext;
+import org.bson.BsonArray;
+import org.bson.BsonDocument;
+import org.bson.BsonInt32;
+import org.bson.BsonInt64;
+import org.bson.BsonString;
+import org.bson.Document;
+import org.bson.codecs.Decoder;
+import org.bson.codecs.DocumentCodec;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.time.Duration;
+
+import static com.mongodb.internal.operation.OperationUnitSpecification.getMaxWireVersionForServerVersion;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.argThat;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+class CommandCoreCursorTest {
+    private static final MongoNamespace NAMESPACE = new MongoNamespace("test", "test");
+    private static final BsonInt64 CURSOR_ID = new BsonInt64(1);
+    private static final BsonDocument COMMAND_CURSOR_DOCUMENT = new BsonDocument("ok", new BsonInt32(1))
+            .append("cursor",
+                    new BsonDocument("ns", new BsonString(NAMESPACE.getFullName()))
+                            .append("id", CURSOR_ID)
+                            .append("firstBatch", new BsonArrayWrapper<>(new BsonArray())));
+
+    private static final Decoder DOCUMENT_CODEC = new DocumentCodec();
+    private static final Duration TIMEOUT = Duration.ofMillis(3_000);
+
+    private Connection mockConnection;
+    private ConnectionDescription mockDescription;
+    private ConnectionSource connectionSource;
+    private OperationContext operationContext;
+    private TimeoutContext timeoutContext;
+    private ServerDescription serverDescription;
+
+    @BeforeEach
+    void setUp() {
+        ServerVersion serverVersion = new ServerVersion(3, 6);
+
+        mockConnection = mock(Connection.class, "connection");
+        mockDescription = mock(ConnectionDescription.class);
+        when(mockDescription.getMaxWireVersion()).thenReturn(getMaxWireVersionForServerVersion(serverVersion.getVersionList()));
+        when(mockDescription.getServerType()).thenReturn(ServerType.LOAD_BALANCER);
+        when(mockConnection.getDescription()).thenReturn(mockDescription);
+        when(mockConnection.retain()).thenReturn(mockConnection);
+
+        connectionSource = mock(ConnectionSource.class);
+        timeoutContext = spy(new TimeoutContext(TimeoutSettings.create(
+                MongoClientSettings.builder().timeout(TIMEOUT.toMillis(), MILLISECONDS).build())));
+        operationContext = spy(new OperationContext(
+                IgnorableRequestContext.INSTANCE,
+                NoOpSessionContext.INSTANCE,
+                timeoutContext,
+                null));
+        serverDescription = mock(ServerDescription.class);
+        when(operationContext.getTimeoutContext()).thenReturn(timeoutContext);
+        when(connectionSource.getConnection(any())).thenReturn(mockConnection);
+        when(connectionSource.getServerDescription()).thenReturn(serverDescription);
+    }
+
+
+    @Test
+    void shouldSkipKillsCursorsCommandWhenNetworkErrorOccurs() {
+        //given
+        when(mockConnection.command(eq(NAMESPACE.getDatabaseName()), any(), any(), any(), any(), any())).thenThrow(
+                new MongoSocketException("test", new ServerAddress()));
+        when(serverDescription.getType()).thenReturn(ServerType.LOAD_BALANCER);
+
+        CoreCursor coreCursor = createCoreCursor();
+        //when
+        assertThrows(MongoSocketException.class, () -> coreCursor.next(operationContext));
+
+        //then
+        coreCursor.close(operationContext);
+        verify(mockConnection, times(1)).command(eq(NAMESPACE.getDatabaseName()), any(), any(), any(), any(), any());
+    }
+
+    @Test
+    void shouldNotSkipKillsCursorsCommandWhenTimeoutExceptionDoesNotHaveNetworkErrorCause() {
+        //given
+        when(mockConnection.command(eq(NAMESPACE.getDatabaseName()), any(), any(), any(), any(), any())).thenThrow(
+                new MongoOperationTimeoutException("test"));
+        when(serverDescription.getType()).thenReturn(ServerType.LOAD_BALANCER);
+
+        CoreCursor coreCursor = createCoreCursor();
+
+        //when
+        assertThrows(MongoOperationTimeoutException.class, () -> coreCursor.next(operationContext));
+
+        coreCursor.close(operationContext);
+
+
+        //then
+        verify(mockConnection, times(2)).command(any(),
+                any(), any(), any(), any(), any());
+        verify(mockConnection, times(1)).command(eq(NAMESPACE.getDatabaseName()),
+                argThat(bsonDocument -> bsonDocument.containsKey("getMore")), any(), any(), any(), any());
+        verify(mockConnection, times(1)).command(eq(NAMESPACE.getDatabaseName()),
+                argThat(bsonDocument -> bsonDocument.containsKey("killCursors")), any(), any(), any(), any());
+    }
+
+    @Test
+    void shouldSkipKillsCursorsCommandWhenTimeoutExceptionHaveNetworkErrorCause() {
+        //given
+        when(mockConnection.command(eq(NAMESPACE.getDatabaseName()), any(), any(), any(), any(), any())).thenThrow(
+                new MongoOperationTimeoutException("test", new MongoSocketException("test", new ServerAddress())));
+        when(serverDescription.getType()).thenReturn(ServerType.LOAD_BALANCER);
+
+        CoreCursor coreCursor = createCoreCursor();
+
+        //when
+        assertThrows(MongoOperationTimeoutException.class, () -> coreCursor.next(operationContext));
+        coreCursor.close(operationContext);
+
+        //then
+        verify(mockConnection, times(1)).command(any(),
+                any(), any(), any(), any(), any());
+        verify(mockConnection, times(1)).command(eq(NAMESPACE.getDatabaseName()),
+                argThat(bsonDocument -> bsonDocument.containsKey("getMore")), any(), any(), any(), any());
+        verify(mockConnection, never()).command(eq(NAMESPACE.getDatabaseName()),
+                argThat(bsonDocument -> bsonDocument.containsKey("killCursors")), any(), any(), any(), any());
+    }
+
+    private CoreCursor createCoreCursor() {
+        return new CommandCoreCursor<>(
+                COMMAND_CURSOR_DOCUMENT,
+                0,
+                DOCUMENT_CODEC,
+                null,
+                connectionSource,
+                mockConnection);
+    }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/internal/operation/CommitTransactionOperationUnitSpecification.groovy b/driver-core/src/test/unit/com/mongodb/internal/operation/CommitTransactionOperationUnitSpecification.groovy
index 21ae1c4dfb9..75ed9e6c5f3 100644
--- a/driver-core/src/test/unit/com/mongodb/internal/operation/CommitTransactionOperationUnitSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/internal/operation/CommitTransactionOperationUnitSpecification.groovy
@@ -21,8 +21,10 @@ import com.mongodb.MongoTimeoutException
 import com.mongodb.ReadConcern
 import com.mongodb.WriteConcern
 import com.mongodb.async.FutureResultCallback
+import com.mongodb.internal.async.SingleResultCallback
 import com.mongodb.internal.binding.AsyncWriteBinding
 import com.mongodb.internal.binding.WriteBinding
+import com.mongodb.internal.connection.OperationContext
 import com.mongodb.internal.session.SessionContext
 
 import static com.mongodb.ClusterFixture.OPERATION_CONTEXT
@@ -35,13 +37,12 @@ class CommitTransactionOperationUnitSpecification extends OperationUnitSpecifica
             hasActiveTransaction() >> true
         }
         def writeBinding = Stub(WriteBinding) {
-            getWriteConnectionSource() >> { throw new MongoTimeoutException('Time out!') }
-            getOperationContext() >> OPERATION_CONTEXT.withSessionContext(sessionContext)
+            getWriteConnectionSource(_) >> { throw new MongoTimeoutException('Time out!') }
         }
         def operation = new CommitTransactionOperation(WriteConcern.ACKNOWLEDGED)
 
         when:
-        operation.execute(writeBinding)
+        operation.execute(writeBinding, OPERATION_CONTEXT.withSessionContext(sessionContext))
 
         then:
         def e = thrown(MongoTimeoutException)
@@ -55,16 +56,15 @@ class CommitTransactionOperationUnitSpecification extends OperationUnitSpecifica
             hasActiveTransaction() >> true
         }
         def writeBinding = Stub(AsyncWriteBinding) {
-            getWriteConnectionSource(_) >> {
-                it[0].onResult(null, new MongoTimeoutException('Time out!'))
+            getWriteConnectionSource(_ as OperationContext, _ as SingleResultCallback) >> {
+                it[1].onResult(null, new MongoTimeoutException('Time out!'))
             }
-            getOperationContext() >> OPERATION_CONTEXT.withSessionContext(sessionContext)
         }
         def operation = new CommitTransactionOperation(WriteConcern.ACKNOWLEDGED)
         def callback = new FutureResultCallback()
 
         when:
-        operation.executeAsync(writeBinding, callback)
+        operation.executeAsync(writeBinding, OPERATION_CONTEXT.withSessionContext(sessionContext), callback)
         callback.get()
 
         then:
diff --git a/driver-core/src/test/unit/com/mongodb/internal/operation/ListCollectionsOperationTest.java b/driver-core/src/test/unit/com/mongodb/internal/operation/ListCollectionsOperationTest.java
index 12a964db625..de1bfe405ed 100644
--- a/driver-core/src/test/unit/com/mongodb/internal/operation/ListCollectionsOperationTest.java
+++ b/driver-core/src/test/unit/com/mongodb/internal/operation/ListCollectionsOperationTest.java
@@ -99,7 +99,7 @@ void authorizedCollectionsIsFalseByDefault() {
     }
 
     private BsonDocument executeOperationAndCaptureCommand() {
-        operation.execute(mocks.readBinding());
+        operation.execute(mocks.readBinding(), OPERATION_CONTEXT);
         ArgumentCaptor commandCaptor = forClass(BsonDocument.class);
         verify(mocks.connection()).command(any(), commandCaptor.capture(), any(), any(), any(), any());
         return commandCaptor.getValue();
@@ -108,9 +108,7 @@ private BsonDocument executeOperationAndCaptureCommand() {
     private static Mocks mocks(final MongoNamespace namespace) {
         Mocks result = new Mocks();
         result.readBinding(mock(ReadBinding.class, bindingMock -> {
-            when(bindingMock.getOperationContext()).thenReturn(OPERATION_CONTEXT);
             ConnectionSource connectionSource = mock(ConnectionSource.class, connectionSourceMock -> {
-                when(connectionSourceMock.getOperationContext()).thenReturn(OPERATION_CONTEXT);
                 when(connectionSourceMock.release()).thenReturn(1);
                 ServerAddress serverAddress = new ServerAddress();
                 result.connection(mock(Connection.class, connectionMock -> {
@@ -119,7 +117,7 @@ private static Mocks mocks(final MongoNamespace namespace) {
                     when(connectionMock.getDescription()).thenReturn(connectionDescription);
                     when(connectionMock.command(any(), any(), any(), any(), any(), any())).thenReturn(cursorDoc(namespace));
                 }));
-                when(connectionSourceMock.getConnection()).thenReturn(result.connection());
+                when(connectionSourceMock.getConnection(any())).thenReturn(result.connection());
                 ServerDescription serverDescription = ServerDescription.builder()
                         .address(serverAddress)
                         .type(ServerType.STANDALONE)
@@ -128,7 +126,7 @@ private static Mocks mocks(final MongoNamespace namespace) {
                 when(connectionSourceMock.getServerDescription()).thenReturn(serverDescription);
                 when(connectionSourceMock.getReadPreference()).thenReturn(ReadPreference.primary());
             });
-            when(bindingMock.getReadConnectionSource()).thenReturn(connectionSource);
+            when(bindingMock.getReadConnectionSource(any())).thenReturn(connectionSource);
         }));
         return result;
     }
diff --git a/driver-core/src/test/unit/com/mongodb/internal/operation/OperationUnitSpecification.groovy b/driver-core/src/test/unit/com/mongodb/internal/operation/OperationUnitSpecification.groovy
index 6305988116d..98d58a753a0 100644
--- a/driver-core/src/test/unit/com/mongodb/internal/operation/OperationUnitSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/internal/operation/OperationUnitSpecification.groovy
@@ -110,18 +110,15 @@ class OperationUnitSpecification extends Specification {
         }
 
         def connectionSource = Stub(ConnectionSource) {
-            getConnection() >> connection
+            getConnection(_) >> connection
             getReadPreference() >> readPreference
-            getOperationContext() >> operationContext
         }
         def readBinding = Stub(ReadBinding) {
-            getReadConnectionSource() >> connectionSource
+            getReadConnectionSource(_) >> connectionSource
             getReadPreference() >> readPreference
-            getOperationContext() >> operationContext
         }
         def writeBinding = Stub(WriteBinding) {
-            getWriteConnectionSource() >> connectionSource
-            getOperationContext() >> operationContext
+            getWriteConnectionSource(_) >> connectionSource
         }
 
         if (checkCommand) {
@@ -144,9 +141,9 @@ class OperationUnitSpecification extends Specification {
         1 * connection.release()
 
         if (operation instanceof ReadOperation) {
-            operation.execute(readBinding)
+            operation.execute(readBinding, operationContext)
         } else if (operation instanceof WriteOperation) {
-            operation.execute(writeBinding)
+            operation.execute(writeBinding, operationContext)
         }
     }
 
@@ -167,18 +164,15 @@ class OperationUnitSpecification extends Specification {
         }
 
         def connectionSource = Stub(AsyncConnectionSource) {
-            getConnection(_) >> { it[0].onResult(connection, null) }
+            getConnection(_, _) >> { it[1].onResult(connection, null) }
             getReadPreference() >> readPreference
-            getOperationContext() >> getOperationContext() >> operationContext
         }
         def readBinding = Stub(AsyncReadBinding) {
-            getReadConnectionSource(_) >> { it[0].onResult(connectionSource, null) }
+            getReadConnectionSource(_, _) >> { it[1].onResult(connectionSource, null) }
             getReadPreference() >> readPreference
-            getOperationContext() >> operationContext
         }
         def writeBinding = Stub(AsyncWriteBinding) {
-            getWriteConnectionSource(_) >> { it[0].onResult(connectionSource, null) }
-            getOperationContext() >> operationContext
+            getWriteConnectionSource(_, _) >> { it[1].onResult(connectionSource, null) }
         }
         def callback = new FutureResultCallback()
 
@@ -202,9 +196,9 @@ class OperationUnitSpecification extends Specification {
         1 * connection.release()
 
         if (operation instanceof AsyncReadOperation) {
-            operation.executeAsync(readBinding, callback)
+            operation.executeAsync(readBinding, operationContext, callback)
         } else if (operation instanceof AsyncWriteOperation) {
-            operation.executeAsync(writeBinding, callback)
+            operation.executeAsync(writeBinding, operationContext, callback)
         }
          try {
              callback.get(1000, TimeUnit.MILLISECONDS)
diff --git a/driver-core/src/test/unit/com/mongodb/internal/operation/SyncOperationHelperSpecification.groovy b/driver-core/src/test/unit/com/mongodb/internal/operation/SyncOperationHelperSpecification.groovy
index df2d54bfb9d..bd9bd2f2578 100644
--- a/driver-core/src/test/unit/com/mongodb/internal/operation/SyncOperationHelperSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/internal/operation/SyncOperationHelperSpecification.groovy
@@ -53,21 +53,19 @@ class SyncOperationHelperSpecification extends Specification {
         def connection = Mock(Connection)
         def function = Stub(CommandWriteTransformer)
         def connectionSource = Stub(ConnectionSource) {
-            getConnection() >> connection
-            getOperationContext() >> OPERATION_CONTEXT
+            getConnection(_) >> connection
         }
         def writeBinding = Stub(WriteBinding) {
-            getWriteConnectionSource() >> connectionSource
-            getOperationContext() >> OPERATION_CONTEXT
+            getWriteConnectionSource(_) >> connectionSource
         }
         def connectionDescription = Stub(ConnectionDescription)
 
         when:
-        executeCommand(writeBinding, dbName, command, decoder, function)
+        executeCommand(writeBinding, OPERATION_CONTEXT, dbName, command, decoder, function)
 
         then:
         _ * connection.getDescription() >> connectionDescription
-        1 * connection.command(dbName, command, _, primary(), decoder, OPERATION_CONTEXT) >> new BsonDocument()
+        1 * connection.command(dbName, command, _, primary(), decoder, _) >> new BsonDocument()
         1 * connection.release()
     }
 
@@ -94,24 +92,22 @@ class SyncOperationHelperSpecification extends Specification {
             }
         }
         def connectionSource = Stub(ConnectionSource) {
-            _ * getConnection() >> connection
+            _ * getConnection(_) >> connection
             _ * getServerDescription() >> Stub(ServerDescription) {
                 getLogicalSessionTimeoutMinutes() >> 1
             }
-            getOperationContext() >> operationContext
         }
         def writeBinding = Stub(WriteBinding) {
-            getWriteConnectionSource() >> connectionSource
-            getOperationContext() >> operationContext
+            getWriteConnectionSource(_) >> connectionSource
         }
 
         when:
-        executeRetryableWrite(writeBinding, dbName, primary(),
+        executeRetryableWrite(writeBinding, operationContext, dbName, primary(),
                 NoOpFieldNameValidator.INSTANCE, decoder, commandCreator, FindAndModifyHelper.transformer())
                 { cmd -> cmd }
 
         then:
-        2 * connection.command(dbName, command, _, primary(), decoder, operationContext) >> { results.poll() }
+        2 * connection.command(dbName, command, _, primary(), decoder, _) >> { results.poll() }
 
         then:
         def ex = thrown(MongoWriteConcernException)
@@ -127,22 +123,20 @@ class SyncOperationHelperSpecification extends Specification {
         def function = Stub(CommandReadTransformer)
         def connection = Mock(Connection)
         def connectionSource = Stub(ConnectionSource) {
-            getConnection() >> connection
+            getConnection(_) >> connection
             getReadPreference() >> readPreference
-            getOperationContext() >> OPERATION_CONTEXT
         }
         def readBinding = Stub(ReadBinding) {
-            getReadConnectionSource() >> connectionSource
-            getOperationContext() >> OPERATION_CONTEXT
+            getReadConnectionSource(_) >> connectionSource
         }
         def connectionDescription = Stub(ConnectionDescription)
 
         when:
-        executeRetryableRead(readBinding, dbName, commandCreator, decoder, function, false)
+        executeRetryableRead(readBinding, OPERATION_CONTEXT, dbName, commandCreator, decoder, function, false)
 
         then:
         _ * connection.getDescription() >> connectionDescription
-        1 * connection.command(dbName, command, _, readPreference, decoder, OPERATION_CONTEXT) >> new BsonDocument()
+        1 * connection.command(dbName, command, _, readPreference, decoder, _) >> new BsonDocument()
         1 * connection.release()
 
         where:
diff --git a/driver-legacy/src/main/com/mongodb/LegacyMixedBulkWriteOperation.java b/driver-legacy/src/main/com/mongodb/LegacyMixedBulkWriteOperation.java
index 4d8eb22cb7a..4c7815f8987 100644
--- a/driver-legacy/src/main/com/mongodb/LegacyMixedBulkWriteOperation.java
+++ b/driver-legacy/src/main/com/mongodb/LegacyMixedBulkWriteOperation.java
@@ -24,6 +24,7 @@
 import com.mongodb.internal.bulk.InsertRequest;
 import com.mongodb.internal.bulk.UpdateRequest;
 import com.mongodb.internal.bulk.WriteRequest;
+import com.mongodb.internal.connection.OperationContext;
 import com.mongodb.internal.operation.MixedBulkWriteOperation;
 import com.mongodb.internal.operation.WriteOperation;
 import com.mongodb.lang.Nullable;
@@ -98,10 +99,10 @@ LegacyMixedBulkWriteOperation bypassDocumentValidation(@Nullable final Boolean b
     }
 
     @Override
-    public WriteConcernResult execute(final WriteBinding binding) {
+    public WriteConcernResult execute(final WriteBinding binding, final OperationContext operationContext) {
         try {
             BulkWriteResult result = new MixedBulkWriteOperation(namespace, writeRequests, ordered, writeConcern, retryWrites)
-                    .bypassDocumentValidation(bypassDocumentValidation).execute(binding);
+                    .bypassDocumentValidation(bypassDocumentValidation).execute(binding, operationContext);
             if (result.wasAcknowledged()) {
                 return translateBulkWriteResult(result);
             } else {
diff --git a/driver-legacy/src/main/com/mongodb/MongoClient.java b/driver-legacy/src/main/com/mongodb/MongoClient.java
index 31da4c1b9ef..069ef8806e8 100644
--- a/driver-legacy/src/main/com/mongodb/MongoClient.java
+++ b/driver-legacy/src/main/com/mongodb/MongoClient.java
@@ -858,18 +858,20 @@ private ExecutorService createCursorCleaningService() {
     private void cleanCursors() {
         ServerCursorAndNamespace cur;
         while ((cur = orphanedCursors.poll()) != null) {
-            ReadWriteBinding binding = new SingleServerBinding(delegate.getCluster(), cur.serverCursor.getAddress(),
-                    new OperationContext(IgnorableRequestContext.INSTANCE, NoOpSessionContext.INSTANCE,
-                            new TimeoutContext(getTimeoutSettings()), options.getServerApi()));
+            OperationContext operationContext = new OperationContext(IgnorableRequestContext.INSTANCE, NoOpSessionContext.INSTANCE,
+                    new TimeoutContext(getTimeoutSettings()), options.getServerApi());
+
+            ReadWriteBinding binding = new SingleServerBinding(delegate.getCluster(), cur.serverCursor.getAddress());
             try {
-                ConnectionSource source = binding.getReadConnectionSource();
+                OperationContext serverSelectionOperationContext = operationContext.withTimeoutContextOverride(TimeoutContext::withComputedServerSelectionTimeoutContextNew);
+                ConnectionSource source = binding.getReadConnectionSource(serverSelectionOperationContext);
                 try {
-                    Connection connection = source.getConnection();
+                    Connection connection = source.getConnection(serverSelectionOperationContext);
                     try {
                         BsonDocument killCursorsCommand = new BsonDocument("killCursors", new BsonString(cur.namespace.getCollectionName()))
                                 .append("cursors", new BsonArray(singletonList(new BsonInt64(cur.serverCursor.getId()))));
                         connection.command(cur.namespace.getDatabaseName(), killCursorsCommand, NoOpFieldNameValidator.INSTANCE,
-                                ReadPreference.primary(), new BsonDocumentCodec(), source.getOperationContext());
+                                ReadPreference.primary(), new BsonDocumentCodec(), operationContext);
                     } finally {
                         connection.release();
                     }
diff --git a/driver-legacy/src/test/functional/com/mongodb/DBTest.java b/driver-legacy/src/test/functional/com/mongodb/DBTest.java
index 4ce9b3f760b..cf44573a2b4 100644
--- a/driver-legacy/src/test/functional/com/mongodb/DBTest.java
+++ b/driver-legacy/src/test/functional/com/mongodb/DBTest.java
@@ -31,6 +31,7 @@
 import java.util.Locale;
 import java.util.UUID;
 
+import static com.mongodb.ClusterFixture.OPERATION_CONTEXT;
 import static com.mongodb.ClusterFixture.disableMaxTimeFailPoint;
 import static com.mongodb.ClusterFixture.enableMaxTimeFailPoint;
 import static com.mongodb.ClusterFixture.getBinding;
@@ -344,7 +345,7 @@ public void shouldApplyUuidRepresentationToCommandEncodingAndDecoding() {
 
     BsonDocument getCollectionInfo(final String collectionName) {
         return new ListCollectionsOperation<>(getDefaultDatabaseName(), new BsonDocumentCodec())
-                .filter(new BsonDocument("name", new BsonString(collectionName))).execute(getBinding()).next().get(0);
+                .filter(new BsonDocument("name", new BsonString(collectionName))).execute(getBinding(), OPERATION_CONTEXT).next().get(0);
     }
 
     private boolean isCapped(final DBCollection collection) {
diff --git a/driver-legacy/src/test/functional/com/mongodb/LegacyMixedBulkWriteOperationSpecification.groovy b/driver-legacy/src/test/functional/com/mongodb/LegacyMixedBulkWriteOperationSpecification.groovy
index 42854387e4a..6a9c511c3bc 100644
--- a/driver-legacy/src/test/functional/com/mongodb/LegacyMixedBulkWriteOperationSpecification.groovy
+++ b/driver-legacy/src/test/functional/com/mongodb/LegacyMixedBulkWriteOperationSpecification.groovy
@@ -182,8 +182,9 @@ class LegacyMixedBulkWriteOperationSpecification extends OperationFunctionalSpec
     def 'should replace a single document'() {
         given:
         def insert = new InsertRequest(new BsonDocument('_id', new BsonInt32(1)))
+        def binding = getBinding()
         createBulkWriteOperationForInsert(getNamespace(), true, ACKNOWLEDGED, false, asList(insert))
-                .execute(getBinding())
+                .execute(binding, ClusterFixture.getOperationContext(binding.getReadPreference()))
 
         def replacement = new UpdateRequest(new BsonDocument('_id', new BsonInt32(1)),
                 new BsonDocument('_id', new BsonInt32(1)).append('x', new BsonInt32(1)), REPLACE)
diff --git a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/ClientSessionBinding.java b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/ClientSessionBinding.java
index 2e87b3bccf8..55357244fae 100644
--- a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/ClientSessionBinding.java
+++ b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/ClientSessionBinding.java
@@ -21,7 +21,7 @@
 import com.mongodb.connection.ClusterType;
 import com.mongodb.connection.ServerDescription;
 import com.mongodb.internal.async.SingleResultCallback;
-import com.mongodb.internal.async.function.AsyncCallbackSupplier;
+import com.mongodb.internal.async.function.AsyncCallbackFunction;
 import com.mongodb.internal.binding.AbstractReferenceCounted;
 import com.mongodb.internal.binding.AsyncClusterAwareReadWriteBinding;
 import com.mongodb.internal.binding.AsyncConnectionSource;
@@ -46,13 +46,11 @@ public class ClientSessionBinding extends AbstractReferenceCounted implements As
     private final AsyncClusterAwareReadWriteBinding wrapped;
     private final ClientSession session;
     private final boolean ownsSession;
-    private final OperationContext operationContext;
 
     public ClientSessionBinding(final ClientSession session, final boolean ownsSession, final AsyncClusterAwareReadWriteBinding wrapped) {
         this.wrapped = notNull("wrapped", wrapped).retain();
         this.ownsSession = ownsSession;
         this.session = notNull("session", session);
-        this.operationContext = wrapped.getOperationContext().withSessionContext(new AsyncClientSessionContext(session));
     }
 
     @Override
@@ -61,37 +59,38 @@ public ReadPreference getReadPreference() {
     }
 
     @Override
-    public OperationContext getOperationContext() {
-        return operationContext;
-    }
-
-    @Override
-    public void getReadConnectionSource(final SingleResultCallback callback) {
-        getConnectionSource(wrapped::getReadConnectionSource, callback);
+    public void getReadConnectionSource(final OperationContext operationContext,
+                                        final SingleResultCallback callback) {
+        getConnectionSource(wrapped::getReadConnectionSource, operationContext, callback);
     }
 
     @Override
     public void getReadConnectionSource(final int minWireVersion, final ReadPreference fallbackReadPreference,
+                                        final OperationContext operationContext,
             final SingleResultCallback callback) {
-        getConnectionSource(wrappedConnectionSourceCallback ->
-                wrapped.getReadConnectionSource(minWireVersion, fallbackReadPreference, wrappedConnectionSourceCallback),
+        getConnectionSource((opContext, wrappedConnectionSourceCallback) ->
+                        wrapped.getReadConnectionSource(minWireVersion, fallbackReadPreference, opContext,
+                                wrappedConnectionSourceCallback),
+                operationContext,
                 callback);
     }
 
-    public void getWriteConnectionSource(final SingleResultCallback callback) {
-        getConnectionSource(wrapped::getWriteConnectionSource, callback);
+    @Override
+    public void getWriteConnectionSource(final OperationContext operationContext, final SingleResultCallback callback) {
+        getConnectionSource(wrapped::getWriteConnectionSource, operationContext, callback);
     }
 
-    private void getConnectionSource(final AsyncCallbackSupplier connectionSourceSupplier,
+    private void getConnectionSource(final AsyncCallbackFunction connectionSourceSupplier,
+                                     final OperationContext operationContext,
             final SingleResultCallback callback) {
         WrappingCallback wrappingCallback = new WrappingCallback(callback);
 
         if (!session.hasActiveTransaction()) {
-            connectionSourceSupplier.get(wrappingCallback);
+            connectionSourceSupplier.apply(operationContext, wrappingCallback);
             return;
         }
         if (TransactionContext.get(session) == null) {
-            connectionSourceSupplier.get((source, t) -> {
+            connectionSourceSupplier.apply(operationContext, (source, t) -> {
                 if (t != null) {
                     wrappingCallback.onResult(null, t);
                 } else {
@@ -105,7 +104,7 @@ private void getConnectionSource(final AsyncCallbackSupplier callback) {
+        public void getConnection(final OperationContext operationContext, final SingleResultCallback callback) {
             TransactionContext transactionContext = TransactionContext.get(session);
             if (transactionContext != null && transactionContext.isConnectionPinningRequired()) {
                 AsyncConnection pinnedConnection = transactionContext.getPinnedConnection();
                 if (pinnedConnection == null) {
-                    wrapped.getConnection((connection, t) -> {
+                    wrapped.getConnection(operationContext, (connection, t) -> {
                         if (t != null) {
                             callback.onResult(null, t);
                         } else {
@@ -168,7 +162,7 @@ public void getConnection(final SingleResultCallback callback)
                     callback.onResult(pinnedConnection.retain(), null);
                 }
             } else {
-                wrapped.getConnection(callback);
+                wrapped.getConnection(operationContext, callback);
             }
         }
 
@@ -193,13 +187,19 @@ public int release() {
         }
     }
 
-    private final class AsyncClientSessionContext extends ClientSessionContext {
+    public static final class AsyncClientSessionContext extends ClientSessionContext {
 
         private final ClientSession clientSession;
+        private final ReadConcern inheritedReadConcern;
+        private final boolean ownsSession;
 
-        AsyncClientSessionContext(final ClientSession clientSession) {
+        AsyncClientSessionContext(final ClientSession clientSession,
+                                  final boolean ownsSession,
+                                  final ReadConcern inheritedReadConcern) {
             super(clientSession);
             this.clientSession = clientSession;
+            this.ownsSession = ownsSession;
+            this.inheritedReadConcern = inheritedReadConcern;
         }
 
 
@@ -242,7 +242,10 @@ public ReadConcern getReadConcern() {
             } else if (isSnapshot()) {
                 return ReadConcern.SNAPSHOT;
             } else {
-                return wrapped.getOperationContext().getSessionContext().getReadConcern();
+                //COMMENT the read concern was specified on wrapped BindingContext was the one that was inherited from either MongoCollection, MongoDatabase, etc.
+                // since we removed the BindingContext, we can now embedd the parent read concern directly.
+                //return wrapped.getOperationContext().getSessionContext().getReadConcern();
+                return inheritedReadConcern;
             }
         }
     }
diff --git a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/MapReducePublisherImpl.java b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/MapReducePublisherImpl.java
index f8371c8afb6..580ee3609c3 100644
--- a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/MapReducePublisherImpl.java
+++ b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/MapReducePublisherImpl.java
@@ -26,6 +26,7 @@
 import com.mongodb.internal.binding.AsyncReadBinding;
 import com.mongodb.internal.binding.AsyncWriteBinding;
 import com.mongodb.internal.client.model.FindOptions;
+import com.mongodb.internal.connection.OperationContext;
 import com.mongodb.internal.operation.AsyncOperations;
 import com.mongodb.internal.operation.AsyncReadOperation;
 import com.mongodb.internal.operation.AsyncWriteOperation;
@@ -233,8 +234,8 @@ AsyncReadOperation> getOperation() {
         }
 
         @Override
-        public void executeAsync(final AsyncReadBinding binding, final SingleResultCallback> callback) {
-            operation.executeAsync(binding, callback::onResult);
+        public void executeAsync(final AsyncReadBinding binding, final OperationContext operationContext, final SingleResultCallback> callback) {
+            operation.executeAsync(binding, operationContext, callback::onResult);
         }
     }
 
@@ -250,8 +251,8 @@ AsyncWriteOperation getOperation() {
         }
 
         @Override
-        public void executeAsync(final AsyncWriteBinding binding, final SingleResultCallback callback) {
-            operation.executeAsync(binding, (result, t) -> callback.onResult(null, t));
+        public void executeAsync(final AsyncWriteBinding binding, final OperationContext operationContext, final SingleResultCallback callback) {
+            operation.executeAsync(binding, operationContext, (result, t) -> callback.onResult(null, t));
         }
     }
 }
diff --git a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/OperationExecutorImpl.java b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/OperationExecutorImpl.java
index 0a4b0318d1c..7210816cebc 100644
--- a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/OperationExecutorImpl.java
+++ b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/OperationExecutorImpl.java
@@ -83,14 +83,19 @@ public  Mono execute(final AsyncReadOperation operation, final ReadPref
 
         return Mono.from(subscriber ->
                 clientSessionHelper.withClientSession(session, this)
-                        .map(clientSession -> getReadWriteBinding(getContext(subscriber),
-                                readPreference, readConcern, clientSession, session == null))
-                        .flatMap(binding -> {
+                        .flatMap(actualClientSession -> {
+                            AsyncReadWriteBinding binding =
+                                    getReadWriteBinding(readPreference, actualClientSession, isImplicitSession(session));
+                            RequestContext requestContext = getContext(subscriber);
+                            OperationContext operationContext = getOperationContext(requestContext, actualClientSession, readConcern)
+                                    .withSessionContext(new ClientSessionBinding.AsyncClientSessionContext(actualClientSession,
+                                            isImplicitSession(session), readConcern));
+
                             if (session != null && session.hasActiveTransaction() && !binding.getReadPreference().equals(primary())) {
                                 binding.release();
                                 return Mono.error(new MongoClientException("Read preference in a transaction must be primary"));
                             } else {
-                                return Mono.create(sink -> operation.executeAsync(binding, (result, t) -> {
+                                return Mono.create(sink -> operation.executeAsync(binding, operationContext, (result, t) -> {
                                     try {
                                         binding.release();
                                     } finally {
@@ -118,10 +123,14 @@ public  Mono execute(final AsyncWriteOperation operation, final ReadCon
 
         return Mono.from(subscriber ->
                 clientSessionHelper.withClientSession(session, this)
-                        .map(clientSession -> getReadWriteBinding(getContext(subscriber),
-                                primary(), readConcern, clientSession, session == null))
-                        .flatMap(binding ->
-                                Mono.create(sink -> operation.executeAsync(binding, (result, t) -> {
+                        .flatMap(actualClientSession -> {
+                                    AsyncReadWriteBinding binding = getReadWriteBinding(primary(), actualClientSession, session == null);
+                                    RequestContext requestContext = getContext(subscriber);
+                                    OperationContext operationContext = getOperationContext(requestContext, actualClientSession, readConcern)
+                                            .withSessionContext(new ClientSessionBinding.AsyncClientSessionContext(actualClientSession,
+                                                    isImplicitSession(session), readConcern));
+
+                                    return Mono.create(sink -> operation.executeAsync(binding, operationContext, (result, t) -> {
                                     try {
                                         binding.release();
                                     } finally {
@@ -131,7 +140,8 @@ public  Mono execute(final AsyncWriteOperation operation, final ReadCon
                                     Throwable exceptionToHandle = t instanceof MongoException ? OperationHelper.unwrap((MongoException) t) : t;
                                     labelException(session, exceptionToHandle);
                                     unpinServerAddressOnTransientTransactionError(session, exceptionToHandle);
-                                })
+                                    });
+                                }
                         ).subscribe(subscriber)
         );
     }
@@ -174,13 +184,12 @@ private void unpinServerAddressOnTransientTransactionError(@Nullable final Clien
         }
     }
 
-    private AsyncReadWriteBinding getReadWriteBinding(final RequestContext requestContext,
-            final ReadPreference readPreference, final ReadConcern readConcern, final ClientSession session,
-            final boolean ownsSession) {
+    private AsyncReadWriteBinding getReadWriteBinding(final ReadPreference readPreference,
+                                                      final ClientSession session,
+                                                      final boolean ownsSession) {
         notNull("readPreference", readPreference);
         AsyncClusterAwareReadWriteBinding readWriteBinding = new AsyncClusterBinding(mongoClient.getCluster(),
-                getReadPreferenceForBinding(readPreference, session), readConcern,
-                getOperationContext(requestContext, session, readConcern));
+                getReadPreferenceForBinding(readPreference, session));
 
         Crypt crypt = mongoClient.getCrypt();
         if (crypt != null) {
@@ -217,4 +226,8 @@ private ReadPreference getReadPreferenceForBinding(final ReadPreference readPref
         }
         return readPreference;
     }
+
+    private boolean isImplicitSession(@Nullable final ClientSession session) {
+        return session == null;
+    }
 }
diff --git a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/VoidReadOperationThenCursorReadOperation.java b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/VoidReadOperationThenCursorReadOperation.java
index 17a54c345a5..c69141c7dd4 100644
--- a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/VoidReadOperationThenCursorReadOperation.java
+++ b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/VoidReadOperationThenCursorReadOperation.java
@@ -19,6 +19,7 @@
 import com.mongodb.internal.async.AsyncBatchCursor;
 import com.mongodb.internal.async.SingleResultCallback;
 import com.mongodb.internal.binding.AsyncReadBinding;
+import com.mongodb.internal.connection.OperationContext;
 import com.mongodb.internal.operation.AsyncReadOperation;
 
 class VoidReadOperationThenCursorReadOperation implements AsyncReadOperation> {
@@ -40,12 +41,12 @@ public AsyncReadOperation> getCursorReadOperation() {
     }
 
     @Override
-    public void executeAsync(final AsyncReadBinding binding, final SingleResultCallback> callback) {
-        readOperation.executeAsync(binding, (result, t) -> {
+    public void executeAsync(final AsyncReadBinding binding, final OperationContext operationContext, final SingleResultCallback> callback) {
+        readOperation.executeAsync(binding, operationContext, (result, t) -> {
             if (t != null) {
                 callback.onResult(null, t);
             } else {
-                cursorReadOperation.executeAsync(binding, callback);
+                cursorReadOperation.executeAsync(binding, operationContext, callback);
             }
         });
     }
diff --git a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/VoidWriteOperationThenCursorReadOperation.java b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/VoidWriteOperationThenCursorReadOperation.java
index bde5811a713..37f856be3f9 100644
--- a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/VoidWriteOperationThenCursorReadOperation.java
+++ b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/VoidWriteOperationThenCursorReadOperation.java
@@ -20,6 +20,7 @@
 import com.mongodb.internal.async.SingleResultCallback;
 import com.mongodb.internal.binding.AsyncReadBinding;
 import com.mongodb.internal.binding.AsyncWriteBinding;
+import com.mongodb.internal.connection.OperationContext;
 import com.mongodb.internal.operation.AsyncReadOperation;
 import com.mongodb.internal.operation.AsyncWriteOperation;
 
@@ -34,12 +35,12 @@ class VoidWriteOperationThenCursorReadOperation implements AsyncReadOperation
     }
 
     @Override
-    public void executeAsync(final AsyncReadBinding binding, final SingleResultCallback> callback) {
-        writeOperation.executeAsync((AsyncWriteBinding) binding, (result, t) -> {
+    public void executeAsync(final AsyncReadBinding binding, final OperationContext operationContext, final SingleResultCallback> callback) {
+        writeOperation.executeAsync((AsyncWriteBinding) binding, operationContext,  (result, t) -> {
             if (t != null) {
                 callback.onResult(null, t);
             } else {
-                cursorReadOperation.executeAsync(binding, callback);
+                cursorReadOperation.executeAsync(binding, operationContext, callback);
             }
         });
     }
diff --git a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/crypt/CryptBinding.java b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/crypt/CryptBinding.java
index 1dcc8a07d62..cff663e663c 100644
--- a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/crypt/CryptBinding.java
+++ b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/crypt/CryptBinding.java
@@ -44,8 +44,8 @@ public ReadPreference getReadPreference() {
     }
 
     @Override
-    public void getWriteConnectionSource(final SingleResultCallback callback) {
-        wrapped.getWriteConnectionSource((result, t) -> {
+    public void getWriteConnectionSource(final OperationContext operationContext, final SingleResultCallback callback) {
+        wrapped.getWriteConnectionSource(operationContext, (result, t) -> {
             if (t != null) {
                 callback.onResult(null, t);
             } else {
@@ -55,13 +55,8 @@ public void getWriteConnectionSource(final SingleResultCallback callback) {
-        wrapped.getReadConnectionSource((result, t) -> {
+    public void getReadConnectionSource(final OperationContext operationContext, final SingleResultCallback callback) {
+        wrapped.getReadConnectionSource(operationContext, (result, t) -> {
             if (t != null) {
                 callback.onResult(null, t);
             } else {
@@ -72,8 +67,9 @@ public void getReadConnectionSource(final SingleResultCallback callback) {
-        wrapped.getReadConnectionSource(minWireVersion, fallbackReadPreference, (result, t) -> {
+        wrapped.getReadConnectionSource(minWireVersion, fallbackReadPreference, operationContext, (result, t) -> {
             if (t != null) {
                 callback.onResult(null, t);
             } else {
@@ -84,8 +80,10 @@ public void getReadConnectionSource(final int minWireVersion, final ReadPreferen
 
 
     @Override
-    public void getConnectionSource(final ServerAddress serverAddress, final SingleResultCallback callback) {
-        wrapped.getConnectionSource(serverAddress, (result, t) -> {
+    public void getConnectionSource(final ServerAddress serverAddress,
+                                    final OperationContext operationContext,
+                                    final SingleResultCallback callback) {
+        wrapped.getConnectionSource(serverAddress, operationContext, (result, t) -> {
             if (t != null) {
                 callback.onResult(null, t);
             } else {
@@ -110,6 +108,7 @@ public int release() {
         return wrapped.release();
     }
 
+
     private class CryptConnectionSource implements AsyncConnectionSource {
         private final AsyncConnectionSource wrapped;
 
@@ -123,19 +122,14 @@ public ServerDescription getServerDescription() {
             return wrapped.getServerDescription();
         }
 
-        @Override
-        public OperationContext getOperationContext() {
-            return wrapped.getOperationContext();
-        }
-
         @Override
         public ReadPreference getReadPreference() {
             return wrapped.getReadPreference();
         }
 
         @Override
-        public void getConnection(final SingleResultCallback callback) {
-            wrapped.getConnection((result, t) -> {
+        public void getConnection(final OperationContext operationContext, final SingleResultCallback callback) {
+            wrapped.getConnection(operationContext, (result, t) -> {
                 if (t != null) {
                     callback.onResult(null, t);
                 } else {
diff --git a/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/ClientSideOperationTimeoutProseTest.java b/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/ClientSideOperationTimeoutProseTest.java
index 5613e6dbcd8..0039594f409 100644
--- a/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/ClientSideOperationTimeoutProseTest.java
+++ b/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/ClientSideOperationTimeoutProseTest.java
@@ -466,7 +466,7 @@ public void testTimeoutMsISHonoredForNnextOperationWhenSeveralGetMoreExecutedInt
                     .getCollection(namespace.getCollectionName()).withReadPreference(ReadPreference.primary());
 
             //when
-            ChangeStreamPublisher documentChangeStreamPublisher = collection.watch();
+            ChangeStreamPublisher documentChangeStreamPublisher = collection.watch().maxAwaitTime(1000, TimeUnit.MILLISECONDS);
             StepVerifier.create(documentChangeStreamPublisher, 2)
             //then
                     .expectError(MongoOperationTimeoutException.class)
diff --git a/driver-reactive-streams/src/test/resources/logback-test.xml b/driver-reactive-streams/src/test/resources/logback-test.xml
index 022806f0e4e..b25f68499b2 100644
--- a/driver-reactive-streams/src/test/resources/logback-test.xml
+++ b/driver-reactive-streams/src/test/resources/logback-test.xml
@@ -6,7 +6,7 @@
         
     
 
-    
+    
         
     
 
diff --git a/driver-reactive-streams/src/test/unit/com/mongodb/reactivestreams/client/internal/ClientSessionBindingSpecification.groovy b/driver-reactive-streams/src/test/unit/com/mongodb/reactivestreams/client/internal/ClientSessionBindingSpecification.groovy
index d6233342291..7308560241f 100644
--- a/driver-reactive-streams/src/test/unit/com/mongodb/reactivestreams/client/internal/ClientSessionBindingSpecification.groovy
+++ b/driver-reactive-streams/src/test/unit/com/mongodb/reactivestreams/client/internal/ClientSessionBindingSpecification.groovy
@@ -16,7 +16,7 @@
 
 package com.mongodb.reactivestreams.client.internal
 
-import com.mongodb.ReadConcern
+
 import com.mongodb.ReadPreference
 import com.mongodb.ServerAddress
 import com.mongodb.async.FutureResultCallback
@@ -36,59 +36,31 @@ import spock.lang.Specification
 import static com.mongodb.ClusterFixture.OPERATION_CONTEXT
 
 class ClientSessionBindingSpecification extends Specification {
-    def 'should return the session context from the binding'() {
-        given:
-        def session = Stub(ClientSession)
-        def wrappedBinding = Stub(AsyncClusterAwareReadWriteBinding) {
-            getOperationContext() >> OPERATION_CONTEXT
-        }
-        def binding = new ClientSessionBinding(session, false, wrappedBinding)
-
-        when:
-        def context = binding.getOperationContext().getSessionContext()
-
-        then:
-        (context as ClientSessionContext).getClientSession() == session
-    }
 
     def 'should return the session context from the connection source'() {
         given:
         def session = Stub(ClientSession)
-        def wrappedBinding = Mock(AsyncClusterAwareReadWriteBinding) {
-            getOperationContext() >> OPERATION_CONTEXT
-        }
+        def wrappedBinding = Mock(AsyncClusterAwareReadWriteBinding);
         wrappedBinding.retain() >> wrappedBinding
         def binding = new ClientSessionBinding(session, false, wrappedBinding)
 
         when:
         def futureResultCallback = new FutureResultCallback()
-        binding.getReadConnectionSource(futureResultCallback)
+        binding.getReadConnectionSource(OPERATION_CONTEXT, futureResultCallback)
 
         then:
-        1 * wrappedBinding.getReadConnectionSource(_) >> {
-            it[0].onResult(Stub(AsyncConnectionSource), null)
+        1 * wrappedBinding.getReadConnectionSource(OPERATION_CONTEXT, _) >> {
+            it[1].onResult(Stub(AsyncConnectionSource), null)
         }
 
-        when:
-        def context = futureResultCallback.get().getOperationContext().getSessionContext()
-
-        then:
-        (context as ClientSessionContext).getClientSession() == session
-
         when:
         futureResultCallback = new FutureResultCallback()
-        binding.getWriteConnectionSource(futureResultCallback)
+        binding.getWriteConnectionSource(OPERATION_CONTEXT, futureResultCallback)
 
         then:
-        1 * wrappedBinding.getWriteConnectionSource(_) >> {
-            it[0].onResult(Stub(AsyncConnectionSource), null)
+        1 * wrappedBinding.getWriteConnectionSource(OPERATION_CONTEXT, _) >> {
+            it[1].onResult(Stub(AsyncConnectionSource), null)
         }
-
-        when:
-        context = futureResultCallback.get().getOperationContext().getSessionContext()
-
-        then:
-        (context as ClientSessionContext).getClientSession() == session
     }
 
     def 'should close client session when binding reference count drops to zero if it is owned by the binding'() {
@@ -117,10 +89,10 @@ class ClientSessionBindingSpecification extends Specification {
         def wrappedBinding = createStubBinding()
         def binding = new ClientSessionBinding(session, true, wrappedBinding)
         def futureResultCallback = new FutureResultCallback()
-        binding.getReadConnectionSource(futureResultCallback)
+        binding.getReadConnectionSource(OPERATION_CONTEXT, futureResultCallback)
         def readConnectionSource = futureResultCallback.get()
         futureResultCallback = new FutureResultCallback()
-        binding.getWriteConnectionSource(futureResultCallback)
+        binding.getWriteConnectionSource(OPERATION_CONTEXT, futureResultCallback)
         def writeConnectionSource = futureResultCallback.get()
 
         when:
@@ -162,20 +134,21 @@ class ClientSessionBindingSpecification extends Specification {
         0 * session.close()
     }
 
-    def 'owned session is implicit'() {
-        given:
-        def session = Mock(ClientSession)
-        def wrappedBinding = createStubBinding()
-
-        when:
-        def binding = new ClientSessionBinding(session, ownsSession, wrappedBinding)
-
-        then:
-        binding.getOperationContext().getSessionContext().isImplicitSession() == ownsSession
-
-        where:
-        ownsSession << [true, false]
-    }
+    //TODO move to SessionContext test
+//    def 'owned session is implicit'() {
+//        given:
+//        def session = Mock(ClientSession)
+//        def wrappedBinding = createStubBinding()
+//
+//        when:
+//        def binding = new ClientSessionBinding(session, ownsSession, wrappedBinding)
+//
+//        then:
+//        binding.getOperationContext(_).getSessionContext().isImplicitSession() == ownsSession
+//
+//        where:
+//        ownsSession << [true, false]
+//    }
 
     private AsyncClusterAwareReadWriteBinding createStubBinding() {
         def cluster = Mock(Cluster) {
@@ -187,6 +160,6 @@ class ClientSessionBindingSpecification extends Specification {
                         .build()), null)
             }
         }
-        new AsyncClusterBinding(cluster, ReadPreference.primary(), ReadConcern.DEFAULT, OPERATION_CONTEXT)
+        new AsyncClusterBinding(cluster, ReadPreference.primary())
     }
 }
diff --git a/driver-sync/src/main/com/mongodb/client/internal/ClientSessionBinding.java b/driver-sync/src/main/com/mongodb/client/internal/ClientSessionBinding.java
index 2d8a4dbfb30..48694bef74d 100644
--- a/driver-sync/src/main/com/mongodb/client/internal/ClientSessionBinding.java
+++ b/driver-sync/src/main/com/mongodb/client/internal/ClientSessionBinding.java
@@ -16,6 +16,7 @@
 
 package com.mongodb.client.internal;
 
+import com.mongodb.Function;
 import com.mongodb.ReadConcern;
 import com.mongodb.ReadPreference;
 import com.mongodb.client.ClientSession;
@@ -30,8 +31,6 @@
 import com.mongodb.internal.connection.OperationContext;
 import com.mongodb.internal.session.ClientSessionContext;
 
-import java.util.function.Supplier;
-
 import static com.mongodb.connection.ClusterType.LOAD_BALANCED;
 import static com.mongodb.connection.ClusterType.SHARDED;
 import static org.bson.assertions.Assertions.assertNotNull;
@@ -44,14 +43,14 @@ public class ClientSessionBinding extends AbstractReferenceCounted implements Re
     private final ClusterAwareReadWriteBinding wrapped;
     private final ClientSession session;
     private final boolean ownsSession;
-    private final OperationContext operationContext;
 
-    public ClientSessionBinding(final ClientSession session, final boolean ownsSession, final ClusterAwareReadWriteBinding wrapped) {
+    public ClientSessionBinding(final ClientSession session,
+                                final boolean ownsSession,
+                                final ClusterAwareReadWriteBinding wrapped) {
         this.wrapped = wrapped;
         wrapped.retain();
         this.session = notNull("session", session);
         this.ownsSession = ownsSession;
-        this.operationContext = wrapped.getOperationContext().withSessionContext(new SyncClientSessionContext(session));
     }
 
     @Override
@@ -84,32 +83,34 @@ public int release() {
     }
 
     @Override
-    public ConnectionSource getReadConnectionSource() {
-        return new SessionBindingConnectionSource(getConnectionSource(wrapped::getReadConnectionSource));
+    public ConnectionSource getReadConnectionSource(final OperationContext operationContext) {
+        return new SessionBindingConnectionSource(getConnectionSource(wrapped::getReadConnectionSource, operationContext));
     }
 
     @Override
-    public ConnectionSource getReadConnectionSource(final int minWireVersion, final ReadPreference fallbackReadPreference) {
-        return new SessionBindingConnectionSource(getConnectionSource(() ->
-                wrapped.getReadConnectionSource(minWireVersion, fallbackReadPreference)));
-    }
+    public ConnectionSource getReadConnectionSource(final int minWireVersion, final ReadPreference fallbackReadPreference,
+                                                    final OperationContext operationContext) {
+        ConnectionSource connectionSource = getConnectionSource(
+                opContext -> wrapped.getReadConnectionSource(minWireVersion, fallbackReadPreference, opContext),
+                operationContext);
 
-    public ConnectionSource getWriteConnectionSource() {
-        return new SessionBindingConnectionSource(getConnectionSource(wrapped::getWriteConnectionSource));
+        return new SessionBindingConnectionSource(connectionSource);
     }
 
     @Override
-    public OperationContext getOperationContext() {
-        return operationContext;
+    public ConnectionSource getWriteConnectionSource(final OperationContext operationContext) {
+        ConnectionSource connectionSource = getConnectionSource(wrapped::getWriteConnectionSource, operationContext);
+        return new SessionBindingConnectionSource(connectionSource);
     }
 
-    private ConnectionSource getConnectionSource(final Supplier wrappedConnectionSourceSupplier) {
+    private ConnectionSource getConnectionSource(final Function wrappedConnectionSourceSupplier,
+                                                 final OperationContext operationContext) {
         if (!session.hasActiveTransaction()) {
-            return wrappedConnectionSourceSupplier.get();
+            return wrappedConnectionSourceSupplier.apply(operationContext);
         }
 
         if (TransactionContext.get(session) == null) {
-            ConnectionSource source = wrappedConnectionSourceSupplier.get();
+            ConnectionSource source = wrappedConnectionSourceSupplier.apply(operationContext);
             ClusterType clusterType = source.getServerDescription().getClusterType();
             if (clusterType == SHARDED || clusterType == LOAD_BALANCED) {
                 TransactionContext transactionContext = new TransactionContext<>(clusterType);
@@ -118,7 +119,7 @@ private ConnectionSource getConnectionSource(final Supplier wr
             }
             return source;
         } else {
-            return wrapped.getConnectionSource(assertNotNull(session.getPinnedServerAddress()));
+            return wrapped.getConnectionSource(assertNotNull(session.getPinnedServerAddress()), operationContext);
         }
     }
 
@@ -135,30 +136,25 @@ public ServerDescription getServerDescription() {
             return wrapped.getServerDescription();
         }
 
-        @Override
-        public OperationContext getOperationContext() {
-            return operationContext;
-        }
-
         @Override
         public ReadPreference getReadPreference() {
             return wrapped.getReadPreference();
         }
 
         @Override
-        public Connection getConnection() {
+        public Connection getConnection(final OperationContext operationContext) {
             TransactionContext transactionContext = TransactionContext.get(session);
             if (transactionContext != null && transactionContext.isConnectionPinningRequired()) {
                 Connection pinnedConnection = transactionContext.getPinnedConnection();
                 if (pinnedConnection == null) {
-                    Connection connection = wrapped.getConnection();
+                    Connection connection = wrapped.getConnection(operationContext);
                     transactionContext.pinConnection(connection, Connection::markAsPinned);
                     return connection;
                 } else {
                     return pinnedConnection.retain();
                 }
             } else {
-                return wrapped.getConnection();
+                return wrapped.getConnection(operationContext);
             }
         }
 
@@ -184,13 +180,25 @@ public int release() {
         }
     }
 
-    private final class SyncClientSessionContext extends ClientSessionContext {
+    public static final class SyncClientSessionContext extends ClientSessionContext {
 
         private final ClientSession clientSession;
-
-        SyncClientSessionContext(final ClientSession clientSession) {
+        private final boolean ownsSession;
+        private final ReadConcern inheritedReadConcern;
+
+        /**
+         * @param clientSession        the client session to use.
+         * @param inheritedReadConcern the read concern inherited from either {@link com.mongodb.client.MongoCollection},
+         *                             {@link com.mongodb.client.MongoDatabase} and etc.
+         * @param ownsSession          if true, the session is implicit.
+         */
+        SyncClientSessionContext(final ClientSession clientSession,
+                                 final ReadConcern inheritedReadConcern,
+                                 final boolean ownsSession) {
             super(clientSession);
             this.clientSession = clientSession;
+            this.ownsSession = ownsSession;
+            this.inheritedReadConcern = inheritedReadConcern;
         }
 
         @Override
@@ -215,7 +223,10 @@ public ReadConcern getReadConcern() {
             } else if (isSnapshot()) {
                 return ReadConcern.SNAPSHOT;
             } else {
-               return wrapped.getOperationContext().getSessionContext().getReadConcern();
+                //COMMENT the read concern was specified on wrapped BindingContext was the one that was inherited from either MongoCollection, MongoDatabase, etc.
+                // since we removed the BindingContext, we can now embedd the parent read concern directly.
+                //return wrapped.getOperationContext().getSessionContext().getReadConcern();
+                return inheritedReadConcern;
             }
         }
     }
diff --git a/driver-sync/src/main/com/mongodb/client/internal/CryptBinding.java b/driver-sync/src/main/com/mongodb/client/internal/CryptBinding.java
index 036466077ec..8032bea371c 100644
--- a/driver-sync/src/main/com/mongodb/client/internal/CryptBinding.java
+++ b/driver-sync/src/main/com/mongodb/client/internal/CryptBinding.java
@@ -41,28 +41,23 @@ public ReadPreference getReadPreference() {
     }
 
     @Override
-    public ConnectionSource getReadConnectionSource() {
-        return new CryptConnectionSource(wrapped.getReadConnectionSource());
+    public ConnectionSource getReadConnectionSource(final OperationContext operationContext) {
+        return new CryptConnectionSource(wrapped.getReadConnectionSource(operationContext));
     }
 
     @Override
-    public ConnectionSource getReadConnectionSource(final int minWireVersion, final ReadPreference fallbackReadPreference) {
-        return new CryptConnectionSource(wrapped.getReadConnectionSource(minWireVersion, fallbackReadPreference));
+    public ConnectionSource getReadConnectionSource(final int minWireVersion, final ReadPreference fallbackReadPreference, final OperationContext operationContext) {
+        return new CryptConnectionSource(wrapped.getReadConnectionSource(minWireVersion, fallbackReadPreference, operationContext));
     }
 
     @Override
-    public ConnectionSource getWriteConnectionSource() {
-        return new CryptConnectionSource(wrapped.getWriteConnectionSource());
+    public ConnectionSource getWriteConnectionSource(final OperationContext operationContext) {
+        return new CryptConnectionSource(wrapped.getWriteConnectionSource(operationContext));
     }
 
     @Override
-    public ConnectionSource getConnectionSource(final ServerAddress serverAddress) {
-        return new CryptConnectionSource(wrapped.getConnectionSource(serverAddress));
-    }
-
-    @Override
-    public OperationContext getOperationContext() {
-        return wrapped.getOperationContext();
+    public ConnectionSource getConnectionSource(final ServerAddress serverAddress, final OperationContext operationContext) {
+        return new CryptConnectionSource(wrapped.getConnectionSource(serverAddress, operationContext));
     }
 
     @Override
@@ -93,19 +88,14 @@ public ServerDescription getServerDescription() {
             return wrapped.getServerDescription();
         }
 
-        @Override
-        public OperationContext getOperationContext() {
-            return wrapped.getOperationContext();
-        }
-
         @Override
         public ReadPreference getReadPreference() {
             return wrapped.getReadPreference();
         }
 
         @Override
-        public Connection getConnection() {
-            return new CryptConnection(wrapped.getConnection(), crypt);
+        public Connection getConnection(final OperationContext operationContext) {
+            return new CryptConnection(wrapped.getConnection(operationContext), crypt);
         }
 
         @Override
diff --git a/driver-sync/src/main/com/mongodb/client/internal/MapReduceIterableImpl.java b/driver-sync/src/main/com/mongodb/client/internal/MapReduceIterableImpl.java
index 8a0107aafeb..c2e6aa6a072 100644
--- a/driver-sync/src/main/com/mongodb/client/internal/MapReduceIterableImpl.java
+++ b/driver-sync/src/main/com/mongodb/client/internal/MapReduceIterableImpl.java
@@ -26,6 +26,7 @@
 import com.mongodb.internal.TimeoutSettings;
 import com.mongodb.internal.binding.ReadBinding;
 import com.mongodb.internal.client.model.FindOptions;
+import com.mongodb.internal.connection.OperationContext;
 import com.mongodb.internal.operation.BatchCursor;
 import com.mongodb.internal.operation.MapReduceBatchCursor;
 import com.mongodb.internal.operation.MapReduceStatistics;
@@ -233,8 +234,8 @@ ReadOperation> getOperation() {
         }
 
         @Override
-        public BatchCursor execute(final ReadBinding binding) {
-            return operation.execute(binding);
+        public BatchCursor execute(final ReadBinding binding, final OperationContext operationContext) {
+            return operation.execute(binding, operationContext);
         }
     }
 }
diff --git a/driver-sync/src/main/com/mongodb/client/internal/MongoClusterImpl.java b/driver-sync/src/main/com/mongodb/client/internal/MongoClusterImpl.java
index 9c0033e42a7..bc78edc8385 100644
--- a/driver-sync/src/main/com/mongodb/client/internal/MongoClusterImpl.java
+++ b/driver-sync/src/main/com/mongodb/client/internal/MongoClusterImpl.java
@@ -39,8 +39,8 @@
 import com.mongodb.client.MongoIterable;
 import com.mongodb.client.SynchronousContextProvider;
 import com.mongodb.client.model.bulk.ClientBulkWriteOptions;
-import com.mongodb.client.model.bulk.ClientNamespacedWriteModel;
 import com.mongodb.client.model.bulk.ClientBulkWriteResult;
+import com.mongodb.client.model.bulk.ClientNamespacedWriteModel;
 import com.mongodb.internal.IgnorableRequestContext;
 import com.mongodb.internal.TimeoutSettings;
 import com.mongodb.internal.binding.ClusterAwareReadWriteBinding;
@@ -415,13 +415,15 @@ public  T execute(final ReadOperation operation, final ReadPreference read
             }
 
             ClientSession actualClientSession = getClientSession(session);
-            ReadBinding binding = getReadBinding(readPreference, readConcern, actualClientSession, session == null);
+            OperationContext operationContext = getOperationContext(actualClientSession, readConcern)
+                    .withSessionContext(new ClientSessionBinding.SyncClientSessionContext(actualClientSession, readConcern, isImplicitSession(session)));
+            ReadBinding binding = getReadBinding(readPreference, actualClientSession, isImplicitSession(session));
 
             try {
                 if (actualClientSession.hasActiveTransaction() && !binding.getReadPreference().equals(primary())) {
                     throw new MongoClientException("Read preference in a transaction must be primary");
                 }
-                return operation.execute(binding);
+                return operation.execute(binding, operationContext);
             } catch (MongoException e) {
                 MongoException exceptionToHandle = OperationHelper.unwrap(e);
                 labelException(actualClientSession, exceptionToHandle);
@@ -440,10 +442,12 @@ public  T execute(final WriteOperation operation, final ReadConcern readCo
             }
 
             ClientSession actualClientSession = getClientSession(session);
-            WriteBinding binding = getWriteBinding(readConcern, actualClientSession, session == null);
+            OperationContext operationContext = getOperationContext(actualClientSession, readConcern)
+                    .withSessionContext(new ClientSessionBinding.SyncClientSessionContext(actualClientSession, readConcern, isImplicitSession(session)));
+            WriteBinding binding = getWriteBinding(actualClientSession, isImplicitSession(session));
 
             try {
-                return operation.execute(binding);
+                return operation.execute(binding, operationContext);
             } catch (MongoException e) {
                 MongoException exceptionToHandle = OperationHelper.unwrap(e);
                 labelException(actualClientSession, exceptionToHandle);
@@ -467,20 +471,19 @@ public TimeoutSettings getTimeoutSettings() {
             return executorTimeoutSettings;
         }
 
-        WriteBinding getWriteBinding(final ReadConcern readConcern, final ClientSession session, final boolean ownsSession) {
-            return getReadWriteBinding(primary(), readConcern, session, ownsSession);
+        WriteBinding getWriteBinding(final ClientSession session, final boolean ownsSession) {
+            return getReadWriteBinding(primary(), session, ownsSession);
         }
 
-        ReadBinding getReadBinding(final ReadPreference readPreference, final ReadConcern readConcern, final ClientSession session,
+        ReadBinding getReadBinding(final ReadPreference readPreference, final ClientSession session,
                 final boolean ownsSession) {
-            return getReadWriteBinding(readPreference, readConcern, session, ownsSession);
+            return getReadWriteBinding(readPreference, session, ownsSession);
         }
 
-        ReadWriteBinding getReadWriteBinding(final ReadPreference readPreference,
-                final ReadConcern readConcern, final ClientSession session, final boolean ownsSession) {
+        ReadWriteBinding getReadWriteBinding(final ReadPreference readPreference, final ClientSession session, final boolean ownsSession) {
 
             ClusterAwareReadWriteBinding readWriteBinding = new ClusterBinding(cluster,
-                    getReadPreferenceForBinding(readPreference, session), readConcern, getOperationContext(session, readConcern));
+                    getReadPreferenceForBinding(readPreference, session));
 
             if (crypt != null) {
                 readWriteBinding = new CryptBinding(readWriteBinding, crypt);
@@ -520,7 +523,7 @@ private void clearTransactionContextOnTransientTransactionError(@Nullable final
         }
 
         private ReadPreference getReadPreferenceForBinding(final ReadPreference readPreference, @Nullable final ClientSession session) {
-            if (session == null) {
+            if (isImplicitSession(session)) {
                 return readPreference;
             }
             if (session.hasActiveTransaction()) {
@@ -551,4 +554,8 @@ ClientSession getClientSession(@Nullable final ClientSession clientSessionFromOp
             return session;
         }
     }
+
+    private boolean isImplicitSession(@Nullable final ClientSession session) {
+        return session == null;
+    }
 }
diff --git a/driver-sync/src/test/functional/com/mongodb/client/AbstractClientSideOperationsTimeoutProseTest.java b/driver-sync/src/test/functional/com/mongodb/client/AbstractClientSideOperationsTimeoutProseTest.java
index 5cb042eaad4..524ba02061b 100644
--- a/driver-sync/src/test/functional/com/mongodb/client/AbstractClientSideOperationsTimeoutProseTest.java
+++ b/driver-sync/src/test/functional/com/mongodb/client/AbstractClientSideOperationsTimeoutProseTest.java
@@ -819,6 +819,37 @@ public void testKillCursorsIsNotExecutedAfterGetMoreNetworkErrorWhenTimeoutIsNot
 
     }
 
+    /**
+     * Not a prose spec test. However, it is additional test case for better coverage.
+     */
+    @DisplayName("KillCursors is not executed after getMore network error when timeout is not enabled")
+    @Test
+    public void test() {
+        long rtt = ClusterFixture.getPrimaryRTT();
+        collectionHelper.create(namespace.getCollectionName(), new CreateCollectionOptions());
+        collectionHelper.insertDocuments(new Document(), new Document());
+        try (MongoClient mongoClient = createMongoClient(
+                getMongoClientSettingsBuilder()
+                        .timeout(100, TimeUnit.MINUTES)
+                        .retryReads(true)
+                        .applyToConnectionPoolSettings(builder ->
+                                builder.maxConnectionIdleTime(10, TimeUnit.MINUTES))
+                        .applyToClusterSettings(builder -> builder.serverSelectionTimeout(500, TimeUnit.MINUTES))
+                        .applyToSocketSettings(builder -> builder.readTimeout(500, TimeUnit.MILLISECONDS)))) {
+            MongoCollection collection = mongoClient.getDatabase(namespace.getDatabaseName())
+                    .getCollection(namespace.getCollectionName()).withReadPreference(ReadPreference.primary());
+
+            MongoCursor cursor = collection.find()
+                    .batchSize(1)
+                    .cursor();
+
+            sleep(500);
+            cursor.next();
+            sleep(500);
+            cursor.close();
+        }
+    }
+
     /**
      * Not a prose spec test. However, it is additional test case for better coverage.
      */
diff --git a/driver-sync/src/test/resources/logback-test.xml b/driver-sync/src/test/resources/logback-test.xml
index 022806f0e4e..b25f68499b2 100644
--- a/driver-sync/src/test/resources/logback-test.xml
+++ b/driver-sync/src/test/resources/logback-test.xml
@@ -6,7 +6,7 @@
         
     
 
-    
+    
         
     
 
diff --git a/driver-sync/src/test/unit/com/mongodb/client/internal/ClientSessionBindingSpecification.groovy b/driver-sync/src/test/unit/com/mongodb/client/internal/ClientSessionBindingSpecification.groovy
index 49332bc8ed3..d5383a30ca5 100644
--- a/driver-sync/src/test/unit/com/mongodb/client/internal/ClientSessionBindingSpecification.groovy
+++ b/driver-sync/src/test/unit/com/mongodb/client/internal/ClientSessionBindingSpecification.groovy
@@ -16,59 +16,38 @@
 
 package com.mongodb.client.internal
 
-import com.mongodb.ReadConcern
+
 import com.mongodb.ReadPreference
 import com.mongodb.client.ClientSession
 import com.mongodb.internal.binding.ClusterBinding
 import com.mongodb.internal.binding.ConnectionSource
 import com.mongodb.internal.binding.ReadWriteBinding
 import com.mongodb.internal.connection.Cluster
-import com.mongodb.internal.session.ClientSessionContext
 import spock.lang.Specification
 
 import static com.mongodb.ClusterFixture.OPERATION_CONTEXT
 
 class ClientSessionBindingSpecification extends Specification {
-    def 'should return the session context from the binding'() {
-        given:
-        def session = Stub(ClientSession)
-        def wrappedBinding = Stub(ClusterBinding) {
-            getOperationContext() >> OPERATION_CONTEXT
-        }
-        def binding = new ClientSessionBinding(session, false, wrappedBinding)
-
-        when:
-        def context = binding.getOperationContext().getSessionContext()
-
-        then:
-        (context as ClientSessionContext).getClientSession() == session
-    }
 
-    def 'should return the session context from the connection source'() {
+    def 'should call underlying wrapped binding'() {
         given:
         def session = Stub(ClientSession)
-        def wrappedBinding = Mock(ClusterBinding) {
-            getOperationContext() >> OPERATION_CONTEXT
-        }
+        def wrappedBinding = Mock(ClusterBinding);
         def binding = new ClientSessionBinding(session, false, wrappedBinding)
 
         when:
-        def readConnectionSource = binding.getReadConnectionSource()
-        def context = readConnectionSource.getOperationContext().getSessionContext()
+        binding.getReadConnectionSource(OPERATION_CONTEXT)
 
         then:
-        (context as ClientSessionContext).getClientSession() == session
-        1 * wrappedBinding.getReadConnectionSource() >> {
+        1 * wrappedBinding.getReadConnectionSource(OPERATION_CONTEXT) >> {
             Stub(ConnectionSource)
         }
 
         when:
-        def writeConnectionSource = binding.getWriteConnectionSource()
-        context = writeConnectionSource.getOperationContext().getSessionContext()
+        binding.getWriteConnectionSource(OPERATION_CONTEXT)
 
         then:
-        (context as ClientSessionContext).getClientSession() == session
-        1 * wrappedBinding.getWriteConnectionSource() >> {
+        1 * wrappedBinding.getWriteConnectionSource(OPERATION_CONTEXT) >> {
             Stub(ConnectionSource)
         }
     }
@@ -98,8 +77,8 @@ class ClientSessionBindingSpecification extends Specification {
         def session = Mock(ClientSession)
         def wrappedBinding = createStubBinding()
         def binding = new ClientSessionBinding(session, true, wrappedBinding)
-        def readConnectionSource = binding.getReadConnectionSource()
-        def writeConnectionSource = binding.getWriteConnectionSource()
+        def readConnectionSource = binding.getReadConnectionSource(OPERATION_CONTEXT)
+        def writeConnectionSource = binding.getWriteConnectionSource(OPERATION_CONTEXT)
 
         when:
         binding.release()
@@ -140,23 +119,24 @@ class ClientSessionBindingSpecification extends Specification {
         0 * session.close()
     }
 
-    def 'owned session is implicit'() {
-        given:
-        def session = Mock(ClientSession)
-        def wrappedBinding = createStubBinding()
-
-        when:
-        def binding = new ClientSessionBinding(session, ownsSession, wrappedBinding)
-
-        then:
-        binding.getOperationContext().getSessionContext().isImplicitSession() == ownsSession
-
-        where:
-        ownsSession << [true, false]
-    }
+    //TODO move to SessionContext test
+//    def 'owned session is implicit'() {
+//        given:
+//        def session = Mock(ClientSession)
+//        def wrappedBinding = createStubBinding()
+//
+//        when:
+//        def binding = new ClientSessionBinding(session, ownsSession, wrappedBinding)
+//
+//        then:
+//        binding.getOperationContext().getSessionContext().isImplicitSession() == ownsSession
+//
+//        where:
+//        ownsSession << [true, false]
+//    }
 
     private ReadWriteBinding createStubBinding() {
         def cluster = Stub(Cluster)
-        new ClusterBinding(cluster, ReadPreference.primary(), ReadConcern.DEFAULT, OPERATION_CONTEXT)
+        new ClusterBinding(cluster, ReadPreference.primary())
     }
 }

From da3ac3294db32f2fd20732abb2e0f9935bf49ae2 Mon Sep 17 00:00:00 2001
From: Nabil Hachicha 
Date: Sun, 10 Aug 2025 18:33:33 +0100
Subject: [PATCH 10/36] Adding method to get namespace for Read and Write
 Operations

---
 .../internal/operation/AbortTransactionOperation.java    | 6 ++++++
 .../operation/AbstractWriteSearchIndexOperation.java     | 4 +++-
 .../mongodb/internal/operation/AggregateOperation.java   | 3 ++-
 .../internal/operation/AggregateOperationImpl.java       | 9 +++++----
 .../operation/AggregateToCollectionOperation.java        | 5 +++++
 .../internal/operation/BaseFindAndModifyOperation.java   | 1 +
 .../internal/operation/ClientBulkWriteOperation.java     | 5 +++++
 .../mongodb/internal/operation/CommandReadOperation.java | 7 +++++++
 .../internal/operation/CommitTransactionOperation.java   | 6 ++++++
 .../internal/operation/CountDocumentsOperation.java      | 5 +++++
 .../com/mongodb/internal/operation/CountOperation.java   | 5 +++++
 .../internal/operation/CreateCollectionOperation.java    | 6 ++++++
 .../internal/operation/CreateIndexesOperation.java       | 5 +++++
 .../mongodb/internal/operation/CreateViewOperation.java  | 6 ++++++
 .../mongodb/internal/operation/DistinctOperation.java    | 5 +++++
 .../internal/operation/DropCollectionOperation.java      | 5 +++++
 .../internal/operation/DropDatabaseOperation.java        | 6 ++++++
 .../mongodb/internal/operation/DropIndexOperation.java   | 5 +++++
 .../operation/EstimatedDocumentCountOperation.java       | 5 +++++
 .../com/mongodb/internal/operation/FindOperation.java    | 1 +
 .../internal/operation/ListCollectionsOperation.java     | 7 +++++++
 .../internal/operation/ListDatabasesOperation.java       | 7 +++++++
 .../mongodb/internal/operation/ListIndexesOperation.java | 5 +++++
 .../internal/operation/ListSearchIndexesOperation.java   | 5 +++++
 .../operation/MapReduceToCollectionOperation.java        | 1 +
 .../operation/MapReduceWithInlineResultsOperation.java   | 1 +
 .../internal/operation/MixedBulkWriteOperation.java      | 1 +
 .../com/mongodb/internal/operation/ReadOperation.java    | 6 ++++++
 .../internal/operation/RenameCollectionOperation.java    | 5 +++++
 .../com/mongodb/internal/operation/WriteOperation.java   | 6 ++++++
 .../mongodb/client/internal/MapReduceIterableImpl.java   | 5 +++++
 31 files changed, 143 insertions(+), 6 deletions(-)

diff --git a/driver-core/src/main/com/mongodb/internal/operation/AbortTransactionOperation.java b/driver-core/src/main/com/mongodb/internal/operation/AbortTransactionOperation.java
index bc7e6655bc7..4f48722747e 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/AbortTransactionOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/AbortTransactionOperation.java
@@ -17,6 +17,7 @@
 package com.mongodb.internal.operation;
 
 import com.mongodb.Function;
+import com.mongodb.MongoNamespace;
 import com.mongodb.WriteConcern;
 import com.mongodb.internal.TimeoutContext;
 import com.mongodb.lang.Nullable;
@@ -48,6 +49,11 @@ public String getCommandName() {
         return COMMAND_NAME;
     }
 
+    @Override
+    public MongoNamespace getNamespace() {
+        return new MongoNamespace("admin", MongoNamespace.COMMAND_COLLECTION_NAME); // TODO double check
+    }
+
     @Override
     CommandCreator getCommandCreator() {
         return (operationContext, serverDescription, connectionDescription) -> {
diff --git a/driver-core/src/main/com/mongodb/internal/operation/AbstractWriteSearchIndexOperation.java b/driver-core/src/main/com/mongodb/internal/operation/AbstractWriteSearchIndexOperation.java
index 6ebcfda6dbe..ba033eb949a 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/AbstractWriteSearchIndexOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/AbstractWriteSearchIndexOperation.java
@@ -96,7 +96,9 @@  void swallowOrThrow(@Nullable final E mongoExecutionExcept
 
     abstract BsonDocument buildCommand();
 
-    MongoNamespace getNamespace() {
+
+    @Override
+    public MongoNamespace getNamespace() {
         return namespace;
     }
 }
diff --git a/driver-core/src/main/com/mongodb/internal/operation/AggregateOperation.java b/driver-core/src/main/com/mongodb/internal/operation/AggregateOperation.java
index 1c9abfc68ca..55c5c231a21 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/AggregateOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/AggregateOperation.java
@@ -164,7 +164,8 @@  CommandReadOperation createExplainableOperation(@Nullable final ExplainVe
                 }, resultDecoder);
     }
 
-    MongoNamespace getNamespace() {
+    @Override
+    public MongoNamespace getNamespace() {
         return wrapped.getNamespace();
     }
 }
diff --git a/driver-core/src/main/com/mongodb/internal/operation/AggregateOperationImpl.java b/driver-core/src/main/com/mongodb/internal/operation/AggregateOperationImpl.java
index 4c9bc3828b7..e2e8d6fb426 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/AggregateOperationImpl.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/AggregateOperationImpl.java
@@ -92,10 +92,6 @@ class AggregateOperationImpl implements ReadOperationCursor {
         this.pipelineCreator = notNull("pipelineCreator", pipelineCreator);
     }
 
-    MongoNamespace getNamespace() {
-        return namespace;
-    }
-
     List getPipeline() {
         return pipeline;
     }
@@ -191,6 +187,11 @@ public String getCommandName() {
         return COMMAND_NAME;
     }
 
+    @Override
+    public MongoNamespace getNamespace() {
+        return namespace;
+    }
+
     @Override
     public BatchCursor execute(final ReadBinding binding) {
         return executeRetryableRead(binding, namespace.getDatabaseName(),
diff --git a/driver-core/src/main/com/mongodb/internal/operation/AggregateToCollectionOperation.java b/driver-core/src/main/com/mongodb/internal/operation/AggregateToCollectionOperation.java
index 16f33ad45e5..296b4eabb88 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/AggregateToCollectionOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/AggregateToCollectionOperation.java
@@ -157,6 +157,11 @@ public String getCommandName() {
         return COMMAND_NAME;
     }
 
+    @Override
+    public MongoNamespace getNamespace() {
+        return namespace;
+    }
+
     @Override
     public Void execute(final ReadBinding binding) {
         return executeRetryableRead(binding,
diff --git a/driver-core/src/main/com/mongodb/internal/operation/BaseFindAndModifyOperation.java b/driver-core/src/main/com/mongodb/internal/operation/BaseFindAndModifyOperation.java
index c5d56fda81c..8f66333eb02 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/BaseFindAndModifyOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/BaseFindAndModifyOperation.java
@@ -92,6 +92,7 @@ public void executeAsync(final AsyncWriteBinding binding, final SingleResultCall
                 FindAndModifyHelper.asyncTransformer(), cmd -> cmd, callback);
     }
 
+    @Override
     public MongoNamespace getNamespace() {
         return namespace;
     }
diff --git a/driver-core/src/main/com/mongodb/internal/operation/ClientBulkWriteOperation.java b/driver-core/src/main/com/mongodb/internal/operation/ClientBulkWriteOperation.java
index 2b9e79f6f06..ad380781f73 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/ClientBulkWriteOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/ClientBulkWriteOperation.java
@@ -182,6 +182,11 @@ public String getCommandName() {
         return "bulkWrite";
     }
 
+    @Override
+    public MongoNamespace getNamespace() {
+        return getNamespacedModel(models, 0).getNamespace();
+    }
+
     @Override
     public ClientBulkWriteResult execute(final WriteBinding binding) throws ClientBulkWriteException {
         WriteConcern effectiveWriteConcern = validateAndGetEffectiveWriteConcern(binding.getOperationContext().getSessionContext());
diff --git a/driver-core/src/main/com/mongodb/internal/operation/CommandReadOperation.java b/driver-core/src/main/com/mongodb/internal/operation/CommandReadOperation.java
index 6965bfc34a3..0fbc6eb06e9 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/CommandReadOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/CommandReadOperation.java
@@ -16,12 +16,14 @@
 
 package com.mongodb.internal.operation;
 
+import com.mongodb.MongoNamespace;
 import com.mongodb.internal.async.SingleResultCallback;
 import com.mongodb.internal.binding.AsyncReadBinding;
 import com.mongodb.internal.binding.ReadBinding;
 import org.bson.BsonDocument;
 import org.bson.codecs.Decoder;
 
+import static com.mongodb.MongoNamespace.COMMAND_COLLECTION_NAME;
 import static com.mongodb.assertions.Assertions.notNull;
 import static com.mongodb.internal.operation.AsyncOperationHelper.executeRetryableReadAsync;
 import static com.mongodb.internal.operation.CommandOperationHelper.CommandCreator;
@@ -55,6 +57,11 @@ public String getCommandName() {
         return commandName;
     }
 
+    @Override
+    public MongoNamespace getNamespace() {
+        return new MongoNamespace(databaseName, COMMAND_COLLECTION_NAME);
+    }
+
     @Override
     public T execute(final ReadBinding binding) {
         return executeRetryableRead(binding, databaseName, commandCreator, decoder,
diff --git a/driver-core/src/main/com/mongodb/internal/operation/CommitTransactionOperation.java b/driver-core/src/main/com/mongodb/internal/operation/CommitTransactionOperation.java
index 998a002f348..97e62ffceac 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/CommitTransactionOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/CommitTransactionOperation.java
@@ -19,6 +19,7 @@
 import com.mongodb.Function;
 import com.mongodb.MongoException;
 import com.mongodb.MongoExecutionTimeoutException;
+import com.mongodb.MongoNamespace;
 import com.mongodb.MongoNodeIsRecoveringException;
 import com.mongodb.MongoNotPrimaryException;
 import com.mongodb.MongoSocketException;
@@ -116,6 +117,11 @@ public String getCommandName() {
         return COMMAND_NAME;
     }
 
+    @Override
+    public MongoNamespace getNamespace() {
+        return new MongoNamespace("admin", MongoNamespace.COMMAND_COLLECTION_NAME);
+    }
+
     @Override
     CommandCreator getCommandCreator() {
         CommandCreator creator = (operationContext, serverDescription, connectionDescription) -> {
diff --git a/driver-core/src/main/com/mongodb/internal/operation/CountDocumentsOperation.java b/driver-core/src/main/com/mongodb/internal/operation/CountDocumentsOperation.java
index 9460026062a..157d3660904 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/CountDocumentsOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/CountDocumentsOperation.java
@@ -125,6 +125,11 @@ public String getCommandName() {
         return COMMAND_NAME;
     }
 
+    @Override
+    public MongoNamespace getNamespace() {
+        return namespace;
+    }
+
     @Override
     public Long execute(final ReadBinding binding) {
         try (BatchCursor cursor = getAggregateOperation().execute(binding)) {
diff --git a/driver-core/src/main/com/mongodb/internal/operation/CountOperation.java b/driver-core/src/main/com/mongodb/internal/operation/CountOperation.java
index 6d0b7b78f93..d38a7c11333 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/CountOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/CountOperation.java
@@ -115,6 +115,11 @@ public String getCommandName() {
         return COMMAND_NAME;
     }
 
+    @Override
+    public MongoNamespace getNamespace() {
+        return namespace;
+    }
+
     @Override
     public Long execute(final ReadBinding binding) {
         return executeRetryableRead(binding, namespace.getDatabaseName(),
diff --git a/driver-core/src/main/com/mongodb/internal/operation/CreateCollectionOperation.java b/driver-core/src/main/com/mongodb/internal/operation/CreateCollectionOperation.java
index 5284076eecb..d8e757054c0 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/CreateCollectionOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/CreateCollectionOperation.java
@@ -18,6 +18,7 @@
 
 import com.mongodb.MongoClientException;
 import com.mongodb.MongoException;
+import com.mongodb.MongoNamespace;
 import com.mongodb.WriteConcern;
 import com.mongodb.client.model.ChangeStreamPreAndPostImagesOptions;
 import com.mongodb.client.model.Collation;
@@ -236,6 +237,11 @@ public String getCommandName() {
         return "createCollection";
     }
 
+    @Override
+    public MongoNamespace getNamespace() {
+        return new MongoNamespace(databaseName, collectionName);
+    }
+
     @Override
     public Void execute(final WriteBinding binding) {
         return withConnection(binding, connection -> {
diff --git a/driver-core/src/main/com/mongodb/internal/operation/CreateIndexesOperation.java b/driver-core/src/main/com/mongodb/internal/operation/CreateIndexesOperation.java
index b9b4242a3f4..7e634f136e2 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/CreateIndexesOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/CreateIndexesOperation.java
@@ -105,6 +105,11 @@ public String getCommandName() {
         return COMMAND_NAME;
     }
 
+    @Override
+    public MongoNamespace getNamespace() {
+        return namespace;
+    }
+
     @Override
     public Void execute(final WriteBinding binding) {
         try {
diff --git a/driver-core/src/main/com/mongodb/internal/operation/CreateViewOperation.java b/driver-core/src/main/com/mongodb/internal/operation/CreateViewOperation.java
index 49b47fb7e9c..61fd58d5a0f 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/CreateViewOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/CreateViewOperation.java
@@ -16,6 +16,7 @@
 
 package com.mongodb.internal.operation;
 
+import com.mongodb.MongoNamespace;
 import com.mongodb.WriteConcern;
 import com.mongodb.client.model.Collation;
 import com.mongodb.internal.async.SingleResultCallback;
@@ -128,6 +129,11 @@ public String getCommandName() {
         return "createView";
     }
 
+    @Override
+    public MongoNamespace getNamespace() {
+        return new MongoNamespace(databaseName, viewName);
+    }
+
     @Override
     public Void execute(final WriteBinding binding) {
         return withConnection(binding, connection -> {
diff --git a/driver-core/src/main/com/mongodb/internal/operation/DistinctOperation.java b/driver-core/src/main/com/mongodb/internal/operation/DistinctOperation.java
index 489e3923bdc..10c4c320100 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/DistinctOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/DistinctOperation.java
@@ -113,6 +113,11 @@ public String getCommandName() {
         return COMMAND_NAME;
     }
 
+    @Override
+    public MongoNamespace getNamespace() {
+        return namespace;
+    }
+
     @Override
     public BatchCursor execute(final ReadBinding binding) {
         return executeRetryableRead(binding, namespace.getDatabaseName(), getCommandCreator(), createCommandDecoder(),
diff --git a/driver-core/src/main/com/mongodb/internal/operation/DropCollectionOperation.java b/driver-core/src/main/com/mongodb/internal/operation/DropCollectionOperation.java
index 5f61f2980f8..6bdbfa7bbcd 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/DropCollectionOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/DropCollectionOperation.java
@@ -91,6 +91,11 @@ public String getCommandName() {
         return "dropCollection";
     }
 
+    @Override
+    public MongoNamespace getNamespace() {
+        return namespace;
+    }
+
     @Override
     public Void execute(final WriteBinding binding) {
         BsonDocument localEncryptedFields = getEncryptedFields((ReadWriteBinding) binding);
diff --git a/driver-core/src/main/com/mongodb/internal/operation/DropDatabaseOperation.java b/driver-core/src/main/com/mongodb/internal/operation/DropDatabaseOperation.java
index d619176e8a3..2ee963923fe 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/DropDatabaseOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/DropDatabaseOperation.java
@@ -16,6 +16,7 @@
 
 package com.mongodb.internal.operation;
 
+import com.mongodb.MongoNamespace;
 import com.mongodb.WriteConcern;
 import com.mongodb.internal.async.SingleResultCallback;
 import com.mongodb.internal.binding.AsyncWriteBinding;
@@ -60,6 +61,11 @@ public String getCommandName() {
         return "dropDatabase";
     }
 
+    @Override
+    public MongoNamespace getNamespace() {
+        return new MongoNamespace(databaseName, MongoNamespace.COMMAND_COLLECTION_NAME);
+    }
+
     @Override
     public Void execute(final WriteBinding binding) {
         return withConnection(binding, connection -> {
diff --git a/driver-core/src/main/com/mongodb/internal/operation/DropIndexOperation.java b/driver-core/src/main/com/mongodb/internal/operation/DropIndexOperation.java
index 3671a90aa56..8a3a66e3c50 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/DropIndexOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/DropIndexOperation.java
@@ -70,6 +70,11 @@ public String getCommandName() {
         return COMMAND_NAME;
     }
 
+    @Override
+    public MongoNamespace getNamespace() {
+        return namespace;
+    }
+
     @Override
     public Void execute(final WriteBinding binding) {
         try {
diff --git a/driver-core/src/main/com/mongodb/internal/operation/EstimatedDocumentCountOperation.java b/driver-core/src/main/com/mongodb/internal/operation/EstimatedDocumentCountOperation.java
index 427cd40dc40..6308aae56ea 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/EstimatedDocumentCountOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/EstimatedDocumentCountOperation.java
@@ -75,6 +75,11 @@ public String getCommandName() {
         return COMMAND_NAME;
     }
 
+    @Override
+    public MongoNamespace getNamespace() {
+        return namespace;
+    }
+
     @Override
     public Long execute(final ReadBinding binding) {
         try {
diff --git a/driver-core/src/main/com/mongodb/internal/operation/FindOperation.java b/driver-core/src/main/com/mongodb/internal/operation/FindOperation.java
index 2e6560e23c3..b18fc4ca1e0 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/FindOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/FindOperation.java
@@ -99,6 +99,7 @@ public FindOperation(final MongoNamespace namespace, final Decoder decoder) {
         this.decoder = notNull("decoder", decoder);
     }
 
+    @Override
     public MongoNamespace getNamespace() {
         return namespace;
     }
diff --git a/driver-core/src/main/com/mongodb/internal/operation/ListCollectionsOperation.java b/driver-core/src/main/com/mongodb/internal/operation/ListCollectionsOperation.java
index 8740986b23f..da3966b26de 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/ListCollectionsOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/ListCollectionsOperation.java
@@ -17,6 +17,7 @@
 package com.mongodb.internal.operation;
 
 import com.mongodb.MongoCommandException;
+import com.mongodb.MongoNamespace;
 import com.mongodb.client.cursor.TimeoutMode;
 import com.mongodb.internal.VisibleForTesting;
 import com.mongodb.internal.async.AsyncBatchCursor;
@@ -34,6 +35,7 @@
 
 import java.util.function.Supplier;
 
+import static com.mongodb.MongoNamespace.COMMAND_COLLECTION_NAME;
 import static com.mongodb.assertions.Assertions.notNull;
 import static com.mongodb.internal.VisibleForTesting.AccessModifier.PRIVATE;
 import static com.mongodb.internal.async.ErrorHandlingResultCallback.errorHandlingCallback;
@@ -86,6 +88,11 @@ public ListCollectionsOperation(final String databaseName, final Decoder deco
         this.decoder = notNull("decoder", decoder);
     }
 
+    @Override
+    public MongoNamespace getNamespace() {
+        return new MongoNamespace(databaseName, COMMAND_COLLECTION_NAME);
+    }
+
     public BsonDocument getFilter() {
         return filter;
     }
diff --git a/driver-core/src/main/com/mongodb/internal/operation/ListDatabasesOperation.java b/driver-core/src/main/com/mongodb/internal/operation/ListDatabasesOperation.java
index 4787153190b..d51194406b6 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/ListDatabasesOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/ListDatabasesOperation.java
@@ -16,6 +16,7 @@
 
 package com.mongodb.internal.operation;
 
+import com.mongodb.MongoNamespace;
 import com.mongodb.internal.async.AsyncBatchCursor;
 import com.mongodb.internal.async.SingleResultCallback;
 import com.mongodb.internal.binding.AsyncReadBinding;
@@ -26,6 +27,7 @@
 import org.bson.BsonValue;
 import org.bson.codecs.Decoder;
 
+import static com.mongodb.MongoNamespace.COMMAND_COLLECTION_NAME;
 import static com.mongodb.assertions.Assertions.notNull;
 import static com.mongodb.internal.async.ErrorHandlingResultCallback.errorHandlingCallback;
 import static com.mongodb.internal.operation.AsyncOperationHelper.asyncSingleBatchCursorTransformer;
@@ -107,6 +109,11 @@ public String getCommandName() {
         return COMMAND_NAME;
     }
 
+    @Override
+    public MongoNamespace getNamespace() {
+        return new MongoNamespace("admin", COMMAND_COLLECTION_NAME);
+    }
+
     @Override
     public BatchCursor execute(final ReadBinding binding) {
         return executeRetryableRead(binding, "admin", getCommandCreator(), CommandResultDocumentCodec.create(decoder, DATABASES),
diff --git a/driver-core/src/main/com/mongodb/internal/operation/ListIndexesOperation.java b/driver-core/src/main/com/mongodb/internal/operation/ListIndexesOperation.java
index a97acd64d58..76900ab296e 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/ListIndexesOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/ListIndexesOperation.java
@@ -122,6 +122,11 @@ public String getCommandName() {
         return COMMAND_NAME;
     }
 
+    @Override
+    public MongoNamespace getNamespace() {
+        return namespace;
+    }
+
     @Override
     public BatchCursor execute(final ReadBinding binding) {
         RetryState retryState = initialRetryState(retryReads, binding.getOperationContext().getTimeoutContext());
diff --git a/driver-core/src/main/com/mongodb/internal/operation/ListSearchIndexesOperation.java b/driver-core/src/main/com/mongodb/internal/operation/ListSearchIndexesOperation.java
index 7fadead0b57..3c78297463e 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/ListSearchIndexesOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/ListSearchIndexesOperation.java
@@ -78,6 +78,11 @@ public String getCommandName() {
         return COMMAND_NAME;
     }
 
+    @Override
+    public MongoNamespace getNamespace() {
+        return namespace;
+    }
+
     @Override
     public BatchCursor execute(final ReadBinding binding) {
         try {
diff --git a/driver-core/src/main/com/mongodb/internal/operation/MapReduceToCollectionOperation.java b/driver-core/src/main/com/mongodb/internal/operation/MapReduceToCollectionOperation.java
index bfcc73a5aa6..96f5a8418d0 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/MapReduceToCollectionOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/MapReduceToCollectionOperation.java
@@ -87,6 +87,7 @@ public MapReduceToCollectionOperation(final MongoNamespace namespace, final Bson
         this.writeConcern = writeConcern;
     }
 
+    @Override
     public MongoNamespace getNamespace() {
         return namespace;
     }
diff --git a/driver-core/src/main/com/mongodb/internal/operation/MapReduceWithInlineResultsOperation.java b/driver-core/src/main/com/mongodb/internal/operation/MapReduceWithInlineResultsOperation.java
index 6661c2a5c77..abbd2fc6ae8 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/MapReduceWithInlineResultsOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/MapReduceWithInlineResultsOperation.java
@@ -76,6 +76,7 @@ public MapReduceWithInlineResultsOperation(final MongoNamespace namespace, final
         this.decoder = notNull("decoder", decoder);
     }
 
+    @Override
     public MongoNamespace getNamespace() {
         return namespace;
     }
diff --git a/driver-core/src/main/com/mongodb/internal/operation/MixedBulkWriteOperation.java b/driver-core/src/main/com/mongodb/internal/operation/MixedBulkWriteOperation.java
index 39ff2dab17f..b17a3bae30b 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/MixedBulkWriteOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/MixedBulkWriteOperation.java
@@ -101,6 +101,7 @@ public MixedBulkWriteOperation(final MongoNamespace namespace, final List {
      */
     String getCommandName();
 
+    /**
+     * @return the namespace of the operation
+     */
+    MongoNamespace getNamespace();
+
     /**
      * General execute which can return anything of type T
      *
diff --git a/driver-core/src/main/com/mongodb/internal/operation/RenameCollectionOperation.java b/driver-core/src/main/com/mongodb/internal/operation/RenameCollectionOperation.java
index ea477bf67bd..81d3b0bffe9 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/RenameCollectionOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/RenameCollectionOperation.java
@@ -79,6 +79,11 @@ public String getCommandName() {
         return COMMAND_NAME;
     }
 
+    @Override
+    public MongoNamespace getNamespace() {
+        return originalNamespace;
+    }
+
     @Override
     public Void execute(final WriteBinding binding) {
         return withConnection(binding, connection -> executeCommand(binding, "admin", getCommand(), connection,
diff --git a/driver-core/src/main/com/mongodb/internal/operation/WriteOperation.java b/driver-core/src/main/com/mongodb/internal/operation/WriteOperation.java
index 73cec2f416b..b4e2b4a25b4 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/WriteOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/WriteOperation.java
@@ -16,6 +16,7 @@
 
 package com.mongodb.internal.operation;
 
+import com.mongodb.MongoNamespace;
 import com.mongodb.internal.async.SingleResultCallback;
 import com.mongodb.internal.binding.AsyncWriteBinding;
 import com.mongodb.internal.binding.WriteBinding;
@@ -32,6 +33,11 @@ public interface WriteOperation {
      */
     String getCommandName();
 
+    /**
+     * @return the namespace of the operation
+     */
+    MongoNamespace getNamespace();
+
     /**
      * General execute which can return anything of type T
      *
diff --git a/driver-sync/src/main/com/mongodb/client/internal/MapReduceIterableImpl.java b/driver-sync/src/main/com/mongodb/client/internal/MapReduceIterableImpl.java
index be3e8ca05e9..b7c05c5ffc2 100644
--- a/driver-sync/src/main/com/mongodb/client/internal/MapReduceIterableImpl.java
+++ b/driver-sync/src/main/com/mongodb/client/internal/MapReduceIterableImpl.java
@@ -240,6 +240,11 @@ public String getCommandName() {
             return operation.getCommandName();
         }
 
+        @Override
+        public MongoNamespace getNamespace() {
+            return operation.getNamespace();
+        }
+
         @Override
         public BatchCursor execute(final ReadBinding binding) {
             return operation.execute(binding);

From 1a75290ed1a90521b6fa6900eb96f078dc2d4544 Mon Sep 17 00:00:00 2001
From: Nabil Hachicha 
Date: Sun, 10 Aug 2025 18:56:30 +0100
Subject: [PATCH 11/36] Refactoring operations and command spans

---
 config/checkstyle/suppressions.xml            |  1 +
 .../connection/InternalStreamConnection.java  | 42 +++++++++++++------
 .../internal/connection/OperationContext.java | 24 +++++------
 .../com/mongodb/internal/tracing/Tags.java    |  9 +++-
 .../com/mongodb/tracing/MicrometerTracer.java | 17 ++++++++
 driver-core/src/test/resources/specifications |  2 +-
 .../LegacyMixedBulkWriteOperation.java        |  5 +++
 .../internal/MapReducePublisherImpl.java      | 10 +++++
 ...dReadOperationThenCursorReadOperation.java |  6 +++
 ...WriteOperationThenCursorReadOperation.java |  6 +++
 .../client/internal/MongoClusterImpl.java     | 23 ++++++----
 .../com/mongodb/client/unified/Entities.java  |  6 +--
 .../client/unified/MicrometerTracingTest.java |  2 +-
 .../mongodb/client/unified/UnifiedTest.java   | 24 ++++++++++-
 14 files changed, 138 insertions(+), 39 deletions(-)

diff --git a/config/checkstyle/suppressions.xml b/config/checkstyle/suppressions.xml
index 6d24f861e08..f3e6d3ef2ff 100644
--- a/config/checkstyle/suppressions.xml
+++ b/config/checkstyle/suppressions.xml
@@ -60,6 +60,7 @@
 
     
     
+    
 
     
     
diff --git a/driver-core/src/main/com/mongodb/internal/connection/InternalStreamConnection.java b/driver-core/src/main/com/mongodb/internal/connection/InternalStreamConnection.java
index 56bcc48ce34..535c2fb2255 100644
--- a/driver-core/src/main/com/mongodb/internal/connection/InternalStreamConnection.java
+++ b/driver-core/src/main/com/mongodb/internal/connection/InternalStreamConnection.java
@@ -30,6 +30,7 @@
 import com.mongodb.MongoSocketWriteException;
 import com.mongodb.MongoSocketWriteTimeoutException;
 import com.mongodb.ServerAddress;
+import com.mongodb.UnixServerAddress;
 import com.mongodb.annotations.NotThreadSafe;
 import com.mongodb.connection.AsyncCompletionHandler;
 import com.mongodb.connection.ClusterConnectionMode;
@@ -97,8 +98,11 @@
 import static com.mongodb.internal.logging.LogMessage.Level.DEBUG;
 import static com.mongodb.internal.thread.InterruptionUtil.translateInterruptedException;
 import static com.mongodb.internal.tracing.Tags.CLIENT_CONNECTION_ID;
+import static com.mongodb.internal.tracing.Tags.COLLECTION;
+import static com.mongodb.internal.tracing.Tags.COMMAND_NAME;
 import static com.mongodb.internal.tracing.Tags.CURSOR_ID;
 import static com.mongodb.internal.tracing.Tags.NAMESPACE;
+import static com.mongodb.internal.tracing.Tags.NETWORK_TRANSPORT;
 import static com.mongodb.internal.tracing.Tags.QUERY_SUMMARY;
 import static com.mongodb.internal.tracing.Tags.QUERY_TEXT;
 import static com.mongodb.internal.tracing.Tags.SERVER_ADDRESS;
@@ -446,10 +450,10 @@ public boolean reauthenticationIsTriggered(@Nullable final Throwable t) {
     private  T sendAndReceiveInternal(final CommandMessage message, final Decoder decoder,
             final OperationContext operationContext) {
         CommandEventSender commandEventSender;
-
+        Span tracingSpan;
         try (ByteBufferBsonOutput bsonOutput = new ByteBufferBsonOutput(this)) {
             message.encode(bsonOutput, operationContext);
-            Span tracingSpan = createTracingSpan(message, operationContext, bsonOutput);
+            tracingSpan = createTracingSpan(message, operationContext, bsonOutput);
 
             boolean isLoggingCommandNeeded = isLoggingCommandNeeded();
             boolean isTracingCommandPayloadNeeded = tracingSpan != null && operationContext.getTracingManager().isCommandPayloadEnabled();
@@ -480,17 +484,16 @@ private  T sendAndReceiveInternal(final CommandMessage message, final Decoder
                 }
                 commandEventSender.sendFailedEvent(e);
                 throw e;
-            } finally {
-                if (tracingSpan != null) {
-                    tracingSpan.end();
-                }
             }
         }
 
         if (message.isResponseExpected()) {
-            return receiveCommandMessageResponse(decoder, commandEventSender, operationContext);
+            return receiveCommandMessageResponse(decoder, commandEventSender, operationContext, tracingSpan);
         } else {
             commandEventSender.sendSucceededEventForOneWayCommand();
+            if (tracingSpan != null) {
+                tracingSpan.end();
+            }
             return null;
         }
     }
@@ -509,7 +512,7 @@ public  void send(final CommandMessage message, final Decoder decoder, fin
     @Override
     public  T receive(final Decoder decoder, final OperationContext operationContext) {
         isTrue("Response is expected", hasMoreToCome);
-        return receiveCommandMessageResponse(decoder, new NoOpCommandEventSender(), operationContext);
+        return receiveCommandMessageResponse(decoder, new NoOpCommandEventSender(), operationContext, null);
     }
 
     @Override
@@ -555,7 +558,7 @@ private void trySendMessage(final CommandMessage message, final ByteBufferBsonOu
     }
 
     private  T receiveCommandMessageResponse(final Decoder decoder, final CommandEventSender commandEventSender,
-            final OperationContext operationContext) {
+            final OperationContext operationContext, @Nullable final Span tracingSpan) {
         boolean commandSuccessful = false;
         try (ResponseBuffers responseBuffers = receiveResponseBuffers(operationContext)) {
             updateSessionContext(operationContext.getSessionContext(), responseBuffers);
@@ -580,7 +583,14 @@ private  T receiveCommandMessageResponse(final Decoder decoder, final Comm
             if (!commandSuccessful) {
                 commandEventSender.sendFailedEvent(e);
             }
+            if (tracingSpan != null) {
+                tracingSpan.error(e);
+            }
             throw e;
+        } finally {
+            if (tracingSpan != null) {
+                tracingSpan.end();
+            }
         }
     }
 
@@ -1043,14 +1053,22 @@ private Span createTracingSpan(final CommandMessage message, final OperationCont
             return null;
         }
 
+         Span operationSpan = operationContext.getTracingSpan();
          Span span = tracingManager
-                .addSpan("Command " + commandName, operationContext.getTracingSpanContext())
+                .addSpan("Command " + commandName,  operationSpan != null ? operationSpan.context() : null)
                 .tag(SYSTEM, "mongodb")
                 .tag(NAMESPACE, message.getNamespace().getDatabaseName())
-                .tag(QUERY_SUMMARY, commandName);
+                .tag(COLLECTION, message.getCollectionName())
+                .tag(QUERY_SUMMARY, commandName)
+                .tag(COMMAND_NAME, commandName)
+                .tag(NETWORK_TRANSPORT, getServerAddress() instanceof UnixServerAddress ? "unix" : "tcp");
 
         if (command.containsKey("getMore")) {
-            span.tag(CURSOR_ID, command.getInt64("getMore").longValue());
+            long cursorId = command.getInt64("getMore").longValue();
+            span.tag(CURSOR_ID, cursorId);
+            if (operationSpan != null) {
+                operationSpan.tag(CURSOR_ID, cursorId);
+            }
         }
 
         tagServerAndConnectionInfo(span, message);
diff --git a/driver-core/src/main/com/mongodb/internal/connection/OperationContext.java b/driver-core/src/main/com/mongodb/internal/connection/OperationContext.java
index 9f1c232b274..bc4a785d545 100644
--- a/driver-core/src/main/com/mongodb/internal/connection/OperationContext.java
+++ b/driver-core/src/main/com/mongodb/internal/connection/OperationContext.java
@@ -27,7 +27,7 @@
 import com.mongodb.internal.TimeoutSettings;
 import com.mongodb.internal.VisibleForTesting;
 import com.mongodb.internal.session.SessionContext;
-import com.mongodb.internal.tracing.TraceContext;
+import com.mongodb.internal.tracing.Span;
 import com.mongodb.internal.tracing.TracingManager;
 import com.mongodb.lang.Nullable;
 import com.mongodb.selector.ServerSelector;
@@ -55,7 +55,7 @@ public class OperationContext {
     @Nullable
     private final String operationName;
     @Nullable
-    private TraceContext tracingContext;
+    private Span tracingSpan;
 
     public OperationContext(final RequestContext requestContext, final SessionContext sessionContext, final TimeoutContext timeoutContext,
             @Nullable final ServerApi serverApi) {
@@ -97,17 +97,17 @@ public static OperationContext simpleOperationContext(final TimeoutContext timeo
 
     public OperationContext withSessionContext(final SessionContext sessionContext) {
         return new OperationContext(id, requestContext, sessionContext, timeoutContext, serverDeprioritization, tracingManager, serverApi,
-                operationName, tracingContext);
+                operationName, tracingSpan);
     }
 
     public OperationContext withTimeoutContext(final TimeoutContext timeoutContext) {
         return new OperationContext(id, requestContext, sessionContext, timeoutContext, serverDeprioritization, tracingManager, serverApi,
-                operationName, tracingContext);
+                operationName, tracingSpan);
     }
 
     public OperationContext withOperationName(final String operationName) {
         return new OperationContext(id, requestContext, sessionContext, timeoutContext, serverDeprioritization, tracingManager, serverApi,
-                operationName, tracingContext);
+                operationName, tracingSpan);
     }
 
     public long getId() {
@@ -141,12 +141,12 @@ public String getOperationName() {
     }
 
     @Nullable
-    public TraceContext getTracingSpanContext() {
-        return tracingContext != null ? tracingContext : null;
+    public Span getTracingSpan() {
+        return tracingSpan;
     }
 
-    public void setTracingContext(final TraceContext tracingContext) {
-        this.tracingContext = tracingContext;
+    public void setTracingSpan(final Span tracingSpan) {
+        this.tracingSpan = tracingSpan;
     }
 
     @VisibleForTesting(otherwise = VisibleForTesting.AccessModifier.PRIVATE)
@@ -158,7 +158,7 @@ public OperationContext(final long id,
             final TracingManager tracingManager,
             @Nullable final ServerApi serverApi,
             @Nullable final String operationName,
-            @Nullable final TraceContext tracingContext) {
+            @Nullable final Span tracingSpan) {
 
         this.id = id;
         this.serverDeprioritization = serverDeprioritization;
@@ -168,7 +168,7 @@ public OperationContext(final long id,
         this.tracingManager = tracingManager;
         this.serverApi = serverApi;
         this.operationName = operationName;
-        this.tracingContext = tracingContext;
+        this.tracingSpan = tracingSpan;
     }
 
     @VisibleForTesting(otherwise = VisibleForTesting.AccessModifier.PRIVATE)
@@ -187,7 +187,7 @@ public OperationContext(final long id,
         this.tracingManager = tracingManager;
         this.serverApi = serverApi;
         this.operationName = operationName;
-        this.tracingContext = null;
+        this.tracingSpan = null;
     }
 
 
diff --git a/driver-core/src/main/com/mongodb/internal/tracing/Tags.java b/driver-core/src/main/com/mongodb/internal/tracing/Tags.java
index e4407f2a401..c7261a63af4 100644
--- a/driver-core/src/main/com/mongodb/internal/tracing/Tags.java
+++ b/driver-core/src/main/com/mongodb/internal/tracing/Tags.java
@@ -29,14 +29,21 @@ private Tags() {
     public static final String SYSTEM = "db.system";
     public static final String NAMESPACE = "db.namespace";
     public static final String COLLECTION = "db.collection.name";
+    public static final String OPERATION_NAME = "db.operation.name";
+    public static final String COMMAND_NAME = "db.command.name";
+    public static final String NETWORK_TRANSPORT = "network.transport";
+    public static final String OPERATION_SUMMARY = "db.operation.summary";
     public static final String QUERY_SUMMARY = "db.query.summary";
     public static final String QUERY_TEXT = "db.query.text";
     public static final String CURSOR_ID = "db.mongodb.cursor_id";
     public static final String SERVER_ADDRESS = "server.address";
     public static final String SERVER_PORT = "server.port";
     public static final String SERVER_TYPE = "server.type";
-    public static final String CLIENT_CONNECTION_ID = "db.mongodb.client_connection_id";
+    public static final String CLIENT_CONNECTION_ID = "db.mongodb.driver_connection_id";
     public static final String SERVER_CONNECTION_ID = "db.mongodb.server_connection_id";
     public static final String TRANSACTION_NUMBER = "db.mongodb.txnNumber";
     public static final String SESSION_ID = "db.mongodb.lsid";
+    public static final String EXCEPTION_STACKTRACE = "exception.stacktrace";
+    public static final String EXCEPTION_TYPE = "exception.type";
+    public static final String EXCEPTION_MESSAGE = "exception.message";
 }
diff --git a/driver-core/src/main/com/mongodb/tracing/MicrometerTracer.java b/driver-core/src/main/com/mongodb/tracing/MicrometerTracer.java
index ed678b93cab..7ed0119d21d 100644
--- a/driver-core/src/main/com/mongodb/tracing/MicrometerTracer.java
+++ b/driver-core/src/main/com/mongodb/tracing/MicrometerTracer.java
@@ -21,6 +21,13 @@
 import com.mongodb.internal.tracing.Tracer;
 import com.mongodb.lang.Nullable;
 
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
+import static com.mongodb.internal.tracing.Tags.EXCEPTION_MESSAGE;
+import static com.mongodb.internal.tracing.Tags.EXCEPTION_STACKTRACE;
+import static com.mongodb.internal.tracing.Tags.EXCEPTION_TYPE;
+
 /**
  * A {@link Tracer} implementation that delegates tracing operations to a Micrometer {@link io.micrometer.tracing.Tracer}.
  * 

@@ -148,6 +155,9 @@ public void event(final String event) {
 
         @Override
         public void error(final Throwable throwable) {
+            span.tag(EXCEPTION_MESSAGE, throwable.getMessage());
+            span.tag(EXCEPTION_TYPE, throwable.getClass().getName());
+            span.tag(EXCEPTION_STACKTRACE, getStackTraceAsString(throwable));
             span.error(throwable);
         }
 
@@ -160,5 +170,12 @@ public void end() {
         public TraceContext context() {
             return new MicrometerTraceContext(span.context());
         }
+
+        private String getStackTraceAsString(final Throwable throwable) {
+            StringWriter sw = new StringWriter();
+            PrintWriter pw = new PrintWriter(sw);
+            throwable.printStackTrace(pw);
+            return sw.toString();
+        }
     }
 }
diff --git a/driver-core/src/test/resources/specifications b/driver-core/src/test/resources/specifications
index 61270d61656..8466c1b9df5 160000
--- a/driver-core/src/test/resources/specifications
+++ b/driver-core/src/test/resources/specifications
@@ -1 +1 @@
-Subproject commit 61270d61656709944e6b75e160453e3bfa658483
+Subproject commit 8466c1b9df5b2c4b293bb9223b55aa16d34e9e0f
diff --git a/driver-legacy/src/main/com/mongodb/LegacyMixedBulkWriteOperation.java b/driver-legacy/src/main/com/mongodb/LegacyMixedBulkWriteOperation.java
index 95990833f00..47749129115 100644
--- a/driver-legacy/src/main/com/mongodb/LegacyMixedBulkWriteOperation.java
+++ b/driver-legacy/src/main/com/mongodb/LegacyMixedBulkWriteOperation.java
@@ -97,6 +97,11 @@ public String getCommandName() {
         return wrappedOperation.getCommandName();
     }
 
+    @Override
+    public MongoNamespace getNamespace() {
+        return wrappedOperation.getNamespace();
+    }
+
     @Override
     public WriteConcernResult execute(final WriteBinding binding) {
         try {
diff --git a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/MapReducePublisherImpl.java b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/MapReducePublisherImpl.java
index 27e69762a09..46096d6ff58 100644
--- a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/MapReducePublisherImpl.java
+++ b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/MapReducePublisherImpl.java
@@ -240,6 +240,11 @@ public String getCommandName() {
             return operation.getCommandName();
         }
 
+        @Override
+        public MongoNamespace getNamespace() {
+            return operation.getNamespace();
+        }
+
         @Override
         public void executeAsync(final AsyncReadBinding binding, final SingleResultCallback> callback) {
             operation.executeAsync(binding, callback::onResult);
@@ -262,6 +267,11 @@ public String getCommandName() {
             return operation.getCommandName();
         }
 
+        @Override
+        public MongoNamespace getNamespace() {
+            return operation.getNamespace();
+        }
+
         @Override
         public Void execute(final WriteBinding binding) {
             throw new UnsupportedOperationException("This operation is async only");
diff --git a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/VoidReadOperationThenCursorReadOperation.java b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/VoidReadOperationThenCursorReadOperation.java
index e74949432b9..f5f3ae29969 100644
--- a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/VoidReadOperationThenCursorReadOperation.java
+++ b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/VoidReadOperationThenCursorReadOperation.java
@@ -16,6 +16,7 @@
 
 package com.mongodb.reactivestreams.client.internal;
 
+import com.mongodb.MongoNamespace;
 import com.mongodb.internal.async.AsyncBatchCursor;
 import com.mongodb.internal.async.SingleResultCallback;
 import com.mongodb.internal.binding.AsyncReadBinding;
@@ -45,6 +46,11 @@ public String getCommandName() {
         return readOperation.getCommandName();
     }
 
+    @Override
+    public MongoNamespace getNamespace() {
+        return readOperation.getNamespace();
+    }
+
     @Override
     public void executeAsync(final AsyncReadBinding binding, final SingleResultCallback> callback) {
         readOperation.executeAsync(binding, (result, t) -> {
diff --git a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/VoidWriteOperationThenCursorReadOperation.java b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/VoidWriteOperationThenCursorReadOperation.java
index 428ad21ca26..1a741d7d0f6 100644
--- a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/VoidWriteOperationThenCursorReadOperation.java
+++ b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/VoidWriteOperationThenCursorReadOperation.java
@@ -16,6 +16,7 @@
 
 package com.mongodb.reactivestreams.client.internal;
 
+import com.mongodb.MongoNamespace;
 import com.mongodb.internal.async.AsyncBatchCursor;
 import com.mongodb.internal.async.SingleResultCallback;
 import com.mongodb.internal.binding.AsyncReadBinding;
@@ -38,6 +39,11 @@ public String getCommandName() {
         return writeOperation.getCommandName();
     }
 
+    @Override
+    public MongoNamespace getNamespace() {
+        return writeOperation.getNamespace();
+    }
+
     @Override
     public void executeAsync(final AsyncReadBinding binding, final SingleResultCallback> callback) {
         writeOperation.executeAsync((AsyncWriteBinding) binding, (result, t) -> {
diff --git a/driver-sync/src/main/com/mongodb/client/internal/MongoClusterImpl.java b/driver-sync/src/main/com/mongodb/client/internal/MongoClusterImpl.java
index 37f911306fc..db8fd03adaf 100644
--- a/driver-sync/src/main/com/mongodb/client/internal/MongoClusterImpl.java
+++ b/driver-sync/src/main/com/mongodb/client/internal/MongoClusterImpl.java
@@ -22,6 +22,7 @@
 import com.mongodb.MongoClientException;
 import com.mongodb.MongoException;
 import com.mongodb.MongoInternalException;
+import com.mongodb.MongoNamespace;
 import com.mongodb.MongoQueryException;
 import com.mongodb.MongoSocketException;
 import com.mongodb.MongoTimeoutException;
@@ -428,7 +429,7 @@ public  T execute(final ReadOperation operation, final ReadPreference r
             ReadBinding binding = getReadBinding(readPreference, readConcern, actualClientSession, session == null,
                     operation.getCommandName());
 
-            Span span = createOperationSpan(actualClientSession, binding, operation.getCommandName());
+            Span span = createOperationSpan(actualClientSession, binding, operation.getCommandName(), operation.getNamespace());
 
             try {
                 if (actualClientSession.hasActiveTransaction() && !binding.getReadPreference().equals(primary())) {
@@ -461,7 +462,7 @@ public  T execute(final WriteOperation operation, final ReadConcern readCo
             ClientSession actualClientSession = getClientSession(session);
             WriteBinding binding = getWriteBinding(readConcern, actualClientSession, session == null, operation.getCommandName());
 
-            Span span = createOperationSpan(actualClientSession, binding, operation.getCommandName());
+            Span span = createOperationSpan(actualClientSession, binding, operation.getCommandName(), operation.getNamespace());
             try {
                 return operation.execute(binding);
             } catch (MongoException e) {
@@ -586,11 +587,13 @@ ClientSession getClientSession(@Nullable final ClientSession clientSessionFromOp
          * Create a tracing span for the given operation, and set it on operation context.
          *
          * @param actualClientSession the session that the operation is part of
-         * @param binding the binding for the operation
-         * @param commandName the name of the command
+         * @param binding             the binding for the operation
+         * @param commandName         the name of the command
+         * @param namespace           the namespace of the command
+         * @return the created span, or null if tracing is not enabled
          */
         @Nullable
-        private Span createOperationSpan(final ClientSession actualClientSession, final BindingContext binding, final String commandName) {
+        private Span createOperationSpan(final ClientSession actualClientSession, final BindingContext binding, final String commandName, final MongoNamespace namespace) {
             TracingManager tracingManager = binding.getOperationContext().getTracingManager();
             if (tracingManager.isEnabled()) {
                 TraceContext parentContext = null;
@@ -598,13 +601,17 @@ private Span createOperationSpan(final ClientSession actualClientSession, final
                 if (transactionSpan != null) {
                     parentContext = transactionSpan.getContext();
                 }
-
+                String name = commandName + " " + namespace.getFullName();
                 Span span = binding
                         .getOperationContext()
                         .getTracingManager()
-                        .addSpan(commandName, parentContext);
-                binding.getOperationContext().setTracingContext(span.context());
+                        .addSpan(name, parentContext);
+                binding.getOperationContext().setTracingSpan(span);
                 span.tag(Tags.SYSTEM, "mongodb");
+                span.tag(Tags.NAMESPACE, namespace.getDatabaseName());
+                span.tag(Tags.COLLECTION, namespace.getCollectionName());
+                span.tag(Tags.OPERATION_NAME, commandName);
+                span.tag(Tags.OPERATION_SUMMARY, name);
                 return span;
 
             } else {
diff --git a/driver-sync/src/test/functional/com/mongodb/client/unified/Entities.java b/driver-sync/src/test/functional/com/mongodb/client/unified/Entities.java
index 4dfedf0a8d5..c0d33b06d91 100644
--- a/driver-sync/src/test/functional/com/mongodb/client/unified/Entities.java
+++ b/driver-sync/src/test/functional/com/mongodb/client/unified/Entities.java
@@ -115,7 +115,7 @@ public final class Entities {
     private static final Set SUPPORTED_CLIENT_ENTITY_OPTIONS = new HashSet<>(
             asList(
                     "id", "uriOptions", "serverApi", "useMultipleMongoses", "storeEventsAsEntities",
-                    "observeEvents", "observeLogMessages", "observeSensitiveCommands", "ignoreCommandMonitoringEvents", "tracing"));
+                    "observeEvents", "observeLogMessages", "observeSensitiveCommands", "ignoreCommandMonitoringEvents", "observeTracingMessages"));
     private final Set entityNames = new HashSet<>();
     private final Map threads = new HashMap<>();
     private final Map>> tasks = new HashMap<>();
@@ -613,8 +613,8 @@ private void initClient(final BsonDocument entity, final String id,
             clientSettingsBuilder.serverApi(serverApiBuilder.build());
         }
 
-        if (entity.containsKey("tracing")) {
-            boolean enableCommandPayload = entity.getDocument("tracing").get("enableCommandPayload", BsonBoolean.FALSE).asBoolean().getValue();
+        if (entity.containsKey("observeTracingMessages")) {
+            boolean enableCommandPayload = entity.getDocument("observeTracingMessages").get("enableCommandPayload", BsonBoolean.FALSE).asBoolean().getValue();
             /* To enable Zipkin backend, uncomment the following lines and ensure you have the server started
             (docker run -d -p 9411:9411 openzipkin/zipkin). The tests will fail but the captured spans will be
              visible in the Zipkin UI at http://localhost:9411 for debugging purpose.
diff --git a/driver-sync/src/test/functional/com/mongodb/client/unified/MicrometerTracingTest.java b/driver-sync/src/test/functional/com/mongodb/client/unified/MicrometerTracingTest.java
index 84bc0734c5f..8c65317d257 100644
--- a/driver-sync/src/test/functional/com/mongodb/client/unified/MicrometerTracingTest.java
+++ b/driver-sync/src/test/functional/com/mongodb/client/unified/MicrometerTracingTest.java
@@ -22,6 +22,6 @@
 
 final class MicrometerTracingTest extends UnifiedSyncTest {
     private static Collection data() {
-        return getTestData("tracing/tests");
+        return getTestData("open-telemetry/tests");
     }
 }
diff --git a/driver-sync/src/test/functional/com/mongodb/client/unified/UnifiedTest.java b/driver-sync/src/test/functional/com/mongodb/client/unified/UnifiedTest.java
index e067e36d993..8e91e85205b 100644
--- a/driver-sync/src/test/functional/com/mongodb/client/unified/UnifiedTest.java
+++ b/driver-sync/src/test/functional/com/mongodb/client/unified/UnifiedTest.java
@@ -28,6 +28,7 @@
 import com.mongodb.client.gridfs.GridFSBucket;
 import com.mongodb.client.model.Filters;
 import com.mongodb.client.test.CollectionHelper;
+import com.mongodb.client.tracing.SpanTree;
 import com.mongodb.client.unified.UnifiedTestModifications.TestDef;
 import com.mongodb.client.vault.ClientEncryption;
 import com.mongodb.connection.ClusterDescription;
@@ -44,6 +45,8 @@
 import com.mongodb.lang.Nullable;
 import com.mongodb.logging.TestLoggingInterceptor;
 import com.mongodb.test.AfterBeforeParameterResolver;
+import io.micrometer.tracing.Tracer;
+import io.micrometer.tracing.test.simple.SimpleTracer;
 import org.bson.BsonArray;
 import org.bson.BsonBoolean;
 import org.bson.BsonDocument;
@@ -111,7 +114,7 @@ public abstract class UnifiedTest {
     private static final Set PRESTART_POOL_ASYNC_WORK_MANAGER_FILE_DESCRIPTIONS = Collections.singleton(
             "wait queue timeout errors include details about checked out connections");
 
-    private static final String MAX_SUPPORTED_SCHEMA_VERSION = "1.22";
+    private static final String MAX_SUPPORTED_SCHEMA_VERSION = "1.26";
     private static final List MAX_SUPPORTED_SCHEMA_VERSION_COMPONENTS = Arrays.stream(MAX_SUPPORTED_SCHEMA_VERSION.split("\\."))
             .map(Integer::parseInt)
             .collect(Collectors.toList());
@@ -380,6 +383,11 @@ public void shouldPassAllOutcomes(
                 }
                 compareLogMessages(rootContext, definition, tweaks);
             }
+
+            if (definition.containsKey("expectTracingMessages")) {
+                compareTracingSpans(definition);
+            }
+
         } catch (TestAbortedException e) {
             // if a test is ignored, we do not retry
             throw e;
@@ -487,6 +495,20 @@ private void compareLogMessages(final UnifiedTestContext rootContext, final Bson
         }
     }
 
+    private void compareTracingSpans(final BsonDocument definition) {
+        BsonDocument curTracingSpansForClient = definition.getDocument("expectTracingMessages");
+        String clientId = curTracingSpansForClient.getString("client").getValue();
+
+        // Get the tracer for the client
+        Tracer micrometerTracer = entities.getClientTracer(clientId);
+        SimpleTracer simpleTracer = (SimpleTracer) micrometerTracer;
+
+        SpanTree expectedSpans = SpanTree.from(curTracingSpansForClient.getArray("spans"));
+        SpanTree reportedSpans = SpanTree.from(simpleTracer.getSpans());
+        boolean ignoreExtraSpans = curTracingSpansForClient.getBoolean("ignoreExtraSpans", BsonBoolean.TRUE).getValue();
+        SpanTree.assertValid(reportedSpans, expectedSpans, rootContext.valueMatcher::assertValuesMatch, ignoreExtraSpans);
+    }
+
     private void assertOutcome(final UnifiedTestContext context) {
         for (BsonValue cur : definition.getArray("outcome")) {
             BsonDocument curDocument = cur.asDocument();

From 353099b56929f9e1841659b831423fd8dd12a260 Mon Sep 17 00:00:00 2001
From: Viacheslav Babanin 
Date: Mon, 11 Aug 2025 21:40:25 -0700
Subject: [PATCH 12/36] Update logback-test.xml

---
 driver-core/src/test/resources/logback-test.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/driver-core/src/test/resources/logback-test.xml b/driver-core/src/test/resources/logback-test.xml
index 6941b8913e0..440fb3b583a 100644
--- a/driver-core/src/test/resources/logback-test.xml
+++ b/driver-core/src/test/resources/logback-test.xml
@@ -11,8 +11,8 @@
     
     
 
-    
+    
         
     
 
-
\ No newline at end of file
+

From 2b33520515da4afdcfd5bc22b4c6a425caf5e70c Mon Sep 17 00:00:00 2001
From: "slav.babanin" 
Date: Mon, 11 Aug 2025 23:26:40 -0700
Subject: [PATCH 13/36] Fix compilation errors.

---
 .../com/mongodb/internal/TimeoutContext.java  | 166 +++++++++---------
 .../internal/binding/AsyncClusterBinding.java |   2 -
 .../internal/binding/ClusterBinding.java      |   2 -
 .../internal/connection/OperationContext.java |   4 +-
 .../connection/SaslAuthenticator.java         |   8 +-
 .../operation/AbortTransactionOperation.java  |   2 +-
 .../AbstractWriteSearchIndexOperation.java    |   4 +-
 .../AsyncChangeStreamBatchCursor.java         |   2 +-
 .../operation/AsyncCommandBatchCursor.java    |   4 +-
 .../operation/AsyncOperationHelper.java       |   4 +-
 .../operation/ChangeStreamBatchCursor.java    |   4 +-
 .../operation/CommandBatchCursor.java         |   4 +-
 .../operation/CommitTransactionOperation.java |   4 +-
 .../operation/ExplainCommandOperation.java    |   4 +-
 .../internal/operation/FindOperation.java     |   4 +-
 .../internal/operation/OperationHelper.java   |   2 +-
 .../internal/operation/ReadOperation.java     |   4 +-
 .../operation/SyncOperationHelper.java        |   4 +-
 .../internal/operation/WriteOperation.java    |   4 +-
 .../binding/AsyncSingleConnectionBinding.java |   1 -
 .../internal/binding/SessionBinding.java      |   2 +-
 .../CommandHelperSpecification.groovy         |   2 +-
 .../src/main/com/mongodb/MongoClient.java     |   2 +-
 .../internal/MapReducePublisherImpl.java      |  10 +-
 ...dReadOperationThenCursorReadOperation.java |   7 +
 ...WriteOperationThenCursorReadOperation.java |   7 +
 .../ClientSessionBindingSpecification.groovy  |   2 +-
 ...tClientSideOperationsTimeoutProseTest.java |  33 ++--
 .../ClientSessionBindingSpecification.groovy  |   2 +-
 29 files changed, 151 insertions(+), 149 deletions(-)

diff --git a/driver-core/src/main/com/mongodb/internal/TimeoutContext.java b/driver-core/src/main/com/mongodb/internal/TimeoutContext.java
index b3bdc65a9f7..05579600af6 100644
--- a/driver-core/src/main/com/mongodb/internal/TimeoutContext.java
+++ b/driver-core/src/main/com/mongodb/internal/TimeoutContext.java
@@ -195,52 +195,35 @@ public TimeoutSettings getTimeoutSettings() {
         return timeoutSettings;
     }
 
+    @Nullable
+    public Timeout getTimeout() {
+        return timeout;
+    }
+
     public long getMaxAwaitTimeMS() {
         return timeoutSettings.getMaxAwaitTimeMS();
     }
 
-    public void runMaxTimeMS(final LongConsumer onRemaining) {
-        if (maxTimeSupplier != null) {
-            long maxTimeMS = maxTimeSupplier.get();
-            if (maxTimeMS > 0) {
-                runMinTimeout(onRemaining, maxTimeMS);
-            }
-            return;
-        }
-        if (timeout == null) {
-            runWithFixedTimeout(timeoutSettings.getMaxTimeMS(), onRemaining);
-            return;
-        }
-        assertNotNull(timeoutIncludingRoundTrip())
-                .run(MILLISECONDS,
-                        () -> {},
-                        onRemaining,
-                        () -> {
-                            throw createMongoRoundTripTimeoutException();
-                        });
+    @VisibleForTesting(otherwise = PRIVATE)
+    public long getMaxCommitTimeMS() {
+        Long maxCommitTimeMS = timeoutSettings.getMaxCommitTimeMS();
+        return timeoutOrAlternative(maxCommitTimeMS != null ? maxCommitTimeMS : 0);
+    }
 
+    public long getReadTimeoutMS() {
+        return timeoutOrAlternative(timeoutSettings.getReadTimeoutMS());
     }
 
-    private void runMinTimeout(final LongConsumer onRemaining, final long fixedMs) {
-        Timeout timeout = timeoutIncludingRoundTrip();
-        if (timeout != null) {
-            timeout.run(MILLISECONDS, () -> {
-                        onRemaining.accept(fixedMs);
-                    },
-                    (renamingMs) -> {
-                        onRemaining.accept(Math.min(renamingMs, fixedMs));
-                    }, () -> {
-                        throwMongoTimeoutException("The operation exceeded the timeout limit.");
-                    });
-        } else {
-            onRemaining.accept(fixedMs);
-        }
+    public long getWriteTimeoutMS() {
+        return timeoutOrAlternative(0);
     }
 
-    private static void runWithFixedTimeout(final long ms, final LongConsumer onRemaining) {
-        if (ms != 0) {
-            onRemaining.accept(ms);
-        }
+    public int getConnectTimeoutMs() {
+        final long connectTimeoutMS = getTimeoutSettings().getConnectTimeoutMS();
+        return Math.toIntExact(Timeout.nullAsInfinite(timeout).call(MILLISECONDS,
+                () -> connectTimeoutMS,
+                (ms) -> connectTimeoutMS == 0 ? ms : Math.min(ms, connectTimeoutMS),
+                () -> throwMongoTimeoutException("The operation exceeded the timeout limit.")));
     }
 
     /**
@@ -340,29 +323,6 @@ public TimeoutContext withMinRoundTripTime(final long minRoundTripTimeMS) {
                 timeout);
     }
 
-
-    @VisibleForTesting(otherwise = PRIVATE)
-    public long getMaxCommitTimeMS() {
-        Long maxCommitTimeMS = timeoutSettings.getMaxCommitTimeMS();
-        return timeoutOrAlternative(maxCommitTimeMS != null ? maxCommitTimeMS : 0);
-    }
-
-    public long getReadTimeoutMS() {
-        return timeoutOrAlternative(timeoutSettings.getReadTimeoutMS());
-    }
-
-    public long getWriteTimeoutMS() {
-        return timeoutOrAlternative(0);
-    }
-
-    public int getConnectTimeoutMs() {
-        final long connectTimeoutMS = getTimeoutSettings().getConnectTimeoutMS();
-        return Math.toIntExact(Timeout.nullAsInfinite(timeout).call(MILLISECONDS,
-                () -> connectTimeoutMS,
-                (ms) -> connectTimeoutMS == 0 ? ms : Math.min(ms, connectTimeoutMS),
-                () -> throwMongoTimeoutException("The operation exceeded the timeout limit.")));
-    }
-
     /**
      * Resets the timeout if this timeout context is being used by pool maintenance
      */
@@ -379,6 +339,23 @@ public TimeoutContext withNewlyStartedTimeoutMaintenanceTimeout() {
                 maxTimeSupplier);
     }
 
+    /**
+     * Returns the timeout context to use for the handshake process
+     *
+     * @return a new timeout context with the cached computed server selection timeout if available or this
+     */
+    public TimeoutContext withComputedServerSelectionTimeout() {
+        if (this.hasTimeoutMS()) {
+            Timeout serverSelectionTimeout = StartTime.now()
+                    .timeoutAfterOrInfiniteIfNegative(getTimeoutSettings().getServerSelectionTimeoutMS(), MILLISECONDS);
+            if (isMaintenanceContext) {
+                return new TimeoutContext(false, timeoutSettings, serverSelectionTimeout);
+            }
+            return new TimeoutContext(false, timeoutSettings, Timeout.earliest(serverSelectionTimeout, timeout));
+        }
+
+        return this;
+    }
 
     public TimeoutContext withMinRoundTripTimeMS(final long minRoundTripTimeMS) {
         isTrue("'minRoundTripTimeMS' must be a positive number", minRoundTripTimeMS >= 0);
@@ -390,11 +367,6 @@ public TimeoutContext withMinRoundTripTimeMS(final long minRoundTripTimeMS) {
                 timeout);
     }
 
-    // Creates a copy of the timeout context that can be reset without resetting the original.
-    public TimeoutContext copyTimeoutContext() {
-        return new TimeoutContext(getTimeoutSettings(), getTimeout());
-    }
-
     public TimeoutContext withNewlyStartedTimeout() {
         return new TimeoutContext(
                 isMaintenanceContext,
@@ -417,6 +389,11 @@ public TimeoutContext withAdditionalReadTimeout(final int additionalReadTimeout)
         return new TimeoutContext(timeoutSettings.withReadTimeoutMS(newReadTimeout > 0 ? newReadTimeout : Long.MAX_VALUE));
     }
 
+    // Creates a copy of the timeout context that can be reset without resetting the original.
+    public TimeoutContext copyTimeoutContext() {
+        return new TimeoutContext(getTimeoutSettings(), getTimeout());
+    }
+
     @Override
     public String toString() {
         return "TimeoutContext{"
@@ -475,32 +452,53 @@ public Timeout computeServerSelectionTimeout() {
         return StartTime.now().timeoutAfterOrInfiniteIfNegative(getTimeoutSettings().getServerSelectionTimeoutMS(), MILLISECONDS);
     }
 
-    /**
-     * Returns the timeout context to use for the handshake process
-     *
-     * @return a new timeout context with the cached computed server selection timeout if available or this
-     */
-    public TimeoutContext withComputedServerSelectionTimeoutContextNew() {
-        if (this.hasTimeoutMS()) {
-            Timeout serverSelectionTimeout = StartTime.now()
-                    .timeoutAfterOrInfiniteIfNegative(getTimeoutSettings().getServerSelectionTimeoutMS(), MILLISECONDS);
-            if (isMaintenanceContext) {
-                return new TimeoutContext(false, timeoutSettings, serverSelectionTimeout);
+    public Timeout startWaitQueueTimeout(final StartTime checkoutStart) {
+        final long ms = getTimeoutSettings().getMaxWaitTimeMS();
+        return checkoutStart.timeoutAfterOrInfiniteIfNegative(ms, MILLISECONDS);
+    }
+
+    public void runMaxTimeMS(final LongConsumer onRemaining) {
+        if (maxTimeSupplier != null) {
+            long maxTimeMS = maxTimeSupplier.get();
+            if (maxTimeMS > 0) {
+                runMinTimeout(onRemaining, maxTimeMS);
             }
-            return new TimeoutContext(false, timeoutSettings, Timeout.earliest(serverSelectionTimeout, timeout));
+            return;
         }
+        if (timeout == null) {
+            runWithFixedTimeout(timeoutSettings.getMaxTimeMS(), onRemaining);
+            return;
+        }
+        assertNotNull(timeoutIncludingRoundTrip())
+                .run(MILLISECONDS,
+                        () -> {},
+                        onRemaining,
+                        () -> {
+                            throw createMongoRoundTripTimeoutException();
+                        });
 
-        return this;
     }
 
-    public Timeout startWaitQueueTimeout(final StartTime checkoutStart) {
-        final long ms = getTimeoutSettings().getMaxWaitTimeMS();
-        return checkoutStart.timeoutAfterOrInfiniteIfNegative(ms, MILLISECONDS);
+    private void runMinTimeout(final LongConsumer onRemaining, final long fixedMs) {
+        Timeout timeout = timeoutIncludingRoundTrip();
+        if (timeout != null) {
+            timeout.run(MILLISECONDS, () -> {
+                        onRemaining.accept(fixedMs);
+                    },
+                    (renamingMs) -> {
+                        onRemaining.accept(Math.min(renamingMs, fixedMs));
+                    }, () -> {
+                        throwMongoTimeoutException("The operation exceeded the timeout limit.");
+                    });
+        } else {
+            onRemaining.accept(fixedMs);
+        }
     }
 
-    @Nullable
-    public Timeout getTimeout() {
-        return timeout;
+    private static void runWithFixedTimeout(final long ms, final LongConsumer onRemaining) {
+        if (ms != 0) {
+            onRemaining.accept(ms);
+        }
     }
 
     public interface MaxTimeSupplier {
diff --git a/driver-core/src/main/com/mongodb/internal/binding/AsyncClusterBinding.java b/driver-core/src/main/com/mongodb/internal/binding/AsyncClusterBinding.java
index 322ef374381..4a5e4584e95 100644
--- a/driver-core/src/main/com/mongodb/internal/binding/AsyncClusterBinding.java
+++ b/driver-core/src/main/com/mongodb/internal/binding/AsyncClusterBinding.java
@@ -131,8 +131,6 @@ private AsyncClusterBindingConnectionSource(final Server server,
             this.server = server;
             this.serverDescription = serverDescription;
             this.appliedReadPreference = appliedReadPreference;
-            // TODO should be calculated externaly
-            // operationContext.getTimeoutContext().minRoundTripTimeMS(NANOSECONDS.toMillis(serverDescription.getMinRoundTripTimeNanos()));
             AsyncClusterBinding.this.retain();
         }
 
diff --git a/driver-core/src/main/com/mongodb/internal/binding/ClusterBinding.java b/driver-core/src/main/com/mongodb/internal/binding/ClusterBinding.java
index d6f39d308ea..dc5f1b286af 100644
--- a/driver-core/src/main/com/mongodb/internal/binding/ClusterBinding.java
+++ b/driver-core/src/main/com/mongodb/internal/binding/ClusterBinding.java
@@ -110,8 +110,6 @@ private ClusterBindingConnectionSource(final ServerTuple serverTuple, final Read
             this.server = serverTuple.getServer();
             this.serverDescription = serverTuple.getServerDescription();
             this.appliedReadPreference = appliedReadPreference;
-            //TODO THis has to be moved outside of the consutructor to the place where getConnectionSource is called to create a new OperationContet to use further
-            // operationContext.getTimeoutContext().minRoundTripTimeMS(NANOSECONDS.toMillis(serverDescription.getMinRoundTripTimeNanos()));
             ClusterBinding.this.retain();
         }
 
diff --git a/driver-core/src/main/com/mongodb/internal/connection/OperationContext.java b/driver-core/src/main/com/mongodb/internal/connection/OperationContext.java
index ecceed7c099..17e7de605a4 100644
--- a/driver-core/src/main/com/mongodb/internal/connection/OperationContext.java
+++ b/driver-core/src/main/com/mongodb/internal/connection/OperationContext.java
@@ -171,7 +171,7 @@ public OperationContext withMinRoundTripTime(final ServerDescription serverDescr
         return this.withTimeoutContext(this.timeoutContext.withMinRoundTripTime(TimeUnit.NANOSECONDS.toMillis(serverDescription.getMinRoundTripTimeNanos())));
     }
 
-    public OperationContext withTimeoutContextOverride(final Function timeoutContextOverrideFunction) {
+    public OperationContext withOverride(final TimeoutContextOverride timeoutContextOverrideFunction) {
         return this.withTimeoutContext(timeoutContextOverrideFunction.apply(timeoutContext));
     }
 
@@ -235,5 +235,7 @@ private boolean isEnabled(final ClusterType clusterType) {
             }
         }
     }
+
+    public interface TimeoutContextOverride extends Function {}
 }
 
diff --git a/driver-core/src/main/com/mongodb/internal/connection/SaslAuthenticator.java b/driver-core/src/main/com/mongodb/internal/connection/SaslAuthenticator.java
index 059f810c611..af115cd6d15 100644
--- a/driver-core/src/main/com/mongodb/internal/connection/SaslAuthenticator.java
+++ b/driver-core/src/main/com/mongodb/internal/connection/SaslAuthenticator.java
@@ -73,7 +73,7 @@ public void authenticate(final InternalConnection connection, final ConnectionDe
                 BsonDocument responseDocument = connection.opened() ? null : getSpeculativeAuthenticateResponse();
                 if (responseDocument == null) {
                     responseDocument = getNextSaslResponse(saslClient, connection, operationContext);
-                    operationContext = operationContext.withTimeoutContextOverride(TimeoutContext::withNewlyStartedTimeoutMaintenanceTimeout);
+                    operationContext = operationContext.withOverride(TimeoutContext::withNewlyStartedTimeoutMaintenanceTimeout);
                 }
 
                 BsonInt32 conversationId = responseDocument.getInt32("conversationId");
@@ -88,7 +88,7 @@ public void authenticate(final InternalConnection connection, final ConnectionDe
                     }
 
                     responseDocument = sendSaslContinue(conversationId, response, connection, operationContext);
-                    operationContext = operationContext.withTimeoutContextOverride(TimeoutContext::withNewlyStartedTimeoutMaintenanceTimeout);
+                    operationContext = operationContext.withOverride(TimeoutContext::withNewlyStartedTimeoutMaintenanceTimeout);
                 }
                 if (!saslClient.isComplete()) {
                     saslClient.evaluateChallenge((responseDocument.getBinary("payload")).getData());
@@ -166,7 +166,7 @@ private void getNextSaslResponseAsync(final SaslClient saslClient, final Interna
                         verifySaslClientComplete(saslClient, result, errHandlingCallback);
                     } else {
                         OperationContext saslContinueOperationContext =
-                                operationContext.withTimeoutContextOverride(TimeoutContext::withNewlyStartedTimeoutMaintenanceTimeout);
+                                operationContext.withOverride(TimeoutContext::withNewlyStartedTimeoutMaintenanceTimeout);
                         new Continuator(saslClient, result, connection, saslContinueOperationContext, errHandlingCallback).start();
                     }
                 });
@@ -340,7 +340,7 @@ public void onResult(@Nullable final BsonDocument result, @Nullable final Throwa
                 verifySaslClientComplete(saslClient, result, callback);
                 disposeOfSaslClient(saslClient);
             } else {
-                operationContext = operationContext.withTimeoutContextOverride(TimeoutContext::withNewlyStartedTimeoutMaintenanceTimeout);
+                operationContext = operationContext.withOverride(TimeoutContext::withNewlyStartedTimeoutMaintenanceTimeout);
                 continueConversation(result);
             }
         }
diff --git a/driver-core/src/main/com/mongodb/internal/operation/AbortTransactionOperation.java b/driver-core/src/main/com/mongodb/internal/operation/AbortTransactionOperation.java
index c2598a9bddd..1a03ce877f7 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/AbortTransactionOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/AbortTransactionOperation.java
@@ -52,7 +52,7 @@ public String getCommandName() {
     CommandCreator getCommandCreator() {
         return (operationContext, serverDescription, connectionDescription) -> {
             BsonDocument command = AbortTransactionOperation.super.getCommandCreator()
-                    .create(operationContext.withTimeoutContextOverride(TimeoutContext::withDefaultMaxTime),
+                    .create(operationContext.withOverride(TimeoutContext::withDefaultMaxTime),
                             serverDescription,
                             connectionDescription);
             putIfNotNull(command, "recoveryToken", recoveryToken);
diff --git a/driver-core/src/main/com/mongodb/internal/operation/AbstractWriteSearchIndexOperation.java b/driver-core/src/main/com/mongodb/internal/operation/AbstractWriteSearchIndexOperation.java
index 87092c02a24..010b9ca5f70 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/AbstractWriteSearchIndexOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/AbstractWriteSearchIndexOperation.java
@@ -67,10 +67,10 @@ public void executeAsync(final AsyncWriteBinding binding, final OperationContext
                                 writeConcernErrorTransformerAsync(operationContextWithMinRtt.getTimeoutContext()), (result, commandExecutionError) -> {
                                     try {
                                         swallowOrThrow(commandExecutionError);
-                                        //TODO why call callback and not cb?
+                                        // TODO-JAVA-5640 why call callback and not cb?
                                         callback.onResult(result, null);
                                     } catch (Throwable mongoCommandException) {
-                                        //TODO why call callback and not cb?
+                                        // TODO-JAVA-5640 why call callback and not cb?
                                         callback.onResult(null, mongoCommandException);
                                     }
                                 }
diff --git a/driver-core/src/main/com/mongodb/internal/operation/AsyncChangeStreamBatchCursor.java b/driver-core/src/main/com/mongodb/internal/operation/AsyncChangeStreamBatchCursor.java
index 78b09c36539..bac38c39c34 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/AsyncChangeStreamBatchCursor.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/AsyncChangeStreamBatchCursor.java
@@ -67,7 +67,7 @@ final class AsyncChangeStreamBatchCursor implements AsyncAggregateResponseBat
         this.wrapped = new AtomicReference<>(assertNotNull(wrapped));
         this.binding = binding;
         binding.retain();
-        this.operationContext = operationContext.withTimeoutContextOverride(TimeoutContext::withMaxTimeAsMaxAwaitTimeOverride);
+        this.operationContext = operationContext.withOverride(TimeoutContext::withMaxTimeAsMaxAwaitTimeOverride);
         this.resumeToken = resumeToken;
         this.maxWireVersion = maxWireVersion;
         isClosed = new AtomicBoolean();
diff --git a/driver-core/src/main/com/mongodb/internal/operation/AsyncCommandBatchCursor.java b/driver-core/src/main/com/mongodb/internal/operation/AsyncCommandBatchCursor.java
index 036d91e1530..42af8656e2c 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/AsyncCommandBatchCursor.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/AsyncCommandBatchCursor.java
@@ -38,7 +38,7 @@ public class AsyncCommandBatchCursor implements AsyncAggregateResponseBatchCu
             final long maxTimeMs,
             final OperationContext operationContext,
             final AsyncCoreCursor wrapped) {
-        this.operationContext = operationContext.withTimeoutContextOverride(timeoutContext ->
+        this.operationContext = operationContext.withOverride(timeoutContext ->
                 timeoutContext.withMaxTimeOverride(maxTimeMs));
         this.timeoutMode = timeoutMode;
         this.wrapped = wrapped;
@@ -68,7 +68,7 @@ public boolean isClosed() {
     @Override
     public void close() {
         wrapped.close(operationContext
-                .withTimeoutContextOverride(timeoutContext -> timeoutContext
+                .withOverride(timeoutContext -> timeoutContext
                         .withNewlyStartedTimeout()
                         .withDefaultMaxTime()
                 ));
diff --git a/driver-core/src/main/com/mongodb/internal/operation/AsyncOperationHelper.java b/driver-core/src/main/com/mongodb/internal/operation/AsyncOperationHelper.java
index 7b134df2ee8..e5973124ef9 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/AsyncOperationHelper.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/AsyncOperationHelper.java
@@ -108,7 +108,7 @@ static void withAsyncReadConnectionSource(final AsyncReadBinding binding, final
     static void withAsyncConnection(final AsyncWriteBinding binding,
                                     final OperationContext originalOperationContext,
                                     final AsyncCallableWithConnection callable) {
-        OperationContext serverSelectionOperationContext = originalOperationContext.withTimeoutContextOverride(TimeoutContext::withComputedServerSelectionTimeoutContextNew);
+        OperationContext serverSelectionOperationContext = originalOperationContext.withOverride(TimeoutContext::withComputedServerSelectionTimeout);
         binding.getWriteConnectionSource(
                 serverSelectionOperationContext,
                 errorHandlingCallback(
@@ -129,7 +129,7 @@ static  void withAsyncSourceAndConnection(
         SingleResultCallback errorHandlingCallback = errorHandlingCallback(callback, OperationHelper.LOGGER);
 
         OperationContext serverSelectionOperationContext =
-                operationContext.withTimeoutContextOverride(TimeoutContext::withComputedServerSelectionTimeoutContextNew);
+                operationContext.withOverride(TimeoutContext::withComputedServerSelectionTimeout);
         withAsyncSuppliedResource(
                 sourceAsyncFunction,
                 wrapConnectionSourceException,
diff --git a/driver-core/src/main/com/mongodb/internal/operation/ChangeStreamBatchCursor.java b/driver-core/src/main/com/mongodb/internal/operation/ChangeStreamBatchCursor.java
index 103751e7df3..4f2f31214e4 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/ChangeStreamBatchCursor.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/ChangeStreamBatchCursor.java
@@ -80,7 +80,7 @@ final class ChangeStreamBatchCursor implements AggregateResponseBatchCursor {
             changeStreamOperation.setChangeStreamOptionsForResume(resumeToken, source.getServerDescription().getMaxWireVersion());
             return null;
diff --git a/driver-core/src/main/com/mongodb/internal/operation/CommandBatchCursor.java b/driver-core/src/main/com/mongodb/internal/operation/CommandBatchCursor.java
index 78de7f33b93..dbe42fbadb4 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/CommandBatchCursor.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/CommandBatchCursor.java
@@ -37,7 +37,7 @@ class CommandBatchCursor implements AggregateResponseBatchCursor {
             final long maxTimeMs,
             final OperationContext operationContext,
             final CoreCursor wrapped) {
-        this.operationContext = operationContext.withTimeoutContextOverride(timeoutContext ->
+        this.operationContext = operationContext.withOverride(timeoutContext ->
                 timeoutContext.withMaxTimeOverride(maxTimeMs));
         this.timeoutMode = timeoutMode;
         this.wrapped = wrapped;
@@ -77,7 +77,7 @@ public void remove() {
 
     @Override
     public void close() {
-        operationContext = operationContext.withTimeoutContextOverride(timeoutContext -> timeoutContext
+        operationContext = operationContext.withOverride(timeoutContext -> timeoutContext
                 .withNewlyStartedTimeout()
                 .withDefaultMaxTime());
         wrapped.close(operationContext);
diff --git a/driver-core/src/main/com/mongodb/internal/operation/CommitTransactionOperation.java b/driver-core/src/main/com/mongodb/internal/operation/CommitTransactionOperation.java
index c99102919f5..06137d4ed57 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/CommitTransactionOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/CommitTransactionOperation.java
@@ -70,7 +70,7 @@ public Void execute(final WriteBinding binding, final OperationContext operation
         try {
             return super.execute(
                     binding,
-                    operationContext.withTimeoutContextOverride(TimeoutContext::withMaxTimeOverrideAsMaxCommitTime));
+                    operationContext.withOverride(TimeoutContext::withMaxTimeOverrideAsMaxCommitTime));
         } catch (MongoException e) {
             addErrorLabels(e);
             throw e;
@@ -81,7 +81,7 @@ public Void execute(final WriteBinding binding, final OperationContext operation
     public void executeAsync(final AsyncWriteBinding binding, final OperationContext operationContext, final SingleResultCallback callback) {
         super.executeAsync(
                 binding,
-                operationContext.withTimeoutContextOverride(TimeoutContext::withMaxTimeOverrideAsMaxCommitTime),
+                operationContext.withOverride(TimeoutContext::withMaxTimeOverrideAsMaxCommitTime),
                 (result, t) -> {
              if (t instanceof MongoException) {
                  addErrorLabels((MongoException) t);
diff --git a/driver-core/src/main/com/mongodb/internal/operation/ExplainCommandOperation.java b/driver-core/src/main/com/mongodb/internal/operation/ExplainCommandOperation.java
index b63c9ae4419..f03f278dde2 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/ExplainCommandOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/ExplainCommandOperation.java
@@ -40,7 +40,7 @@ public ExplainCommandOperation(final String databaseName, final String commandNa
 
     @Override
     public T execute(final ReadBinding binding, final OperationContext operationContext) {
-        return super.execute(binding, operationContext.withTimeoutContextOverride(timeoutContext -> {
+        return super.execute(binding, operationContext.withOverride(timeoutContext -> {
             if (!timeoutContext.hasTimeoutMS()) {
                 return timeoutContext.withDisabledMaxTimeOverride();
             }
@@ -52,7 +52,7 @@ public T execute(final ReadBinding binding, final OperationContext operationCont
     @Override
     public void executeAsync(final AsyncReadBinding binding, final OperationContext operationContext,
                              final SingleResultCallback callback) {
-        super.executeAsync(binding, operationContext.withTimeoutContextOverride(timeoutContext -> {
+        super.executeAsync(binding, operationContext.withOverride(timeoutContext -> {
             if (!timeoutContext.hasTimeoutMS()) {
                 return timeoutContext.withDisabledMaxTimeOverride();
             }
diff --git a/driver-core/src/main/com/mongodb/internal/operation/FindOperation.java b/driver-core/src/main/com/mongodb/internal/operation/FindOperation.java
index c5dbd2251ff..cd340be23d2 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/FindOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/FindOperation.java
@@ -299,7 +299,7 @@ public BatchCursor execute(final ReadBinding binding, final OperationContext
 
         OperationContext findOperationContext;
         if (shouldDisableMaxTimeMS()) {
-            findOperationContext = operationContext.withTimeoutContextOverride(TimeoutContext::withDisabledMaxTimeOverride);
+            findOperationContext = operationContext.withOverride(TimeoutContext::withDisabledMaxTimeOverride);
         } else {
             findOperationContext = operationContext;
         }
@@ -335,7 +335,7 @@ public void executeAsync(final AsyncReadBinding binding, final OperationContext
 
         OperationContext findOperationContext;
         if (shouldDisableMaxTimeMS()) {
-            findOperationContext = operationContext.withTimeoutContextOverride(TimeoutContext::withDisabledMaxTimeOverride);
+            findOperationContext = operationContext.withOverride(TimeoutContext::withDisabledMaxTimeOverride);
         } else {
             findOperationContext = operationContext;
         }
diff --git a/driver-core/src/main/com/mongodb/internal/operation/OperationHelper.java b/driver-core/src/main/com/mongodb/internal/operation/OperationHelper.java
index 26dbdc60126..03d03817a6b 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/OperationHelper.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/OperationHelper.java
@@ -196,7 +196,7 @@ static boolean canRetryRead(final ServerDescription serverDescription, final Ope
     static OperationContext applyTimeoutModeToOperationContext(final TimeoutMode timeoutMode,
                                                                final OperationContext operationContext) {
         if (timeoutMode == TimeoutMode.ITERATION) {
-            return operationContext.withTimeoutContextOverride(TimeoutContext::withDisabledMaxTimeOverride);
+            return operationContext.withOverride(TimeoutContext::withDisabledMaxTimeOverride);
         }
         return operationContext;
     }
diff --git a/driver-core/src/main/com/mongodb/internal/operation/ReadOperation.java b/driver-core/src/main/com/mongodb/internal/operation/ReadOperation.java
index 8545a8a4c53..16622c75710 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/ReadOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/ReadOperation.java
@@ -37,7 +37,7 @@ public interface ReadOperation {
      * General execute which can return anything of type T
      *
      * @param binding the binding to execute in the context of
-     * @param operationContext the operation context
+     * @param operationContext the operation context to use
      * @return T, the result of the execution
      */
     T execute(ReadBinding binding, OperationContext operationContext);
@@ -46,7 +46,7 @@ public interface ReadOperation {
      * General execute which can return anything of type R
      *
      * @param binding the binding to execute in the context of
-     * @param operationContext the operation context
+     * @param operationContext the operation context to use
      * @param callback the callback to be called when the operation has been executed
      */
     void executeAsync(AsyncReadBinding binding, OperationContext operationContext, SingleResultCallback callback);
diff --git a/driver-core/src/main/com/mongodb/internal/operation/SyncOperationHelper.java b/driver-core/src/main/com/mongodb/internal/operation/SyncOperationHelper.java
index 8a7fa630d00..f015bd55d4f 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/SyncOperationHelper.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/SyncOperationHelper.java
@@ -101,7 +101,7 @@ static  T withReadConnectionSource(final ReadBinding binding,
                                           final OperationContext operationContext,
                                           final CallableWithSource callable) {
         OperationContext serverSelectionOperationContext =
-                operationContext.withTimeoutContextOverride(TimeoutContext::withComputedServerSelectionTimeoutContextNew);
+                operationContext.withOverride(TimeoutContext::withComputedServerSelectionTimeout);
         ConnectionSource source = binding.getReadConnectionSource(serverSelectionOperationContext);
         try {
             return callable.call(source, operationContext.withMinRoundTripTime(source.getServerDescription()));
@@ -132,7 +132,7 @@ static  R withSourceAndConnection(final Function function,
                                          final OperationContext originalOperationContext) throws ResourceSupplierInternalException {
         OperationContext serverSelectionOperationContext =
-                originalOperationContext.withTimeoutContextOverride(TimeoutContext::withComputedServerSelectionTimeoutContextNew);
+                originalOperationContext.withOverride(TimeoutContext::withComputedServerSelectionTimeout);
 
         return withSuppliedResource(
                 sourceFunction,
diff --git a/driver-core/src/main/com/mongodb/internal/operation/WriteOperation.java b/driver-core/src/main/com/mongodb/internal/operation/WriteOperation.java
index 07a84c74d39..1e41f26e391 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/WriteOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/WriteOperation.java
@@ -33,20 +33,20 @@ public interface WriteOperation {
      */
     String getCommandName();
 
-    //TODO javadoc
     /**
      * General execute which can return anything of type T
      *
      * @param binding the binding to execute in the context of
+     * @param operationContext the operation context to use
      * @return T, the result of the execution
      */
     T execute(WriteBinding binding, OperationContext operationContext);
 
-    //TODO javadoc
     /**
      * General execute which can return anything of type T
      *
      * @param binding the binding to execute in the context of
+     * @param operationContext the operation context to use
      * @param callback the callback to be called when the operation has been executed
      */
     void executeAsync(AsyncWriteBinding binding, OperationContext operationContext, SingleResultCallback callback);
diff --git a/driver-core/src/test/functional/com/mongodb/internal/binding/AsyncSingleConnectionBinding.java b/driver-core/src/test/functional/com/mongodb/internal/binding/AsyncSingleConnectionBinding.java
index 46fde18d1c7..d35aff5ffc4 100644
--- a/driver-core/src/test/functional/com/mongodb/internal/binding/AsyncSingleConnectionBinding.java
+++ b/driver-core/src/test/functional/com/mongodb/internal/binding/AsyncSingleConnectionBinding.java
@@ -172,7 +172,6 @@ private SingleAsyncConnectionSource(final ServerDescription serverDescription,
                                             final AsyncConnection connection) {
             this.serverDescription = serverDescription;
             this.connection = connection;
-            //TODO do we need to retain and release those references properly?
             AsyncSingleConnectionBinding.this.retain();
         }
 
diff --git a/driver-core/src/test/functional/com/mongodb/internal/binding/SessionBinding.java b/driver-core/src/test/functional/com/mongodb/internal/binding/SessionBinding.java
index 04ed3bf5f4b..d8bf158d82e 100644
--- a/driver-core/src/test/functional/com/mongodb/internal/binding/SessionBinding.java
+++ b/driver-core/src/test/functional/com/mongodb/internal/binding/SessionBinding.java
@@ -28,7 +28,7 @@ public class SessionBinding implements ReadWriteBinding {
 
     public SessionBinding(final ReadWriteBinding wrapped) {
         this.wrapped = notNull("wrapped", wrapped);
-        //TODO
+        // TODO-JAVA-5640
        // this.operationContext = wrapped.getOperationContext().withSessionContext(new SimpleSessionContext());
     }
 
diff --git a/driver-core/src/test/functional/com/mongodb/internal/connection/CommandHelperSpecification.groovy b/driver-core/src/test/functional/com/mongodb/internal/connection/CommandHelperSpecification.groovy
index 83ce94f7075..16e73846d38 100644
--- a/driver-core/src/test/functional/com/mongodb/internal/connection/CommandHelperSpecification.groovy
+++ b/driver-core/src/test/functional/com/mongodb/internal/connection/CommandHelperSpecification.groovy
@@ -65,9 +65,9 @@ class CommandHelperSpecification extends Specification {
         latch1.await()
 
         then:
+        !receivedException
         !receivedDocument.isEmpty()
         receivedDocument.containsKey('ok')
-        !receivedException
 
         when:
         def latch2 = new CountDownLatch(1)
diff --git a/driver-legacy/src/main/com/mongodb/MongoClient.java b/driver-legacy/src/main/com/mongodb/MongoClient.java
index 1b18017db79..06dac49c671 100644
--- a/driver-legacy/src/main/com/mongodb/MongoClient.java
+++ b/driver-legacy/src/main/com/mongodb/MongoClient.java
@@ -864,7 +864,7 @@ private void cleanCursors() {
 
                 ReadWriteBinding binding = new SingleServerBinding(delegate.getCluster(), cur.serverCursor.getAddress());
                 try {
-                    OperationContext serverSelectionOperationContext = operationContext.withTimeoutContextOverride(TimeoutContext::withComputedServerSelectionTimeoutContextNew);
+                    OperationContext serverSelectionOperationContext = operationContext.withOverride(TimeoutContext::withComputedServerSelectionTimeout);
                     ConnectionSource source = binding.getReadConnectionSource(serverSelectionOperationContext);
                     try {
                         Connection connection = source.getConnection(serverSelectionOperationContext);
diff --git a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/MapReducePublisherImpl.java b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/MapReducePublisherImpl.java
index 31260d1329a..aa1100d7791 100644
--- a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/MapReducePublisherImpl.java
+++ b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/MapReducePublisherImpl.java
@@ -25,10 +25,11 @@
 import com.mongodb.internal.async.SingleResultCallback;
 import com.mongodb.internal.binding.AsyncReadBinding;
 import com.mongodb.internal.binding.AsyncWriteBinding;
+import com.mongodb.internal.binding.ReadBinding;
 import com.mongodb.internal.binding.WriteBinding;
 import com.mongodb.internal.client.model.FindOptions;
 import com.mongodb.internal.connection.OperationContext;
-import com.mongodb.internal.operation.AsyncOperations;
+import com.mongodb.internal.operation.BatchCursor;
 import com.mongodb.internal.operation.MapReduceAsyncBatchCursor;
 import com.mongodb.internal.operation.MapReduceBatchCursor;
 import com.mongodb.internal.operation.MapReduceStatistics;
@@ -242,6 +243,11 @@ public String getCommandName() {
             return operation.getCommandName();
         }
 
+        @Override
+        public BatchCursor execute(final ReadBinding binding, final OperationContext operationContext) {
+            throw new UnsupportedOperationException("This operation is async only");
+        }
+
         @Override
         public void executeAsync(final AsyncReadBinding binding, final OperationContext operationContext, final SingleResultCallback> callback) {
             operation.executeAsync(binding, operationContext, callback::onResult);
@@ -265,7 +271,7 @@ public String getCommandName() {
         }
 
         @Override
-        public Void execute(final WriteBinding binding) {
+        public Void execute(final WriteBinding binding, final OperationContext operationContext) {
             throw new UnsupportedOperationException("This operation is async only");
         }
 
diff --git a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/VoidReadOperationThenCursorReadOperation.java b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/VoidReadOperationThenCursorReadOperation.java
index 71314bd2eab..884e037165f 100644
--- a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/VoidReadOperationThenCursorReadOperation.java
+++ b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/VoidReadOperationThenCursorReadOperation.java
@@ -19,7 +19,9 @@
 import com.mongodb.internal.async.AsyncBatchCursor;
 import com.mongodb.internal.async.SingleResultCallback;
 import com.mongodb.internal.binding.AsyncReadBinding;
+import com.mongodb.internal.binding.ReadBinding;
 import com.mongodb.internal.connection.OperationContext;
+import com.mongodb.internal.operation.BatchCursor;
 import com.mongodb.internal.operation.ReadOperationCursor;
 import com.mongodb.internal.operation.ReadOperationSimple;
 
@@ -46,6 +48,11 @@ public String getCommandName() {
         return readOperation.getCommandName();
     }
 
+    @Override
+    public BatchCursor execute(final ReadBinding binding, final OperationContext operationContext) {
+        throw new UnsupportedOperationException("This operation is async only");
+    }
+
     @Override
     public void executeAsync(final AsyncReadBinding binding, final OperationContext operationContext, final SingleResultCallback> callback) {
         readOperation.executeAsync(binding, operationContext, (result, t) -> {
diff --git a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/VoidWriteOperationThenCursorReadOperation.java b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/VoidWriteOperationThenCursorReadOperation.java
index 79328467a82..80eb33048d9 100644
--- a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/VoidWriteOperationThenCursorReadOperation.java
+++ b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/VoidWriteOperationThenCursorReadOperation.java
@@ -20,7 +20,9 @@
 import com.mongodb.internal.async.SingleResultCallback;
 import com.mongodb.internal.binding.AsyncReadBinding;
 import com.mongodb.internal.binding.AsyncWriteBinding;
+import com.mongodb.internal.binding.ReadBinding;
 import com.mongodb.internal.connection.OperationContext;
+import com.mongodb.internal.operation.BatchCursor;
 import com.mongodb.internal.operation.ReadOperationCursor;
 import com.mongodb.internal.operation.WriteOperation;
 
@@ -39,6 +41,11 @@ public String getCommandName() {
         return writeOperation.getCommandName();
     }
 
+    @Override
+    public BatchCursor execute(final ReadBinding binding, final OperationContext operationContext) {
+        throw new UnsupportedOperationException("This operation is async only");
+    }
+
     @Override
     public void executeAsync(final AsyncReadBinding binding, final OperationContext operationContext, final SingleResultCallback> callback) {
         writeOperation.executeAsync((AsyncWriteBinding) binding, operationContext,  (result, t) -> {
diff --git a/driver-reactive-streams/src/test/unit/com/mongodb/reactivestreams/client/internal/ClientSessionBindingSpecification.groovy b/driver-reactive-streams/src/test/unit/com/mongodb/reactivestreams/client/internal/ClientSessionBindingSpecification.groovy
index 7308560241f..ad4356caa63 100644
--- a/driver-reactive-streams/src/test/unit/com/mongodb/reactivestreams/client/internal/ClientSessionBindingSpecification.groovy
+++ b/driver-reactive-streams/src/test/unit/com/mongodb/reactivestreams/client/internal/ClientSessionBindingSpecification.groovy
@@ -134,7 +134,7 @@ class ClientSessionBindingSpecification extends Specification {
         0 * session.close()
     }
 
-    //TODO move to SessionContext test
+    // TODO-JAVA-5640 move to SessionContext test
 //    def 'owned session is implicit'() {
 //        given:
 //        def session = Mock(ClientSession)
diff --git a/driver-sync/src/test/functional/com/mongodb/client/AbstractClientSideOperationsTimeoutProseTest.java b/driver-sync/src/test/functional/com/mongodb/client/AbstractClientSideOperationsTimeoutProseTest.java
index 524ba02061b..16f8616466d 100644
--- a/driver-sync/src/test/functional/com/mongodb/client/AbstractClientSideOperationsTimeoutProseTest.java
+++ b/driver-sync/src/test/functional/com/mongodb/client/AbstractClientSideOperationsTimeoutProseTest.java
@@ -40,6 +40,7 @@
 import com.mongodb.client.model.changestream.ChangeStreamDocument;
 import com.mongodb.client.model.changestream.FullDocument;
 import com.mongodb.client.test.CollectionHelper;
+import com.mongodb.connection.NettyTransportSettings;
 import com.mongodb.event.CommandEvent;
 import com.mongodb.event.CommandFailedEvent;
 import com.mongodb.event.CommandStartedEvent;
@@ -51,6 +52,7 @@
 import com.mongodb.internal.connection.TestCommandListener;
 import com.mongodb.internal.connection.TestConnectionPoolListener;
 import com.mongodb.test.FlakyTest;
+import io.netty.buffer.PooledByteBufAllocator;
 import org.bson.BsonArray;
 import org.bson.BsonBoolean;
 import org.bson.BsonDocument;
@@ -903,34 +905,18 @@ public void testKillCursorsIsNotExecutedAfterGetMoreNetworkError() {
     @DisplayName("Should throw timeout exception for subsequent commit transaction")
     public void shouldThrowTimeoutExceptionForSubsequentCommitTransaction() {
         assumeTrue(serverVersionAtLeast(4, 4));
-        assumeFalse(isStandalone());
+        //assumeFalse(isStandalone());
 
-        try (MongoClient mongoClient = createMongoClient(getMongoClientSettingsBuilder())) {
+        try (MongoClient mongoClient = createMongoClient(getMongoClientSettingsBuilder()
+                .applyToServerSettings(builder -> builder.heartbeatFrequency(10, TimeUnit.MINUTES))
+                .transportSettings(
+                NettyTransportSettings.nettyBuilder().allocator(PooledByteBufAllocator.DEFAULT)
+                .build()))) {
             MongoCollection collection = mongoClient.getDatabase(namespace.getDatabaseName())
                     .getCollection(namespace.getCollectionName());
 
-            try (ClientSession session = mongoClient.startSession(ClientSessionOptions.builder()
-                    .defaultTimeout(200, TimeUnit.MILLISECONDS)
-                    .build())) {
-                session.startTransaction(TransactionOptions.builder().build());
-                collection.insertOne(session, new Document("x", 1));
-                sleep(200);
-
-                assertDoesNotThrow(session::commitTransaction);
-
-                collectionHelper.runAdminCommand("{"
-                        + "  configureFailPoint: \"failCommand\","
-                        + "  mode: { times: 1 },"
-                        + "  data: {"
-                        + "    failCommands: [\"commitTransaction\"],"
-                        + "    blockConnection: true,"
-                        + "    blockTimeMS: " + 500
-                        + "  }"
-                        + "}");
+            collection.insertOne(new Document("x", 1));
 
-                //repeat commit.
-                assertThrows(MongoOperationTimeoutException.class, session::commitTransaction);
-            }
         }
         List commandStartedEvents = commandListener.getCommandStartedEvents("commitTransaction");
         assertEquals(2, commandStartedEvents.size());
@@ -1014,4 +1000,5 @@ private MongoClient createMongoClient(final MongoClientSettings.Builder builder)
    private long msElapsedSince(final long t1) {
         return TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - t1);
     }
+
 }
diff --git a/driver-sync/src/test/unit/com/mongodb/client/internal/ClientSessionBindingSpecification.groovy b/driver-sync/src/test/unit/com/mongodb/client/internal/ClientSessionBindingSpecification.groovy
index d5383a30ca5..20d49fcf026 100644
--- a/driver-sync/src/test/unit/com/mongodb/client/internal/ClientSessionBindingSpecification.groovy
+++ b/driver-sync/src/test/unit/com/mongodb/client/internal/ClientSessionBindingSpecification.groovy
@@ -119,7 +119,7 @@ class ClientSessionBindingSpecification extends Specification {
         0 * session.close()
     }
 
-    //TODO move to SessionContext test
+    // TODO-JAVA-5640 move to SessionContext test
 //    def 'owned session is implicit'() {
 //        given:
 //        def session = Mock(ClientSession)

From c74258182ca9e0ad326b10aa9e3b59e8cc14f828 Mon Sep 17 00:00:00 2001
From: "slav.babanin" 
Date: Mon, 11 Aug 2025 23:51:35 -0700
Subject: [PATCH 14/36] Add javadoc, remove comments.

---
 .../src/main/com/mongodb/internal/TimeoutContext.java |  5 ++++-
 .../internal/binding/AsyncConnectionSource.java       | 10 ++++++++--
 .../mongodb/internal/binding/AsyncReadBinding.java    |  3 ++-
 .../mongodb/internal/binding/AsyncWriteBinding.java   |  3 ++-
 .../com/mongodb/internal/binding/ClusterBinding.java  |  7 ++++---
 .../com/mongodb/internal/binding/ReadBinding.java     |  2 +-
 .../com/mongodb/internal/binding/WriteBinding.java    |  2 +-
 .../internal/connection/InternalStreamConnection.java | 11 ++---------
 8 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/driver-core/src/main/com/mongodb/internal/TimeoutContext.java b/driver-core/src/main/com/mongodb/internal/TimeoutContext.java
index 05579600af6..dcd953d1c3a 100644
--- a/driver-core/src/main/com/mongodb/internal/TimeoutContext.java
+++ b/driver-core/src/main/com/mongodb/internal/TimeoutContext.java
@@ -39,6 +39,7 @@
  * 
The context for handling timeouts in relation to the Client Side Operation Timeout specification.

  */
 public class TimeoutContext {
+    private static final int NO_ROUND_TRIP_TIME_MS = 0;
     private final TimeoutSettings timeoutSettings;
     @Nullable
     private final Timeout timeout;
@@ -119,7 +120,7 @@ private TimeoutContext(final boolean isMaintenanceContext,
                            @Nullable final Timeout timeout) {
         this(isMaintenanceContext,
                 null,
-                0,
+                NO_ROUND_TRIP_TIME_MS,
                 timeoutSettings,
                 null,
                 timeout);
@@ -177,6 +178,8 @@ public Timeout timeoutIncludingRoundTrip() {
     /**
      * Returns the remaining {@code timeoutMS} if set or the {@code alternativeTimeoutMS}.
      *
+     * zero means infinite timeout.
+     *
      * @param alternativeTimeoutMS the alternative timeout.
      * @return timeout to use.
      */
diff --git a/driver-core/src/main/com/mongodb/internal/binding/AsyncConnectionSource.java b/driver-core/src/main/com/mongodb/internal/binding/AsyncConnectionSource.java
index aae7d6b7419..b2ac048d653 100644
--- a/driver-core/src/main/com/mongodb/internal/binding/AsyncConnectionSource.java
+++ b/driver-core/src/main/com/mongodb/internal/binding/AsyncConnectionSource.java
@@ -27,7 +27,7 @@
  *
  * 
This class is not part of the public API and may be removed or changed at any time

  */
-public interface AsyncConnectionSource extends BindingContext, ReferenceCounted {
+public interface AsyncConnectionSource extends ReferenceCounted {
 
     /**
      * Gets the current description of this source.
@@ -39,10 +39,16 @@ public interface AsyncConnectionSource extends BindingContext, ReferenceCounted
     /**
      * Gets the read preference that was applied when selecting this source.
      *
-     * @see AsyncReadBinding#getReadConnectionSource(int, ReadPreference, SingleResultCallback)
+     * @see AsyncReadBinding#getReadConnectionSource(int, ReadPreference, OperationContext, SingleResultCallback)
      */
     ReadPreference getReadPreference();
 
+    /**
+     * Gets a connection from this source.
+     *
+     * @param operationContext the operation context to use
+     * @param callback the to be passed the connection
+     */
     void getConnection(OperationContext operationContext, SingleResultCallback callback);
 
     @Override
diff --git a/driver-core/src/main/com/mongodb/internal/binding/AsyncReadBinding.java b/driver-core/src/main/com/mongodb/internal/binding/AsyncReadBinding.java
index e6d5cdfbbcf..0c819728ff1 100644
--- a/driver-core/src/main/com/mongodb/internal/binding/AsyncReadBinding.java
+++ b/driver-core/src/main/com/mongodb/internal/binding/AsyncReadBinding.java
@@ -25,7 +25,7 @@
  *
  * 
This class is not part of the public API and may be removed or changed at any time

  */
-public interface AsyncReadBinding extends BindingContext, ReferenceCounted {
+public interface AsyncReadBinding extends ReferenceCounted {
     /**
      * The read preference that all connection sources returned by this instance will satisfy.
      * @return the non-null read preference
@@ -34,6 +34,7 @@ public interface AsyncReadBinding extends BindingContext, ReferenceCounted {
 
     /**
      * Returns a connection source to a server that satisfies the read preference with which this instance is configured.
+     * @param operationContext the operation context to use
      * @param callback the to be passed the connection source
      */
     void getReadConnectionSource(OperationContext operationContext, SingleResultCallback callback);
diff --git a/driver-core/src/main/com/mongodb/internal/binding/AsyncWriteBinding.java b/driver-core/src/main/com/mongodb/internal/binding/AsyncWriteBinding.java
index 1dba1c245e6..31ddb9351ae 100644
--- a/driver-core/src/main/com/mongodb/internal/binding/AsyncWriteBinding.java
+++ b/driver-core/src/main/com/mongodb/internal/binding/AsyncWriteBinding.java
@@ -24,11 +24,12 @@
  *
  * 
This class is not part of the public API and may be removed or changed at any time

  */
-public interface AsyncWriteBinding extends BindingContext, ReferenceCounted {
+public interface AsyncWriteBinding extends ReferenceCounted {
 
     /**
      * Supply a connection source to a server that can be written to
      *
+     * @param operationContext the operation context to use
      * @param callback the to be passed the connection source
      */
     void getWriteConnectionSource(OperationContext operationContext, SingleResultCallback callback);
diff --git a/driver-core/src/main/com/mongodb/internal/binding/ClusterBinding.java b/driver-core/src/main/com/mongodb/internal/binding/ClusterBinding.java
index dc5f1b286af..2c9af2721d9 100644
--- a/driver-core/src/main/com/mongodb/internal/binding/ClusterBinding.java
+++ b/driver-core/src/main/com/mongodb/internal/binding/ClusterBinding.java
@@ -125,9 +125,10 @@ public ReadPreference getReadPreference() {
 
         @Override
         public Connection getConnection(final OperationContext operationContext) {
-            // The first read in a causally consistent session MUST not send afterClusterTime to the server
-            // (because the operationTime has not yet been determined). Therefore, we use ReadConcernAwareNoOpSessionContext to
-            // so that we do not advance clusterTime on ClientSession in given operationContext because it might not be yet set.
+            /* The first read in a causally consistent session MUST not send afterClusterTime to the server
+              (because the operationTime has not yet been determined). Therefore, we use ReadConcernAwareNoOpSessionContext to
+             so that we do not advance clusterTime on ClientSession in given operationContext because it might not be yet set.
+             */
             ReadConcern readConcern = operationContext.getSessionContext().getReadConcern();
             return server.getConnection(operationContext.withSessionContext(new ReadConcernAwareNoOpSessionContext(readConcern)));
         }
diff --git a/driver-core/src/main/com/mongodb/internal/binding/ReadBinding.java b/driver-core/src/main/com/mongodb/internal/binding/ReadBinding.java
index 67c10ccbc5c..0991bf42f28 100644
--- a/driver-core/src/main/com/mongodb/internal/binding/ReadBinding.java
+++ b/driver-core/src/main/com/mongodb/internal/binding/ReadBinding.java
@@ -24,7 +24,7 @@
  *
  * 
This class is not part of the public API and may be removed or changed at any time

  */
-public interface ReadBinding extends BindingContext, ReferenceCounted {
+public interface ReadBinding extends ReferenceCounted {
     ReadPreference getReadPreference();
 
     /**
diff --git a/driver-core/src/main/com/mongodb/internal/binding/WriteBinding.java b/driver-core/src/main/com/mongodb/internal/binding/WriteBinding.java
index beeee4c3bf2..8a201cadcb5 100644
--- a/driver-core/src/main/com/mongodb/internal/binding/WriteBinding.java
+++ b/driver-core/src/main/com/mongodb/internal/binding/WriteBinding.java
@@ -23,7 +23,7 @@
  *
  * 
This class is not part of the public API and may be removed or changed at any time

  */
-public interface WriteBinding extends BindingContext, ReferenceCounted {
+public interface WriteBinding extends ReferenceCounted {
     /**
      * Supply a connection source to a server that can be written to
      *
diff --git a/driver-core/src/main/com/mongodb/internal/connection/InternalStreamConnection.java b/driver-core/src/main/com/mongodb/internal/connection/InternalStreamConnection.java
index f231f795a97..1a0a3e4140c 100644
--- a/driver-core/src/main/com/mongodb/internal/connection/InternalStreamConnection.java
+++ b/driver-core/src/main/com/mongodb/internal/connection/InternalStreamConnection.java
@@ -228,13 +228,10 @@ public void open(final OperationContext originalOperationContext) {
         stream = streamFactory.create(serverId.getAddress());
         OperationContext operationContext = originalOperationContext;
         try {
-            //COMMENT given that we already use serverSelection timeout in SyncOperationHelper, this step is not needed.
-//            OperationContext operationContext = originalOperationContext
-//                    .withTimeoutContext(originalOperationContext.getTimeoutContext().withComputedServerSelectionTimeoutContext());
             stream.open(operationContext);
             InternalConnectionInitializationDescription initializationDescription = connectionInitializer.startHandshake(this, operationContext);
 
-            operationContext = operationContext.withTimeoutContextOverride(TimeoutContext::withNewlyStartedTimeoutMaintenanceTimeout);
+            operationContext = operationContext.withOverride(TimeoutContext::withNewlyStartedTimeoutMaintenanceTimeout);
             initAfterHandshakeStart(initializationDescription);
 
             initializationDescription = connectionInitializer.finishHandshake(this, initializationDescription, operationContext);
@@ -254,10 +251,6 @@ public void openAsync(final OperationContext originalOperationContext, final Sin
         assertNull(stream);
         OperationContext operationContext = originalOperationContext;
         try {
-            //COMMENT given that we already use serverSelection timeout in SyncOperationHelper, this step is not needed.
-//            OperationContext operationContext = originalOperationContext
-//                    .withTimeoutContext(originalOperationContext.getTimeoutContext().withComputedServerSelectionTimeoutContext());
-
             stream = streamFactory.create(serverId.getAddress());
             stream.openAsync(operationContext, new AsyncCompletionHandler() {
 
@@ -272,7 +265,7 @@ public void completed(@Nullable final Void aVoid) {
                                         assertNotNull(initialResult);
                                         initAfterHandshakeStart(initialResult);
                                         connectionInitializer.finishHandshakeAsync(InternalStreamConnection.this,
-                                                initialResult, operationContext.withTimeoutContextOverride(TimeoutContext::withNewlyStartedTimeoutMaintenanceTimeout),
+                                                initialResult, operationContext.withOverride(TimeoutContext::withNewlyStartedTimeoutMaintenanceTimeout),
                                                 (completedResult, completedException) ->  {
                                                         if (completedException != null) {
                                                             close();

From ab4928041175fc5196157bc63e76047ca27635f1 Mon Sep 17 00:00:00 2001
From: "slav.babanin" 
Date: Tue, 12 Aug 2025 20:42:00 -0700
Subject: [PATCH 15/36] Remove redundant tests.

---
 ...tClientSideOperationsTimeoutProseTest.java | 65 +++++++------------
 1 file changed, 25 insertions(+), 40 deletions(-)

diff --git a/driver-sync/src/test/functional/com/mongodb/client/AbstractClientSideOperationsTimeoutProseTest.java b/driver-sync/src/test/functional/com/mongodb/client/AbstractClientSideOperationsTimeoutProseTest.java
index 16f8616466d..9d5366ba71b 100644
--- a/driver-sync/src/test/functional/com/mongodb/client/AbstractClientSideOperationsTimeoutProseTest.java
+++ b/driver-sync/src/test/functional/com/mongodb/client/AbstractClientSideOperationsTimeoutProseTest.java
@@ -777,9 +777,9 @@ public void shouldIgnoreWtimeoutMsOfWriteConcernToInitialAndSubsequentCommitTran
     /**
      * Not a prose spec test. However, it is additional test case for better coverage.
      */
-    @DisplayName("KillCursors is not executed after getMore network error when timeout is not enabled")
+    @DisplayName("KillCursors is not executed after getMore network error when timeoutMs is not enabled")
     @Test
-    public void testKillCursorsIsNotExecutedAfterGetMoreNetworkErrorWhenTimeoutIsNotEnabled() {
+    public void testKillCursorsIsNotExecutedAfterGetMoreNetworkErrorWhenTimeoutMsIsNotEnabled() {
         assumeTrue(serverVersionAtLeast(4, 4));
         assumeTrue(isLoadBalanced());
 
@@ -821,37 +821,6 @@ public void testKillCursorsIsNotExecutedAfterGetMoreNetworkErrorWhenTimeoutIsNot
 
     }
 
-    /**
-     * Not a prose spec test. However, it is additional test case for better coverage.
-     */
-    @DisplayName("KillCursors is not executed after getMore network error when timeout is not enabled")
-    @Test
-    public void test() {
-        long rtt = ClusterFixture.getPrimaryRTT();
-        collectionHelper.create(namespace.getCollectionName(), new CreateCollectionOptions());
-        collectionHelper.insertDocuments(new Document(), new Document());
-        try (MongoClient mongoClient = createMongoClient(
-                getMongoClientSettingsBuilder()
-                        .timeout(100, TimeUnit.MINUTES)
-                        .retryReads(true)
-                        .applyToConnectionPoolSettings(builder ->
-                                builder.maxConnectionIdleTime(10, TimeUnit.MINUTES))
-                        .applyToClusterSettings(builder -> builder.serverSelectionTimeout(500, TimeUnit.MINUTES))
-                        .applyToSocketSettings(builder -> builder.readTimeout(500, TimeUnit.MILLISECONDS)))) {
-            MongoCollection collection = mongoClient.getDatabase(namespace.getDatabaseName())
-                    .getCollection(namespace.getCollectionName()).withReadPreference(ReadPreference.primary());
-
-            MongoCursor cursor = collection.find()
-                    .batchSize(1)
-                    .cursor();
-
-            sleep(500);
-            cursor.next();
-            sleep(500);
-            cursor.close();
-        }
-    }
-
     /**
      * Not a prose spec test. However, it is additional test case for better coverage.
      */
@@ -905,18 +874,34 @@ public void testKillCursorsIsNotExecutedAfterGetMoreNetworkError() {
     @DisplayName("Should throw timeout exception for subsequent commit transaction")
     public void shouldThrowTimeoutExceptionForSubsequentCommitTransaction() {
         assumeTrue(serverVersionAtLeast(4, 4));
-        //assumeFalse(isStandalone());
+        assumeFalse(isStandalone());
 
-        try (MongoClient mongoClient = createMongoClient(getMongoClientSettingsBuilder()
-                .applyToServerSettings(builder -> builder.heartbeatFrequency(10, TimeUnit.MINUTES))
-                .transportSettings(
-                NettyTransportSettings.nettyBuilder().allocator(PooledByteBufAllocator.DEFAULT)
-                .build()))) {
+        try (MongoClient mongoClient = createMongoClient(getMongoClientSettingsBuilder())) {
             MongoCollection collection = mongoClient.getDatabase(namespace.getDatabaseName())
                     .getCollection(namespace.getCollectionName());
 
-            collection.insertOne(new Document("x", 1));
+            try (ClientSession session = mongoClient.startSession(ClientSessionOptions.builder()
+                    .defaultTimeout(200, TimeUnit.MILLISECONDS)
+                    .build())) {
+                session.startTransaction(TransactionOptions.builder().build());
+                collection.insertOne(session, new Document("x", 1));
+                sleep(200);
+
+                assertDoesNotThrow(session::commitTransaction);
+
+                collectionHelper.runAdminCommand("{"
+                        + "  configureFailPoint: \"failCommand\","
+                        + "  mode: { times: 1 },"
+                        + "  data: {"
+                        + "    failCommands: [\"commitTransaction\"],"
+                        + "    blockConnection: true,"
+                        + "    blockTimeMS: " + 500
+                        + "  }"
+                        + "}");
 
+                //repeat commit.
+                assertThrows(MongoOperationTimeoutException.class, session::commitTransaction);
+            }
         }
         List commandStartedEvents = commandListener.getCommandStartedEvents("commitTransaction");
         assertEquals(2, commandStartedEvents.size());

From 3c6040a473b0cf4183f7ad213d768c1e87153f61 Mon Sep 17 00:00:00 2001
From: "slav.babanin" 
Date: Tue, 12 Aug 2025 22:07:52 -0700
Subject: [PATCH 16/36] Enhance Javadoc comments and improve method signatures
 for clarity.

---
 .../com/mongodb/internal/TimeoutContext.java  |  18 +-
 .../function/AsyncCallbackTriFunction.java    |   2 +
 .../internal/async/function/RetryState.java   |   4 +-
 .../AsyncClusterAwareReadWriteBinding.java    |   1 +
 .../internal/binding/AsyncClusterBinding.java |   8 +-
 .../internal/binding/BindingContext.java      |  30 --
 .../internal/binding/ClusterBinding.java      |   5 +-
 .../connection/DefaultConnectionPool.java     |   2 +-
 .../connection/InternalStreamConnection.java  |  34 ++-
 .../connection/SaslAuthenticator.java         |   8 +-
 .../AggregateToCollectionOperation.java       |   4 +-
 .../AsyncChangeStreamBatchCursor.java         |   1 -
 .../operation/AsyncCommandCoreCursor.java     |   3 +-
 .../internal/operation/CommandCoreCursor.java |   2 +-
 .../operation/CursorResourceManager.java      |  49 ++--
 .../operation/CursorResourceManagerNew.java   | 262 ------------------
 .../operation/CursorResourceManagerTest.java  |  10 +-
 17 files changed, 68 insertions(+), 375 deletions(-)
 delete mode 100644 driver-core/src/main/com/mongodb/internal/binding/BindingContext.java
 delete mode 100644 driver-core/src/main/com/mongodb/internal/operation/CursorResourceManagerNew.java

diff --git a/driver-core/src/main/com/mongodb/internal/TimeoutContext.java b/driver-core/src/main/com/mongodb/internal/TimeoutContext.java
index dcd953d1c3a..61aee91baab 100644
--- a/driver-core/src/main/com/mongodb/internal/TimeoutContext.java
+++ b/driver-core/src/main/com/mongodb/internal/TimeoutContext.java
@@ -44,8 +44,6 @@ public class TimeoutContext {
     @Nullable
     private final Timeout timeout;
     @Nullable
-    private final Timeout computedServerSelectionTimeout;
-    @Nullable
     private final MaxTimeSupplier maxTimeSupplier;
     private final boolean isMaintenanceContext;
     private final long minRoundTripTimeMS;
@@ -119,7 +117,6 @@ private TimeoutContext(final boolean isMaintenanceContext,
                            final TimeoutSettings timeoutSettings,
                            @Nullable final Timeout timeout) {
         this(isMaintenanceContext,
-                null,
                 NO_ROUND_TRIP_TIME_MS,
                 timeoutSettings,
                 null,
@@ -127,12 +124,10 @@ private TimeoutContext(final boolean isMaintenanceContext,
     }
 
     private TimeoutContext(final boolean isMaintenanceContext,
-                           @Nullable final Timeout computedServerSelectionTimeout,
                            final long minRoundTripTimeMS,
                            final TimeoutSettings timeoutSettings,
                            @Nullable final MaxTimeSupplier maxTimeSupplier) {
         this(isMaintenanceContext,
-                computedServerSelectionTimeout,
                 minRoundTripTimeMS,
                 timeoutSettings,
                 maxTimeSupplier,
@@ -140,14 +135,12 @@ private TimeoutContext(final boolean isMaintenanceContext,
     }
 
     private TimeoutContext(final boolean isMaintenanceContext,
-                           @Nullable final Timeout computedServerSelectionTimeout,
                            final long minRoundTripTimeMS,
                            final TimeoutSettings timeoutSettings,
                            @Nullable final MaxTimeSupplier maxTimeSupplier,
                            @Nullable final Timeout timeout) {
         this.isMaintenanceContext = isMaintenanceContext;
         this.timeoutSettings = timeoutSettings;
-        this.computedServerSelectionTimeout = computedServerSelectionTimeout;
         this.minRoundTripTimeMS = minRoundTripTimeMS;
         this.maxTimeSupplier = maxTimeSupplier;
         this.timeout = timeout;
@@ -237,7 +230,6 @@ public int getConnectTimeoutMs() {
     public TimeoutContext withMaxTimeAsMaxAwaitTimeOverride() {
         return new TimeoutContext(
                 isMaintenanceContext,
-                computedServerSelectionTimeout,
                 minRoundTripTimeMS,
                 timeoutSettings,
                 timeoutSettings::getMaxAwaitTimeMS,
@@ -259,7 +251,6 @@ public TimeoutContext withMaxTimeAsMaxAwaitTimeOverride() {
     public TimeoutContext withMaxTimeOverride(final long maxTimeMS) {
         return new TimeoutContext(
                 isMaintenanceContext,
-                computedServerSelectionTimeout,
                 minRoundTripTimeMS,
                 timeoutSettings,
                 () -> maxTimeMS,
@@ -274,7 +265,6 @@ public TimeoutContext withMaxTimeOverride(final long maxTimeMS) {
     public TimeoutContext withDefaultMaxTime() {
         return new TimeoutContext(
                 isMaintenanceContext,
-                computedServerSelectionTimeout,
                 minRoundTripTimeMS,
                 timeoutSettings,
                 null,
@@ -288,7 +278,6 @@ public TimeoutContext withDefaultMaxTime() {
     public TimeoutContext withDisabledMaxTimeOverride() {
         return new TimeoutContext(
                 isMaintenanceContext,
-                computedServerSelectionTimeout,
                 minRoundTripTimeMS,
                 timeoutSettings,
                 () -> 0,
@@ -302,7 +291,6 @@ public TimeoutContext withDisabledMaxTimeOverride() {
     public TimeoutContext withMaxTimeOverrideAsMaxCommitTime() {
         return new TimeoutContext(
                 isMaintenanceContext,
-                computedServerSelectionTimeout,
                 minRoundTripTimeMS,
                 timeoutSettings,
                 () -> getMaxCommitTimeMS(),
@@ -319,7 +307,6 @@ public TimeoutContext withMaxTimeOverrideAsMaxCommitTime() {
     public TimeoutContext withMinRoundTripTime(final long minRoundTripTimeMS) {
         return new TimeoutContext(
                 isMaintenanceContext,
-                computedServerSelectionTimeout,
                 minRoundTripTimeMS,
                 timeoutSettings,
                 maxTimeSupplier,
@@ -329,14 +316,13 @@ public TimeoutContext withMinRoundTripTime(final long minRoundTripTimeMS) {
     /**
      * Resets the timeout if this timeout context is being used by pool maintenance
      */
-    public TimeoutContext withNewlyStartedTimeoutMaintenanceTimeout() {
+    public TimeoutContext withNewlyStartedMaintenanceTimeout() {
         if (!isMaintenanceContext) {
             return this;
         }
 
         return new TimeoutContext(
                 true,
-                computedServerSelectionTimeout,
                 minRoundTripTimeMS,
                 timeoutSettings,
                 maxTimeSupplier);
@@ -363,7 +349,6 @@ public TimeoutContext withComputedServerSelectionTimeout() {
     public TimeoutContext withMinRoundTripTimeMS(final long minRoundTripTimeMS) {
         isTrue("'minRoundTripTimeMS' must be a positive number", minRoundTripTimeMS >= 0);
         return new TimeoutContext(isMaintenanceContext,
-                computedServerSelectionTimeout,
                 minRoundTripTimeMS,
                 timeoutSettings,
                 maxTimeSupplier,
@@ -373,7 +358,6 @@ public TimeoutContext withMinRoundTripTimeMS(final long minRoundTripTimeMS) {
     public TimeoutContext withNewlyStartedTimeout() {
         return new TimeoutContext(
                 isMaintenanceContext,
-                computedServerSelectionTimeout,
                 minRoundTripTimeMS,
                 timeoutSettings,
                 maxTimeSupplier);
diff --git a/driver-core/src/main/com/mongodb/internal/async/function/AsyncCallbackTriFunction.java b/driver-core/src/main/com/mongodb/internal/async/function/AsyncCallbackTriFunction.java
index 0df5ff8c358..3c1dd09fb7b 100644
--- a/driver-core/src/main/com/mongodb/internal/async/function/AsyncCallbackTriFunction.java
+++ b/driver-core/src/main/com/mongodb/internal/async/function/AsyncCallbackTriFunction.java
@@ -26,6 +26,7 @@
  *
  * @param  The type of the first parameter to the function.
  * @param  The type of the second parameter to the function.
+ * @param  The type of the third parameter to the function.
  * @param  See {@link AsyncCallbackFunction}
  * @see AsyncCallbackFunction
  */
@@ -34,6 +35,7 @@ public interface AsyncCallbackTriFunction {
     /**
      * @param p1 The first {@code @}{@link Nullable} argument of the asynchronous function.
      * @param p2 The second {@code @}{@link Nullable} argument of the asynchronous function.
+     * @param p3 The second {@code @}{@link Nullable} argument of the asynchronous function.
      * @see AsyncCallbackFunction#apply(Object, SingleResultCallback)
      */
     void apply(P1 p1, P2 p2, P3 p3, SingleResultCallback callback);
diff --git a/driver-core/src/main/com/mongodb/internal/async/function/RetryState.java b/driver-core/src/main/com/mongodb/internal/async/function/RetryState.java
index 5c9f756a94d..276a6103a36 100644
--- a/driver-core/src/main/com/mongodb/internal/async/function/RetryState.java
+++ b/driver-core/src/main/com/mongodb/internal/async/function/RetryState.java
@@ -67,7 +67,7 @@ public final class RetryState {
      * 

      *
      * @param retries A positive number of allowed retries. {@link Integer#MAX_VALUE} is a special value interpreted as being unlimited.
-     * @param retryUntilTimeoutThrowsException // TODO-JAVA-5640 shouldn't a timeout always stop retries?
+     * @param retryUntilTimeoutThrowsException If {@code true}, then if a {@link MongoOperationTimeoutException} is throws then retrying stops.
      * @see #attempts()
      */
     public static RetryState withRetryableState(final int retries, final boolean retryUntilTimeoutThrowsException) {
@@ -397,7 +397,7 @@ public int attempt() {
      * 
    
      *     
  • 0 if the number of retries is {@linkplain #RetryState(TimeoutContext) unlimited};
    • 
      *     
  • 1 if no retries are allowed;
    • 
-     *     
  • {@link #RetryState(int, TimeoutContext) retries} + 1 otherwise.
    • 
+     *     
  • {@link #RetryState(int, boolean) retries} + 1 otherwise.
    • 
      * 

      *
      * @see #attempt()
diff --git a/driver-core/src/main/com/mongodb/internal/binding/AsyncClusterAwareReadWriteBinding.java b/driver-core/src/main/com/mongodb/internal/binding/AsyncClusterAwareReadWriteBinding.java
index 5de9df43174..f019fec93f8 100644
--- a/driver-core/src/main/com/mongodb/internal/binding/AsyncClusterAwareReadWriteBinding.java
+++ b/driver-core/src/main/com/mongodb/internal/binding/AsyncClusterAwareReadWriteBinding.java
@@ -29,6 +29,7 @@ public interface AsyncClusterAwareReadWriteBinding extends AsyncReadWriteBinding
      * Returns a connection source to the specified server
      *
      * @param serverAddress the server address
+     * @param operationContext the operation context to use
      * @param callback the to be passed the connection source
      */
     void getConnectionSource(ServerAddress serverAddress, OperationContext operationContext, SingleResultCallback callback);
diff --git a/driver-core/src/main/com/mongodb/internal/binding/AsyncClusterBinding.java b/driver-core/src/main/com/mongodb/internal/binding/AsyncClusterBinding.java
index 4a5e4584e95..295aba948b2 100644
--- a/driver-core/src/main/com/mongodb/internal/binding/AsyncClusterBinding.java
+++ b/driver-core/src/main/com/mongodb/internal/binding/AsyncClusterBinding.java
@@ -146,9 +146,11 @@ public ReadPreference getReadPreference() {
 
         @Override
         public void getConnection(final OperationContext operationContext, final SingleResultCallback callback) {
-            // The first read in a causally consistent session MUST not send afterClusterTime to the server
-            // (because the operationTime has not yet been determined). Therefore, we use ReadConcernAwareNoOpSessionContext to
-            // so that we do not advance clusterTime on ClientSession in given operationContext because it might not be yet set.
+            /*
+             The first read in a causally consistent session MUST not send afterClusterTime to the server
+             (because the operationTime has not yet been determined). Therefore, we use ReadConcernAwareNoOpSessionContext to
+             so that we do not advance clusterTime on ClientSession in given operationContext because it might not be yet set.
+             */
             ReadConcern readConcern = operationContext.getSessionContext().getReadConcern();
             server.getConnectionAsync(operationContext.withSessionContext(new ReadConcernAwareNoOpSessionContext(readConcern)), callback);
         }
diff --git a/driver-core/src/main/com/mongodb/internal/binding/BindingContext.java b/driver-core/src/main/com/mongodb/internal/binding/BindingContext.java
deleted file mode 100644
index 289d9070c5e..00000000000
--- a/driver-core/src/main/com/mongodb/internal/binding/BindingContext.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright 2008-present MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.internal.binding;
-
-/**
- * 
This class is not part of the public API and may be removed or changed at any time

- */
-public interface BindingContext {
-
-    /**
-     * Note: Will return the same operation context if called multiple times.
-     *
-     * @return the operation context for the binding context.
-     */
-    // OperationContext getOperationContext();
-}
diff --git a/driver-core/src/main/com/mongodb/internal/binding/ClusterBinding.java b/driver-core/src/main/com/mongodb/internal/binding/ClusterBinding.java
index 2c9af2721d9..c77f0bf7e13 100644
--- a/driver-core/src/main/com/mongodb/internal/binding/ClusterBinding.java
+++ b/driver-core/src/main/com/mongodb/internal/binding/ClusterBinding.java
@@ -125,8 +125,9 @@ public ReadPreference getReadPreference() {
 
         @Override
         public Connection getConnection(final OperationContext operationContext) {
-            /* The first read in a causally consistent session MUST not send afterClusterTime to the server
-              (because the operationTime has not yet been determined). Therefore, we use ReadConcernAwareNoOpSessionContext to
+            /*
+             The first read in a causally consistent session MUST not send afterClusterTime to the server
+             (because the operationTime has not yet been determined). Therefore, we use ReadConcernAwareNoOpSessionContext to
              so that we do not advance clusterTime on ClientSession in given operationContext because it might not be yet set.
              */
             ReadConcern readConcern = operationContext.getSessionContext().getReadConcern();
diff --git a/driver-core/src/main/com/mongodb/internal/connection/DefaultConnectionPool.java b/driver-core/src/main/com/mongodb/internal/connection/DefaultConnectionPool.java
index ec611ee7b9b..13e7ad987b5 100644
--- a/driver-core/src/main/com/mongodb/internal/connection/DefaultConnectionPool.java
+++ b/driver-core/src/main/com/mongodb/internal/connection/DefaultConnectionPool.java
@@ -451,7 +451,7 @@ void doMaintenance() {
     }
 
     private boolean shouldEnsureMinSize() {
-        return settings.getMinSize() > -1;
+        return settings.getMinSize() > 0;
     }
 
     private boolean shouldPrune(final UsageTrackingInternalConnection connection) {
diff --git a/driver-core/src/main/com/mongodb/internal/connection/InternalStreamConnection.java b/driver-core/src/main/com/mongodb/internal/connection/InternalStreamConnection.java
index 1a0a3e4140c..808f0def362 100644
--- a/driver-core/src/main/com/mongodb/internal/connection/InternalStreamConnection.java
+++ b/driver-core/src/main/com/mongodb/internal/connection/InternalStreamConnection.java
@@ -231,7 +231,7 @@ public void open(final OperationContext originalOperationContext) {
             stream.open(operationContext);
             InternalConnectionInitializationDescription initializationDescription = connectionInitializer.startHandshake(this, operationContext);
 
-            operationContext = operationContext.withOverride(TimeoutContext::withNewlyStartedTimeoutMaintenanceTimeout);
+            operationContext = operationContext.withOverride(TimeoutContext::withNewlyStartedMaintenanceTimeout);
             initAfterHandshakeStart(initializationDescription);
 
             initializationDescription = connectionInitializer.finishHandshake(this, initializationDescription, operationContext);
@@ -264,18 +264,10 @@ public void completed(@Nullable final Void aVoid) {
                                     } else {
                                         assertNotNull(initialResult);
                                         initAfterHandshakeStart(initialResult);
-                                        connectionInitializer.finishHandshakeAsync(InternalStreamConnection.this,
-                                                initialResult, operationContext.withOverride(TimeoutContext::withNewlyStartedTimeoutMaintenanceTimeout),
-                                                (completedResult, completedException) ->  {
-                                                        if (completedException != null) {
-                                                            close();
-                                                            callback.onResult(null, completedException);
-                                                        } else {
-                                                            assertNotNull(completedResult);
-                                                            initAfterHandshakeFinish(completedResult);
-                                                            callback.onResult(null, null);
-                                                        }
-                                                });
+                                        finishHandshakeAsync(
+                                                initialResult,
+                                                operationContext.withOverride(TimeoutContext::withNewlyStartedMaintenanceTimeout),
+                                                callback);
                                     }
                             });
                 }
@@ -292,6 +284,22 @@ public void failed(final Throwable t) {
         }
     }
 
+    private void finishHandshakeAsync(final InternalConnectionInitializationDescription initialResult,
+                                      final OperationContext operationContext,
+                                      final SingleResultCallback callback) {
+        connectionInitializer.finishHandshakeAsync(InternalStreamConnection.this, initialResult, operationContext,
+                (completedResult, completedException) ->  {
+                    if (completedException != null) {
+                        close();
+                        callback.onResult(null, completedException);
+                    } else {
+                        assertNotNull(completedResult);
+                        initAfterHandshakeFinish(completedResult);
+                        callback.onResult(null, null);
+                    }
+                });
+    }
+
     private void initAfterHandshakeStart(final InternalConnectionInitializationDescription initializationDescription) {
         description = initializationDescription.getConnectionDescription();
         initialServerDescription = initializationDescription.getServerDescription();
diff --git a/driver-core/src/main/com/mongodb/internal/connection/SaslAuthenticator.java b/driver-core/src/main/com/mongodb/internal/connection/SaslAuthenticator.java
index af115cd6d15..3e8c0bf612a 100644
--- a/driver-core/src/main/com/mongodb/internal/connection/SaslAuthenticator.java
+++ b/driver-core/src/main/com/mongodb/internal/connection/SaslAuthenticator.java
@@ -73,7 +73,7 @@ public void authenticate(final InternalConnection connection, final ConnectionDe
                 BsonDocument responseDocument = connection.opened() ? null : getSpeculativeAuthenticateResponse();
                 if (responseDocument == null) {
                     responseDocument = getNextSaslResponse(saslClient, connection, operationContext);
-                    operationContext = operationContext.withOverride(TimeoutContext::withNewlyStartedTimeoutMaintenanceTimeout);
+                    operationContext = operationContext.withOverride(TimeoutContext::withNewlyStartedMaintenanceTimeout);
                 }
 
                 BsonInt32 conversationId = responseDocument.getInt32("conversationId");
@@ -88,7 +88,7 @@ public void authenticate(final InternalConnection connection, final ConnectionDe
                     }
 
                     responseDocument = sendSaslContinue(conversationId, response, connection, operationContext);
-                    operationContext = operationContext.withOverride(TimeoutContext::withNewlyStartedTimeoutMaintenanceTimeout);
+                    operationContext = operationContext.withOverride(TimeoutContext::withNewlyStartedMaintenanceTimeout);
                 }
                 if (!saslClient.isComplete()) {
                     saslClient.evaluateChallenge((responseDocument.getBinary("payload")).getData());
@@ -166,7 +166,7 @@ private void getNextSaslResponseAsync(final SaslClient saslClient, final Interna
                         verifySaslClientComplete(saslClient, result, errHandlingCallback);
                     } else {
                         OperationContext saslContinueOperationContext =
-                                operationContext.withOverride(TimeoutContext::withNewlyStartedTimeoutMaintenanceTimeout);
+                                operationContext.withOverride(TimeoutContext::withNewlyStartedMaintenanceTimeout);
                         new Continuator(saslClient, result, connection, saslContinueOperationContext, errHandlingCallback).start();
                     }
                 });
@@ -340,7 +340,7 @@ public void onResult(@Nullable final BsonDocument result, @Nullable final Throwa
                 verifySaslClientComplete(saslClient, result, callback);
                 disposeOfSaslClient(saslClient);
             } else {
-                operationContext = operationContext.withOverride(TimeoutContext::withNewlyStartedTimeoutMaintenanceTimeout);
+                operationContext = operationContext.withOverride(TimeoutContext::withNewlyStartedMaintenanceTimeout);
                 continueConversation(result);
             }
         }
diff --git a/driver-core/src/main/com/mongodb/internal/operation/AggregateToCollectionOperation.java b/driver-core/src/main/com/mongodb/internal/operation/AggregateToCollectionOperation.java
index 36e7e1aad5f..3bf90295dfb 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/AggregateToCollectionOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/AggregateToCollectionOperation.java
@@ -171,7 +171,9 @@ public Void execute(final ReadBinding binding, final OperationContext operationC
                                 serverSelectionOperationContext),
                 namespace.getDatabaseName(),
                 getCommandCreator(),
-                new BsonDocumentCodec(), transformer(), false);
+                new BsonDocumentCodec(),
+                transformer(),
+                false);
     }
 
     @Override
diff --git a/driver-core/src/main/com/mongodb/internal/operation/AsyncChangeStreamBatchCursor.java b/driver-core/src/main/com/mongodb/internal/operation/AsyncChangeStreamBatchCursor.java
index bac38c39c34..82b1906a480 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/AsyncChangeStreamBatchCursor.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/AsyncChangeStreamBatchCursor.java
@@ -187,7 +187,6 @@ private void resumeableOperation(final AsyncBlock asyncBlock,
                                      final SingleResultCallback> callback,
                                      final OperationContext operationContext,
                                      final boolean tryNext) {
-        //timeoutContext.resetTimeoutIfPresent(); //FIXme it was a bug, we reset timeout on retry which is against the spec. Moved to next() method.
         SingleResultCallback> errHandlingCallback = errorHandlingCallback(callback, LOGGER);
         if (isClosed()) {
             errHandlingCallback.onResult(null, new MongoException(format("%s called after the cursor was closed.",
diff --git a/driver-core/src/main/com/mongodb/internal/operation/AsyncCommandCoreCursor.java b/driver-core/src/main/com/mongodb/internal/operation/AsyncCommandCoreCursor.java
index 754c63208fd..de49f1fc972 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/AsyncCommandCoreCursor.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/AsyncCommandCoreCursor.java
@@ -96,7 +96,6 @@ class AsyncCommandCoreCursor implements AsyncCoreCursor {
     @Override
     public void next(final OperationContext operationContext, final SingleResultCallback> callback) {
         resourceManager.execute(funcCallback -> {
-           //checkTimeoutModeAndResetTimeoutContextIfIteration(); //FIXME it was a bug? we should have reset the timeout when next was request to execute connection checkout and subsequent read wait on one timeout
             ServerCursor localServerCursor = resourceManager.getServerCursor();
             boolean serverCursorIsNull = localServerCursor == null;
             List batchResults = emptyList();
@@ -211,7 +210,7 @@ private CommandCursorResult toCommandCursorResult(final ServerAddress serverA
     }
 
     @ThreadSafe
-    private final class ResourceManager extends CursorResourceManagerNew {
+    private final class ResourceManager extends CursorResourceManager {
         ResourceManager(
                 final MongoNamespace namespace,
                 final AsyncConnectionSource connectionSource,
diff --git a/driver-core/src/main/com/mongodb/internal/operation/CommandCoreCursor.java b/driver-core/src/main/com/mongodb/internal/operation/CommandCoreCursor.java
index 624c4b9bb83..e49f2fb7292 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/CommandCoreCursor.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/CommandCoreCursor.java
@@ -251,7 +251,7 @@ private CommandCursorResult toCommandCursorResult(final ServerAddress serverA
 
 
     @ThreadSafe
-    private final class ResourceManager extends CursorResourceManagerNew {
+    private final class ResourceManager extends CursorResourceManager {
         ResourceManager(
                 final MongoNamespace namespace,
                 final ConnectionSource connectionSource,
diff --git a/driver-core/src/main/com/mongodb/internal/operation/CursorResourceManager.java b/driver-core/src/main/com/mongodb/internal/operation/CursorResourceManager.java
index 0fbdf512dab..522ab2ebe54 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/CursorResourceManager.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/CursorResourceManager.java
@@ -1,3 +1,5 @@
+package com.mongodb.internal.operation;
+
 /*
  * Copyright 2008-present MongoDB, Inc.
  *
@@ -14,14 +16,13 @@
  * limitations under the License.
  */
 
-package com.mongodb.internal.operation;
-
 import com.mongodb.MongoNamespace;
 import com.mongodb.MongoSocketException;
 import com.mongodb.ServerCursor;
 import com.mongodb.annotations.ThreadSafe;
 import com.mongodb.internal.binding.ReferenceCounted;
 import com.mongodb.internal.connection.Connection;
+import com.mongodb.internal.connection.OperationContext;
 import com.mongodb.lang.Nullable;
 
 import java.util.concurrent.locks.Lock;
@@ -34,23 +35,6 @@
 import static com.mongodb.internal.Locks.withLock;
 import static com.mongodb.internal.operation.CommandBatchCursorHelper.MESSAGE_IF_CONCURRENT_OPERATION;
 
-/**
- * This is the resource manager for {@link CommandBatchCursor} or {@link AsyncCommandBatchCursor} implementations.
- * 

- * This class maintains all resources that must be released in {@link CommandBatchCursor#close()} /
- * {@link AsyncCommandBatchCursor#close()}. The abstract {@linkplain #doClose() deferred close action} is such that it is totally
- * ordered with other operations of {@link CommandBatchCursor} / {@link AsyncCommandBatchCursor} (methods {@link #tryStartOperation()}/
- * {@link #endOperation()} must be used properly to enforce the order) despite the method {@link CommandBatchCursor#close()} /
- * {@link AsyncCommandBatchCursor#close()} being called concurrently with those operations.
- * 

- * This total order induces the happens-before order.
- * 

- * The deferred close action does not violate externally observable idempotence of {@link CommandBatchCursor#close()} /
- * {@link AsyncCommandBatchCursor#close()}, because the close method is allowed to release resources "eventually".
- * 

- * Only methods explicitly documented as thread-safe are thread-safe,
- * others are not and rely on the total order mentioned above.
- */
 @ThreadSafe
 abstract class CursorResourceManager {
     private final Lock lock;
@@ -158,7 +142,7 @@ boolean tryStartOperation() throws IllegalStateException {
     /**
      * Thread-safe.
      */
-    void endOperation() {
+    void endOperation(final OperationContext operationContext) {
         boolean doClose = withLock(lock, () -> {
             State localState = state;
             if (localState == State.OPERATION_IN_PROGRESS) {
@@ -172,17 +156,17 @@ void endOperation() {
             return false;
         });
         if (doClose) {
-            doClose();
+            doClose(operationContext);
         }
     }
 
     /**
      * Thread-safe.
      */
-    void close() {
+    void close(final OperationContext operationContext) {
         boolean doClose = withLock(lock, () -> {
             State localState = state;
-            if (localState.inProgress()) {
+            if (localState.isOperationInProgress()) {
                 state = State.CLOSE_PENDING;
             } else if (localState != State.CLOSED) {
                 state = State.CLOSED;
@@ -191,15 +175,15 @@ void close() {
             return false;
         });
         if (doClose) {
-            doClose();
+            doClose(operationContext);
         }
     }
 
     /**
      * This method is never executed concurrently with either itself or other operations
-     * demarcated by {@link #tryStartOperation()}/{@link #endOperation()}.
+     * demarcated by {@link #tryStartOperation()}/{@link #endOperation(OperationContext)}.
      */
-    abstract void doClose();
+    abstract void doClose(OperationContext operationContext);
 
     void onCorruptedConnection(@Nullable final C corruptedConnection, final MongoSocketException e) {
         // if `pinnedConnection` is corrupted, then we cannot kill `serverCursor` via such a connection
@@ -221,7 +205,7 @@ final ServerCursor getServerCursor() {
     }
 
     void setServerCursor(@Nullable final ServerCursor serverCursor) {
-        assertTrue(state.inProgress());
+        assertTrue(state.isOperationInProgress());
         assertNotNull(this.serverCursor);
         // without `connectionSource` we will not be able to kill `serverCursor` later
         assertNotNull(connectionSource);
@@ -259,19 +243,20 @@ enum State {
         CLOSED(false, false);
 
         private final boolean operable;
-        private final boolean inProgress;
+        private final boolean operationInProgress;
 
-        State(final boolean operable, final boolean inProgress) {
+        State(final boolean operable, final boolean operationInProgress) {
             this.operable = operable;
-            this.inProgress = inProgress;
+            this.operationInProgress = operationInProgress;
         }
 
         boolean operable() {
             return operable;
         }
 
-        boolean inProgress() {
-            return inProgress;
+        boolean isOperationInProgress() {
+            return operationInProgress;
         }
     }
 }
+
diff --git a/driver-core/src/main/com/mongodb/internal/operation/CursorResourceManagerNew.java b/driver-core/src/main/com/mongodb/internal/operation/CursorResourceManagerNew.java
deleted file mode 100644
index 4cf08fa008a..00000000000
--- a/driver-core/src/main/com/mongodb/internal/operation/CursorResourceManagerNew.java
+++ /dev/null
@@ -1,262 +0,0 @@
-package com.mongodb.internal.operation;
-
-/*
- * Copyright 2008-present MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import com.mongodb.MongoNamespace;
-import com.mongodb.MongoSocketException;
-import com.mongodb.ServerCursor;
-import com.mongodb.annotations.ThreadSafe;
-import com.mongodb.internal.binding.ReferenceCounted;
-import com.mongodb.internal.connection.Connection;
-import com.mongodb.internal.connection.OperationContext;
-import com.mongodb.lang.Nullable;
-
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
-
-import static com.mongodb.assertions.Assertions.assertNotNull;
-import static com.mongodb.assertions.Assertions.assertNull;
-import static com.mongodb.assertions.Assertions.assertTrue;
-import static com.mongodb.assertions.Assertions.fail;
-import static com.mongodb.internal.Locks.withLock;
-import static com.mongodb.internal.operation.CommandBatchCursorHelper.MESSAGE_IF_CONCURRENT_OPERATION;
-
-@ThreadSafe
-abstract class CursorResourceManagerNew {
-    private final Lock lock;
-    private final MongoNamespace namespace;
-    private volatile State state;
-    @Nullable
-    private volatile CS connectionSource;
-    @Nullable
-    private volatile C pinnedConnection;
-    @Nullable
-    private volatile ServerCursor serverCursor;
-    private volatile boolean skipReleasingServerResourcesOnClose;
-
-    CursorResourceManagerNew(
-            final MongoNamespace namespace,
-            final CS connectionSource,
-            @Nullable final C connectionToPin,
-            @Nullable final ServerCursor serverCursor) {
-        this.lock = new ReentrantLock();
-        this.namespace = namespace;
-        this.state = State.IDLE;
-        if (serverCursor != null) {
-            connectionSource.retain();
-            this.connectionSource = connectionSource;
-            if (connectionToPin != null) {
-                connectionToPin.retain();
-                markAsPinned(connectionToPin, Connection.PinningMode.CURSOR);
-                this.pinnedConnection = connectionToPin;
-            }
-        }
-        this.skipReleasingServerResourcesOnClose = false;
-        this.serverCursor = serverCursor;
-    }
-
-    /**
-     * Thread-safe.
-     */
-    MongoNamespace getNamespace() {
-        return namespace;
-    }
-
-    /**
-     * Thread-safe.
-     */
-    State getState() {
-        return state;
-    }
-
-    /**
-     * Thread-safe.
-     */
-    @Nullable
-    CS getConnectionSource() {
-        return connectionSource;
-    }
-
-    /**
-     * Thread-safe.
-     */
-    @Nullable
-    C getPinnedConnection() {
-        return pinnedConnection;
-    }
-
-    /**
-     * Thread-safe.
-     */
-    boolean isSkipReleasingServerResourcesOnClose() {
-        return skipReleasingServerResourcesOnClose;
-    }
-
-    @SuppressWarnings("SameParameterValue")
-    abstract void markAsPinned(C connectionToPin, Connection.PinningMode pinningMode);
-
-    /**
-     * Thread-safe.
-     */
-    boolean operable() {
-        return state.operable();
-    }
-
-    /**
-     * Thread-safe.
-     * Returns {@code true} iff started an operation.
-     * If {@linkplain #operable() closed}, then returns false, otherwise completes abruptly.
-     *
-     * @throws IllegalStateException Iff another operation is in progress.
-     */
-    boolean tryStartOperation() throws IllegalStateException {
-        return withLock(lock, () -> {
-            State localState = state;
-            if (!localState.operable()) {
-                return false;
-            } else if (localState == State.IDLE) {
-                state = State.OPERATION_IN_PROGRESS;
-                return true;
-            } else if (localState == State.OPERATION_IN_PROGRESS) {
-                throw new IllegalStateException(MESSAGE_IF_CONCURRENT_OPERATION);
-            } else {
-                throw fail(state.toString());
-            }
-        });
-    }
-
-    /**
-     * Thread-safe.
-     */
-    void endOperation(final OperationContext operationContext) {
-        boolean doClose = withLock(lock, () -> {
-            State localState = state;
-            if (localState == State.OPERATION_IN_PROGRESS) {
-                state = State.IDLE;
-            } else if (localState == State.CLOSE_PENDING) {
-                state = State.CLOSED;
-                return true;
-            } else if (localState != State.CLOSED) {
-                throw fail(localState.toString());
-            }
-            return false;
-        });
-        if (doClose) {
-            doClose(operationContext);
-        }
-    }
-
-    /**
-     * Thread-safe.
-     */
-    void close(final OperationContext operationContext) {
-        boolean doClose = withLock(lock, () -> {
-            State localState = state;
-            if (localState.isOperationInProgress()) {
-                state = State.CLOSE_PENDING;
-            } else if (localState != State.CLOSED) {
-                state = State.CLOSED;
-                return true;
-            }
-            return false;
-        });
-        if (doClose) {
-            doClose(operationContext);
-        }
-    }
-
-    //    /**
-//     * This method is never executed concurrently with either itself or other operations
-//     * demarcated by {@link #tryStartOperation()}/{@link #endOperation()}.
-//     */
-    abstract void doClose(OperationContext operationContext);
-
-    void onCorruptedConnection(@Nullable final C corruptedConnection, final MongoSocketException e) {
-        // if `pinnedConnection` is corrupted, then we cannot kill `serverCursor` via such a connection
-        C localPinnedConnection = pinnedConnection;
-        if (localPinnedConnection != null) {
-            if (corruptedConnection != localPinnedConnection) {
-                e.addSuppressed(new AssertionError("Corrupted connection does not equal the pinned connection."));
-            }
-            skipReleasingServerResourcesOnClose = true;
-        }
-    }
-
-    /**
-     * Thread-safe.
-     */
-    @Nullable
-    final ServerCursor getServerCursor() {
-        return serverCursor;
-    }
-
-    void setServerCursor(@Nullable final ServerCursor serverCursor) {
-        assertTrue(state.isOperationInProgress());
-        assertNotNull(this.serverCursor);
-        // without `connectionSource` we will not be able to kill `serverCursor` later
-        assertNotNull(connectionSource);
-        this.serverCursor = serverCursor;
-        if (serverCursor == null) {
-            releaseClientResources();
-        }
-    }
-
-    void unsetServerCursor() {
-        this.serverCursor = null;
-    }
-
-    void releaseClientResources() {
-        assertNull(serverCursor);
-        CS localConnectionSource = connectionSource;
-        if (localConnectionSource != null) {
-            localConnectionSource.release();
-            connectionSource = null;
-        }
-        C localPinnedConnection = pinnedConnection;
-        if (localPinnedConnection != null) {
-            localPinnedConnection.release();
-            pinnedConnection = null;
-        }
-    }
-
-    enum State {
-        IDLE(true, false),
-        OPERATION_IN_PROGRESS(true, true),
-        /**
-         * Implies {@link #OPERATION_IN_PROGRESS}.
-         */
-        CLOSE_PENDING(false, true),
-        CLOSED(false, false);
-
-        private final boolean operable;
-        private final boolean operationInProgress;
-
-        State(final boolean operable, final boolean operationInProgress) {
-            this.operable = operable;
-            this.operationInProgress = operationInProgress;
-        }
-
-        boolean operable() {
-            return operable;
-        }
-
-        boolean isOperationInProgress() {
-            return operationInProgress;
-        }
-    }
-}
-
diff --git a/driver-core/src/test/unit/com/mongodb/internal/operation/CursorResourceManagerTest.java b/driver-core/src/test/unit/com/mongodb/internal/operation/CursorResourceManagerTest.java
index 15a8bd972f1..68b3bf7f606 100644
--- a/driver-core/src/test/unit/com/mongodb/internal/operation/CursorResourceManagerTest.java
+++ b/driver-core/src/test/unit/com/mongodb/internal/operation/CursorResourceManagerTest.java
@@ -20,9 +20,11 @@
 import com.mongodb.internal.binding.AsyncConnectionSource;
 import com.mongodb.internal.binding.ReferenceCounted;
 import com.mongodb.internal.connection.Connection;
+import com.mongodb.internal.connection.OperationContext;
 import com.mongodb.internal.mockito.MongoMockito;
 import org.junit.jupiter.api.Test;
 
+import static com.mongodb.ClusterFixture.OPERATION_CONTEXT;
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.mockito.Mockito.when;
 
@@ -42,18 +44,18 @@ void markAsPinned(final ReferenceCounted connectionToPin, final Connection.Pinni
             }
 
             @Override
-            void doClose() {
+            void doClose(final OperationContext operationContext) {
             }
         };
         cursorResourceManager.tryStartOperation();
         try {
             assertDoesNotThrow(() -> {
-                cursorResourceManager.close();
-                cursorResourceManager.close();
+                cursorResourceManager.close(OPERATION_CONTEXT);
+                cursorResourceManager.close(OPERATION_CONTEXT);
                 cursorResourceManager.setServerCursor(null);
             });
         } finally {
-            cursorResourceManager.endOperation();
+            cursorResourceManager.endOperation(OPERATION_CONTEXT);
         }
     }
 }

From c21a67ff282b1325fc69d67f72424224be64a134 Mon Sep 17 00:00:00 2001
From: "slav.babanin" 
Date: Wed, 13 Aug 2025 12:19:32 -0700
Subject: [PATCH 17/36] Remove comments.

---
 .../src/main/com/mongodb/LegacyMixedBulkWriteOperation.java    | 2 +-
 .../reactivestreams/client/internal/ClientSessionBinding.java  | 3 ---
 .../client/internal/ClientSessionBindingSpecification.groovy   | 2 --
 .../main/com/mongodb/client/internal/ClientSessionBinding.java | 3 ---
 .../client/AbstractClientSideOperationsTimeoutProseTest.java   | 2 --
 5 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/driver-legacy/src/main/com/mongodb/LegacyMixedBulkWriteOperation.java b/driver-legacy/src/main/com/mongodb/LegacyMixedBulkWriteOperation.java
index 3c4be0dcc78..d28555992da 100644
--- a/driver-legacy/src/main/com/mongodb/LegacyMixedBulkWriteOperation.java
+++ b/driver-legacy/src/main/com/mongodb/LegacyMixedBulkWriteOperation.java
@@ -113,7 +113,7 @@ public WriteConcernResult execute(final WriteBinding binding, final OperationCon
     }
 
     @Override
-    public void executeAsync(final AsyncWriteBinding binding,final OperationContext operationContext, final SingleResultCallback callback) {
+    public void executeAsync(final AsyncWriteBinding binding, final OperationContext operationContext, final SingleResultCallback callback) {
         throw new UnsupportedOperationException("This operation is sync only");
     }
 
diff --git a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/ClientSessionBinding.java b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/ClientSessionBinding.java
index 55357244fae..a838e7e03bd 100644
--- a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/ClientSessionBinding.java
+++ b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/ClientSessionBinding.java
@@ -242,9 +242,6 @@ public ReadConcern getReadConcern() {
             } else if (isSnapshot()) {
                 return ReadConcern.SNAPSHOT;
             } else {
-                //COMMENT the read concern was specified on wrapped BindingContext was the one that was inherited from either MongoCollection, MongoDatabase, etc.
-                // since we removed the BindingContext, we can now embedd the parent read concern directly.
-                //return wrapped.getOperationContext().getSessionContext().getReadConcern();
                 return inheritedReadConcern;
             }
         }
diff --git a/driver-reactive-streams/src/test/unit/com/mongodb/reactivestreams/client/internal/ClientSessionBindingSpecification.groovy b/driver-reactive-streams/src/test/unit/com/mongodb/reactivestreams/client/internal/ClientSessionBindingSpecification.groovy
index ad4356caa63..dd3b4b29f08 100644
--- a/driver-reactive-streams/src/test/unit/com/mongodb/reactivestreams/client/internal/ClientSessionBindingSpecification.groovy
+++ b/driver-reactive-streams/src/test/unit/com/mongodb/reactivestreams/client/internal/ClientSessionBindingSpecification.groovy
@@ -16,7 +16,6 @@
 
 package com.mongodb.reactivestreams.client.internal
 
-
 import com.mongodb.ReadPreference
 import com.mongodb.ServerAddress
 import com.mongodb.async.FutureResultCallback
@@ -29,7 +28,6 @@ import com.mongodb.internal.binding.AsyncConnectionSource
 import com.mongodb.internal.connection.Cluster
 import com.mongodb.internal.connection.Server
 import com.mongodb.internal.connection.ServerTuple
-import com.mongodb.internal.session.ClientSessionContext
 import com.mongodb.reactivestreams.client.ClientSession
 import spock.lang.Specification
 
diff --git a/driver-sync/src/main/com/mongodb/client/internal/ClientSessionBinding.java b/driver-sync/src/main/com/mongodb/client/internal/ClientSessionBinding.java
index 48694bef74d..6c6f8b6ced9 100644
--- a/driver-sync/src/main/com/mongodb/client/internal/ClientSessionBinding.java
+++ b/driver-sync/src/main/com/mongodb/client/internal/ClientSessionBinding.java
@@ -223,9 +223,6 @@ public ReadConcern getReadConcern() {
             } else if (isSnapshot()) {
                 return ReadConcern.SNAPSHOT;
             } else {
-                //COMMENT the read concern was specified on wrapped BindingContext was the one that was inherited from either MongoCollection, MongoDatabase, etc.
-                // since we removed the BindingContext, we can now embedd the parent read concern directly.
-                //return wrapped.getOperationContext().getSessionContext().getReadConcern();
                 return inheritedReadConcern;
             }
         }
diff --git a/driver-sync/src/test/functional/com/mongodb/client/AbstractClientSideOperationsTimeoutProseTest.java b/driver-sync/src/test/functional/com/mongodb/client/AbstractClientSideOperationsTimeoutProseTest.java
index 9d5366ba71b..be7d2ace939 100644
--- a/driver-sync/src/test/functional/com/mongodb/client/AbstractClientSideOperationsTimeoutProseTest.java
+++ b/driver-sync/src/test/functional/com/mongodb/client/AbstractClientSideOperationsTimeoutProseTest.java
@@ -40,7 +40,6 @@
 import com.mongodb.client.model.changestream.ChangeStreamDocument;
 import com.mongodb.client.model.changestream.FullDocument;
 import com.mongodb.client.test.CollectionHelper;
-import com.mongodb.connection.NettyTransportSettings;
 import com.mongodb.event.CommandEvent;
 import com.mongodb.event.CommandFailedEvent;
 import com.mongodb.event.CommandStartedEvent;
@@ -52,7 +51,6 @@
 import com.mongodb.internal.connection.TestCommandListener;
 import com.mongodb.internal.connection.TestConnectionPoolListener;
 import com.mongodb.test.FlakyTest;
-import io.netty.buffer.PooledByteBufAllocator;
 import org.bson.BsonArray;
 import org.bson.BsonBoolean;
 import org.bson.BsonDocument;

From 863293f9511df24f0e3a7486da9b24d4437c09d4 Mon Sep 17 00:00:00 2001
From: "slav.babanin" 
Date: Wed, 13 Aug 2025 12:26:59 -0700
Subject: [PATCH 18/36] Rename methods.

---
 driver-core/src/main/com/mongodb/internal/TimeoutContext.java | 4 ++--
 .../internal/operation/CommitTransactionOperation.java        | 4 ++--
 .../mongodb/internal/operation/ExplainCommandOperation.java   | 4 ++--
 .../main/com/mongodb/internal/operation/FindOperation.java    | 4 ++--
 .../main/com/mongodb/internal/operation/OperationHelper.java  | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/driver-core/src/main/com/mongodb/internal/TimeoutContext.java b/driver-core/src/main/com/mongodb/internal/TimeoutContext.java
index 61aee91baab..0daf890079e 100644
--- a/driver-core/src/main/com/mongodb/internal/TimeoutContext.java
+++ b/driver-core/src/main/com/mongodb/internal/TimeoutContext.java
@@ -275,7 +275,7 @@ public TimeoutContext withDefaultMaxTime() {
      * Disable the maxTimeMS override. This way the maxTimeMS will not
      * be appended to the command in the {@link CommandMessage}.
      */
-    public TimeoutContext withDisabledMaxTimeOverride() {
+    public TimeoutContext withDisabledMaxTime() {
         return new TimeoutContext(
                 isMaintenanceContext,
                 minRoundTripTimeMS,
@@ -288,7 +288,7 @@ public TimeoutContext withDisabledMaxTimeOverride() {
      * The override will be provided as the remaining value in
      * {@link #runMaxTimeMS}, where 0 is ignored.
      */
-    public TimeoutContext withMaxTimeOverrideAsMaxCommitTime() {
+    public TimeoutContext withMaxTimeAsMaxCommitTime() {
         return new TimeoutContext(
                 isMaintenanceContext,
                 minRoundTripTimeMS,
diff --git a/driver-core/src/main/com/mongodb/internal/operation/CommitTransactionOperation.java b/driver-core/src/main/com/mongodb/internal/operation/CommitTransactionOperation.java
index 06137d4ed57..28715fddfad 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/CommitTransactionOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/CommitTransactionOperation.java
@@ -70,7 +70,7 @@ public Void execute(final WriteBinding binding, final OperationContext operation
         try {
             return super.execute(
                     binding,
-                    operationContext.withOverride(TimeoutContext::withMaxTimeOverrideAsMaxCommitTime));
+                    operationContext.withOverride(TimeoutContext::withMaxTimeAsMaxCommitTime));
         } catch (MongoException e) {
             addErrorLabels(e);
             throw e;
@@ -81,7 +81,7 @@ public Void execute(final WriteBinding binding, final OperationContext operation
     public void executeAsync(final AsyncWriteBinding binding, final OperationContext operationContext, final SingleResultCallback callback) {
         super.executeAsync(
                 binding,
-                operationContext.withOverride(TimeoutContext::withMaxTimeOverrideAsMaxCommitTime),
+                operationContext.withOverride(TimeoutContext::withMaxTimeAsMaxCommitTime),
                 (result, t) -> {
              if (t instanceof MongoException) {
                  addErrorLabels((MongoException) t);
diff --git a/driver-core/src/main/com/mongodb/internal/operation/ExplainCommandOperation.java b/driver-core/src/main/com/mongodb/internal/operation/ExplainCommandOperation.java
index f03f278dde2..b6baccd25ef 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/ExplainCommandOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/ExplainCommandOperation.java
@@ -42,7 +42,7 @@ public ExplainCommandOperation(final String databaseName, final String commandNa
     public T execute(final ReadBinding binding, final OperationContext operationContext) {
         return super.execute(binding, operationContext.withOverride(timeoutContext -> {
             if (!timeoutContext.hasTimeoutMS()) {
-                return timeoutContext.withDisabledMaxTimeOverride();
+                return timeoutContext.withDisabledMaxTime();
             }
 
             return timeoutContext;
@@ -54,7 +54,7 @@ public void executeAsync(final AsyncReadBinding binding, final OperationContext
                              final SingleResultCallback callback) {
         super.executeAsync(binding, operationContext.withOverride(timeoutContext -> {
             if (!timeoutContext.hasTimeoutMS()) {
-                return timeoutContext.withDisabledMaxTimeOverride();
+                return timeoutContext.withDisabledMaxTime();
             }
 
             return timeoutContext;
diff --git a/driver-core/src/main/com/mongodb/internal/operation/FindOperation.java b/driver-core/src/main/com/mongodb/internal/operation/FindOperation.java
index cd340be23d2..3db5590df2c 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/FindOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/FindOperation.java
@@ -299,7 +299,7 @@ public BatchCursor execute(final ReadBinding binding, final OperationContext
 
         OperationContext findOperationContext;
         if (shouldDisableMaxTimeMS()) {
-            findOperationContext = operationContext.withOverride(TimeoutContext::withDisabledMaxTimeOverride);
+            findOperationContext = operationContext.withOverride(TimeoutContext::withDisabledMaxTime);
         } else {
             findOperationContext = operationContext;
         }
@@ -335,7 +335,7 @@ public void executeAsync(final AsyncReadBinding binding, final OperationContext
 
         OperationContext findOperationContext;
         if (shouldDisableMaxTimeMS()) {
-            findOperationContext = operationContext.withOverride(TimeoutContext::withDisabledMaxTimeOverride);
+            findOperationContext = operationContext.withOverride(TimeoutContext::withDisabledMaxTime);
         } else {
             findOperationContext = operationContext;
         }
diff --git a/driver-core/src/main/com/mongodb/internal/operation/OperationHelper.java b/driver-core/src/main/com/mongodb/internal/operation/OperationHelper.java
index 03d03817a6b..9918c57b3fc 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/OperationHelper.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/OperationHelper.java
@@ -196,7 +196,7 @@ static boolean canRetryRead(final ServerDescription serverDescription, final Ope
     static OperationContext applyTimeoutModeToOperationContext(final TimeoutMode timeoutMode,
                                                                final OperationContext operationContext) {
         if (timeoutMode == TimeoutMode.ITERATION) {
-            return operationContext.withOverride(TimeoutContext::withDisabledMaxTimeOverride);
+            return operationContext.withOverride(TimeoutContext::withDisabledMaxTime);
         }
         return operationContext;
     }

From 6059fc435f7c78bbf9dc20d269d7da3b21bd2ece Mon Sep 17 00:00:00 2001
From: "slav.babanin" 
Date: Thu, 14 Aug 2025 17:16:38 -0700
Subject: [PATCH 19/36] Add support for awaiting CommandStartedEvent in Unified
 Test Runner.

JAVA-5640
---
 .../connection/TestCommandListener.java       | 45 ++++++++++++-------
 .../client/unified/ContextElement.java        |  4 ++
 .../mongodb/client/unified/EventMatcher.java  | 21 +++++++++
 .../mongodb/client/unified/UnifiedTest.java   |  3 ++
 .../unified/UnifiedTestModifications.java     |  4 --
 5 files changed, 57 insertions(+), 20 deletions(-)

diff --git a/driver-core/src/test/functional/com/mongodb/internal/connection/TestCommandListener.java b/driver-core/src/test/functional/com/mongodb/internal/connection/TestCommandListener.java
index 704dea56f44..9381ad842a1 100644
--- a/driver-core/src/test/functional/com/mongodb/internal/connection/TestCommandListener.java
+++ b/driver-core/src/test/functional/com/mongodb/internal/connection/TestCommandListener.java
@@ -40,6 +40,7 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
@@ -63,6 +64,7 @@ public class TestCommandListener implements CommandListener {
     private final TestListener listener;
     private final Lock lock = new ReentrantLock();
     private final Condition commandCompletedCondition = lock.newCondition();
+    private final Condition commandAnyEventCondition = lock.newCondition();
     private final boolean observeSensitiveCommands;
     private boolean ignoreNextSucceededOrFailedEvent;
     private static final CodecRegistry CODEC_REGISTRY_HACK;
@@ -223,22 +225,12 @@ private  List getEvents(final Class type,
         }
     }
 
-    public List waitForStartedEvents(final int numEvents) {
-        lock.lock();
-        try {
-            while (!hasCompletedEvents(numEvents)) {
-                try {
-                    if (!commandCompletedCondition.await(TIMEOUT, TimeUnit.SECONDS)) {
-                        throw new MongoTimeoutException("Timeout waiting for event");
-                    }
-                } catch (InterruptedException e) {
-                    throw interruptAndCreateMongoInterruptedException("Interrupted waiting for event", e);
-                }
-            }
-            return getEvents(CommandStartedEvent.class, numEvents);
-        } finally {
-            lock.unlock();
-        }
+    private  long getEventCount(final Class eventClass, final Predicate matcher) {
+        return getEvents().stream()
+                .filter(eventClass::isInstance)
+                .map(eventClass::cast)
+                .filter(matcher)
+                .count();
     }
 
     public void waitForFirstCommandCompletion() {
@@ -287,6 +279,7 @@ else if (!observeSensitiveCommands) {
             addEvent(new CommandStartedEvent(event.getRequestContext(), event.getOperationId(), event.getRequestId(),
                     event.getConnectionDescription(), event.getDatabaseName(), event.getCommandName(),
                     event.getCommand() == null ? null : getWritableClone(event.getCommand())));
+            commandAnyEventCondition.signal();
         } finally {
             lock.unlock();
         }
@@ -312,6 +305,7 @@ else if (!observeSensitiveCommands) {
                     event.getResponse() == null ? null : event.getResponse().clone(),
                     event.getElapsedTime(TimeUnit.NANOSECONDS)));
             commandCompletedCondition.signal();
+            commandAnyEventCondition.signal();
         } finally {
             lock.unlock();
         }
@@ -334,6 +328,7 @@ else if (!observeSensitiveCommands) {
         try {
             addEvent(event);
             commandCompletedCondition.signal();
+            commandAnyEventCondition.signal();
         } finally {
             lock.unlock();
         }
@@ -428,4 +423,22 @@ private void assertEquivalence(final CommandStartedEvent actual, final CommandSt
         assertEquals(expected.getDatabaseName(), actual.getDatabaseName());
         assertEquals(expected.getCommand(), actual.getCommand());
     }
+
+    public  void waitForEvents(final Class eventClass, final Predicate matcher, final int count)
+            throws TimeoutException {
+        lock.lock();
+        try {
+            while (getEventCount(eventClass, matcher) < count) {
+                try {
+                    if (!commandAnyEventCondition.await(TIMEOUT, TimeUnit.SECONDS)) {
+                        throw new MongoTimeoutException("Timeout waiting for command event");
+                    }
+                } catch (InterruptedException e) {
+                    throw interruptAndCreateMongoInterruptedException("Interrupted waiting for event", e);
+                }
+            }
+        } finally {
+            lock.unlock();
+        }
+    }
 }
diff --git a/driver-sync/src/test/functional/com/mongodb/client/unified/ContextElement.java b/driver-sync/src/test/functional/com/mongodb/client/unified/ContextElement.java
index e81ebc025df..7e6e86fb01c 100644
--- a/driver-sync/src/test/functional/com/mongodb/client/unified/ContextElement.java
+++ b/driver-sync/src/test/functional/com/mongodb/client/unified/ContextElement.java
@@ -146,6 +146,10 @@ public String toString() {
         };
     }
 
+    public static ContextElement ofWaitForCommandEvents(final String client, final BsonDocument commandEvent, final int count) {
+        return new EventCountContext("Wait For Command Events", client, commandEvent, count);
+    }
+
     public static ContextElement ofTopologyEvents(final String client, final BsonArray expectedEvents,
             final List actualEvents) {
         return new ContextElement() {
diff --git a/driver-sync/src/test/functional/com/mongodb/client/unified/EventMatcher.java b/driver-sync/src/test/functional/com/mongodb/client/unified/EventMatcher.java
index 61a418ad3a9..c97c957eac7 100644
--- a/driver-sync/src/test/functional/com/mongodb/client/unified/EventMatcher.java
+++ b/driver-sync/src/test/functional/com/mongodb/client/unified/EventMatcher.java
@@ -37,6 +37,7 @@
 import com.mongodb.event.ServerHeartbeatSucceededEvent;
 import com.mongodb.event.TestServerMonitorListener;
 import com.mongodb.internal.connection.TestClusterListener;
+import com.mongodb.internal.connection.TestCommandListener;
 import com.mongodb.internal.connection.TestConnectionPoolListener;
 import com.mongodb.internal.connection.TestServerListener;
 import com.mongodb.lang.NonNull;
@@ -223,6 +224,26 @@ public void waitForConnectionPoolEvents(final String client, final BsonDocument
         }
     }
 
+    public void waitForCommandEvents(final String clientId, final BsonDocument expectedCommandEvent, int count,
+                                     final TestCommandListener clientCommandListener) {
+        context.push(ContextElement.ofWaitForCommandEvents(clientId, expectedCommandEvent, count));
+        try {
+            switch (expectedCommandEvent.getFirstKey()) {
+                case "commandStartedEvent":
+                    BsonDocument properties = expectedCommandEvent.getDocument(expectedCommandEvent.getFirstKey());
+                    String commandName = properties.getString("commandName").getValue();
+                    clientCommandListener.waitForEvents(CommandStartedEvent.class, commandStartedEvent ->
+                            commandName.equals(commandStartedEvent.getCommandName()), count);
+                    break;
+                default:
+                    throw new UnsupportedOperationException("Unsupported event: " + expectedCommandEvent.getFirstKey());
+            }
+            context.pop();
+        } catch (TimeoutException e) {
+            fail(context.getMessage("Timed out waiting for connection pool events"));
+        }
+    }
+
     public void assertConnectionPoolEventCount(final String client, final BsonDocument event, final int count, final List events) {
         context.push(ContextElement.ofConnectionPoolEventCount(client, event, count));
         Class eventClass;
diff --git a/driver-sync/src/test/functional/com/mongodb/client/unified/UnifiedTest.java b/driver-sync/src/test/functional/com/mongodb/client/unified/UnifiedTest.java
index 3364cf4183d..b977c80be49 100644
--- a/driver-sync/src/test/functional/com/mongodb/client/unified/UnifiedTest.java
+++ b/driver-sync/src/test/functional/com/mongodb/client/unified/UnifiedTest.java
@@ -779,6 +779,9 @@ private OperationResult executeWaitForEvent(final UnifiedTestContext context, fi
                 context.getEventMatcher().waitForServerMonitorEvents(clientId, TestServerMonitorListener.eventType(eventName), event, count,
                         entities.getServerMonitorListener(clientId));
                 break;
+            case "commandStartedEvent":
+                context.getEventMatcher().waitForCommandEvents(clientId, event, count, entities.getClientCommandListener(clientId));
+                break;
             default:
                 throw new UnsupportedOperationException("Unsupported event: " + eventName);
         }
diff --git a/driver-sync/src/test/functional/com/mongodb/client/unified/UnifiedTestModifications.java b/driver-sync/src/test/functional/com/mongodb/client/unified/UnifiedTestModifications.java
index f658b7c5e01..60bda7062b4 100644
--- a/driver-sync/src/test/functional/com/mongodb/client/unified/UnifiedTestModifications.java
+++ b/driver-sync/src/test/functional/com/mongodb/client/unified/UnifiedTestModifications.java
@@ -76,10 +76,6 @@ public static void applyCustomizations(final TestDef def) {
                 .test("client-side-operations-timeout", "timeoutMS behaves correctly for GridFS download operations",
                       "timeoutMS applied to entire download, not individual parts");
 
-        def.skipJira("https://jira.mongodb.org/browse/JAVA-5815")
-                .test("client-side-operations-timeout", "WaitQueueTimeoutError does not clear the pool",
-                        "WaitQueueTimeoutError does not clear the pool");
-
         // TODO-JAVA-5712
 
         // collection-management

From 53c339fb1e70177c4a2290153b4d793b74108dd4 Mon Sep 17 00:00:00 2001
From: "slav.babanin" 
Date: Thu, 14 Aug 2025 17:19:33 -0700
Subject: [PATCH 20/36] Revert "Add support for awaiting CommandStartedEvent in
 Unified Test Runner."

This reverts commit 6059fc435f7c78bbf9dc20d269d7da3b21bd2ece.
---
 .../connection/TestCommandListener.java       | 45 +++++++------------
 .../client/unified/ContextElement.java        |  4 --
 .../mongodb/client/unified/EventMatcher.java  | 21 ---------
 .../mongodb/client/unified/UnifiedTest.java   |  3 --
 .../unified/UnifiedTestModifications.java     |  4 ++
 5 files changed, 20 insertions(+), 57 deletions(-)

diff --git a/driver-core/src/test/functional/com/mongodb/internal/connection/TestCommandListener.java b/driver-core/src/test/functional/com/mongodb/internal/connection/TestCommandListener.java
index 9381ad842a1..704dea56f44 100644
--- a/driver-core/src/test/functional/com/mongodb/internal/connection/TestCommandListener.java
+++ b/driver-core/src/test/functional/com/mongodb/internal/connection/TestCommandListener.java
@@ -40,7 +40,6 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
 import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
@@ -64,7 +63,6 @@ public class TestCommandListener implements CommandListener {
     private final TestListener listener;
     private final Lock lock = new ReentrantLock();
     private final Condition commandCompletedCondition = lock.newCondition();
-    private final Condition commandAnyEventCondition = lock.newCondition();
     private final boolean observeSensitiveCommands;
     private boolean ignoreNextSucceededOrFailedEvent;
     private static final CodecRegistry CODEC_REGISTRY_HACK;
@@ -225,12 +223,22 @@ private  List getEvents(final Class type,
         }
     }
 
-    private  long getEventCount(final Class eventClass, final Predicate matcher) {
-        return getEvents().stream()
-                .filter(eventClass::isInstance)
-                .map(eventClass::cast)
-                .filter(matcher)
-                .count();
+    public List waitForStartedEvents(final int numEvents) {
+        lock.lock();
+        try {
+            while (!hasCompletedEvents(numEvents)) {
+                try {
+                    if (!commandCompletedCondition.await(TIMEOUT, TimeUnit.SECONDS)) {
+                        throw new MongoTimeoutException("Timeout waiting for event");
+                    }
+                } catch (InterruptedException e) {
+                    throw interruptAndCreateMongoInterruptedException("Interrupted waiting for event", e);
+                }
+            }
+            return getEvents(CommandStartedEvent.class, numEvents);
+        } finally {
+            lock.unlock();
+        }
     }
 
     public void waitForFirstCommandCompletion() {
@@ -279,7 +287,6 @@ else if (!observeSensitiveCommands) {
             addEvent(new CommandStartedEvent(event.getRequestContext(), event.getOperationId(), event.getRequestId(),
                     event.getConnectionDescription(), event.getDatabaseName(), event.getCommandName(),
                     event.getCommand() == null ? null : getWritableClone(event.getCommand())));
-            commandAnyEventCondition.signal();
         } finally {
             lock.unlock();
         }
@@ -305,7 +312,6 @@ else if (!observeSensitiveCommands) {
                     event.getResponse() == null ? null : event.getResponse().clone(),
                     event.getElapsedTime(TimeUnit.NANOSECONDS)));
             commandCompletedCondition.signal();
-            commandAnyEventCondition.signal();
         } finally {
             lock.unlock();
         }
@@ -328,7 +334,6 @@ else if (!observeSensitiveCommands) {
         try {
             addEvent(event);
             commandCompletedCondition.signal();
-            commandAnyEventCondition.signal();
         } finally {
             lock.unlock();
         }
@@ -423,22 +428,4 @@ private void assertEquivalence(final CommandStartedEvent actual, final CommandSt
         assertEquals(expected.getDatabaseName(), actual.getDatabaseName());
         assertEquals(expected.getCommand(), actual.getCommand());
     }
-
-    public  void waitForEvents(final Class eventClass, final Predicate matcher, final int count)
-            throws TimeoutException {
-        lock.lock();
-        try {
-            while (getEventCount(eventClass, matcher) < count) {
-                try {
-                    if (!commandAnyEventCondition.await(TIMEOUT, TimeUnit.SECONDS)) {
-                        throw new MongoTimeoutException("Timeout waiting for command event");
-                    }
-                } catch (InterruptedException e) {
-                    throw interruptAndCreateMongoInterruptedException("Interrupted waiting for event", e);
-                }
-            }
-        } finally {
-            lock.unlock();
-        }
-    }
 }
diff --git a/driver-sync/src/test/functional/com/mongodb/client/unified/ContextElement.java b/driver-sync/src/test/functional/com/mongodb/client/unified/ContextElement.java
index 7e6e86fb01c..e81ebc025df 100644
--- a/driver-sync/src/test/functional/com/mongodb/client/unified/ContextElement.java
+++ b/driver-sync/src/test/functional/com/mongodb/client/unified/ContextElement.java
@@ -146,10 +146,6 @@ public String toString() {
         };
     }
 
-    public static ContextElement ofWaitForCommandEvents(final String client, final BsonDocument commandEvent, final int count) {
-        return new EventCountContext("Wait For Command Events", client, commandEvent, count);
-    }
-
     public static ContextElement ofTopologyEvents(final String client, final BsonArray expectedEvents,
             final List actualEvents) {
         return new ContextElement() {
diff --git a/driver-sync/src/test/functional/com/mongodb/client/unified/EventMatcher.java b/driver-sync/src/test/functional/com/mongodb/client/unified/EventMatcher.java
index c97c957eac7..61a418ad3a9 100644
--- a/driver-sync/src/test/functional/com/mongodb/client/unified/EventMatcher.java
+++ b/driver-sync/src/test/functional/com/mongodb/client/unified/EventMatcher.java
@@ -37,7 +37,6 @@
 import com.mongodb.event.ServerHeartbeatSucceededEvent;
 import com.mongodb.event.TestServerMonitorListener;
 import com.mongodb.internal.connection.TestClusterListener;
-import com.mongodb.internal.connection.TestCommandListener;
 import com.mongodb.internal.connection.TestConnectionPoolListener;
 import com.mongodb.internal.connection.TestServerListener;
 import com.mongodb.lang.NonNull;
@@ -224,26 +223,6 @@ public void waitForConnectionPoolEvents(final String client, final BsonDocument
         }
     }
 
-    public void waitForCommandEvents(final String clientId, final BsonDocument expectedCommandEvent, int count,
-                                     final TestCommandListener clientCommandListener) {
-        context.push(ContextElement.ofWaitForCommandEvents(clientId, expectedCommandEvent, count));
-        try {
-            switch (expectedCommandEvent.getFirstKey()) {
-                case "commandStartedEvent":
-                    BsonDocument properties = expectedCommandEvent.getDocument(expectedCommandEvent.getFirstKey());
-                    String commandName = properties.getString("commandName").getValue();
-                    clientCommandListener.waitForEvents(CommandStartedEvent.class, commandStartedEvent ->
-                            commandName.equals(commandStartedEvent.getCommandName()), count);
-                    break;
-                default:
-                    throw new UnsupportedOperationException("Unsupported event: " + expectedCommandEvent.getFirstKey());
-            }
-            context.pop();
-        } catch (TimeoutException e) {
-            fail(context.getMessage("Timed out waiting for connection pool events"));
-        }
-    }
-
     public void assertConnectionPoolEventCount(final String client, final BsonDocument event, final int count, final List events) {
         context.push(ContextElement.ofConnectionPoolEventCount(client, event, count));
         Class eventClass;
diff --git a/driver-sync/src/test/functional/com/mongodb/client/unified/UnifiedTest.java b/driver-sync/src/test/functional/com/mongodb/client/unified/UnifiedTest.java
index b977c80be49..3364cf4183d 100644
--- a/driver-sync/src/test/functional/com/mongodb/client/unified/UnifiedTest.java
+++ b/driver-sync/src/test/functional/com/mongodb/client/unified/UnifiedTest.java
@@ -779,9 +779,6 @@ private OperationResult executeWaitForEvent(final UnifiedTestContext context, fi
                 context.getEventMatcher().waitForServerMonitorEvents(clientId, TestServerMonitorListener.eventType(eventName), event, count,
                         entities.getServerMonitorListener(clientId));
                 break;
-            case "commandStartedEvent":
-                context.getEventMatcher().waitForCommandEvents(clientId, event, count, entities.getClientCommandListener(clientId));
-                break;
             default:
                 throw new UnsupportedOperationException("Unsupported event: " + eventName);
         }
diff --git a/driver-sync/src/test/functional/com/mongodb/client/unified/UnifiedTestModifications.java b/driver-sync/src/test/functional/com/mongodb/client/unified/UnifiedTestModifications.java
index 60bda7062b4..f658b7c5e01 100644
--- a/driver-sync/src/test/functional/com/mongodb/client/unified/UnifiedTestModifications.java
+++ b/driver-sync/src/test/functional/com/mongodb/client/unified/UnifiedTestModifications.java
@@ -76,6 +76,10 @@ public static void applyCustomizations(final TestDef def) {
                 .test("client-side-operations-timeout", "timeoutMS behaves correctly for GridFS download operations",
                       "timeoutMS applied to entire download, not individual parts");
 
+        def.skipJira("https://jira.mongodb.org/browse/JAVA-5815")
+                .test("client-side-operations-timeout", "WaitQueueTimeoutError does not clear the pool",
+                        "WaitQueueTimeoutError does not clear the pool");
+
         // TODO-JAVA-5712
 
         // collection-management

From e52aa5e3588cba204d53d17023985b1c59bdd7ca Mon Sep 17 00:00:00 2001
From: Viacheslav Babanin 
Date: Fri, 5 Sep 2025 20:27:22 -0700
Subject: [PATCH 21/36] Update
 driver-core/src/main/com/mongodb/internal/connection/OperationContext.java

Co-authored-by: Ross Lawley 
---
 .../com/mongodb/internal/connection/OperationContext.java  | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/driver-core/src/main/com/mongodb/internal/connection/OperationContext.java b/driver-core/src/main/com/mongodb/internal/connection/OperationContext.java
index 17e7de605a4..3338604e79c 100644
--- a/driver-core/src/main/com/mongodb/internal/connection/OperationContext.java
+++ b/driver-core/src/main/com/mongodb/internal/connection/OperationContext.java
@@ -163,16 +163,15 @@ public ServerDeprioritization getServerDeprioritization() {
     }
 
     public OperationContext withNewlyStartedTimeout() {
-        TimeoutContext tc = this.timeoutContext.withNewlyStartedTimeout();
-        return this.withTimeoutContext(tc);
+        return withTimeoutContext(timeoutContext.withNewlyStartedTimeout());
     }
 
     public OperationContext withMinRoundTripTime(final ServerDescription serverDescription) {
-        return this.withTimeoutContext(this.timeoutContext.withMinRoundTripTime(TimeUnit.NANOSECONDS.toMillis(serverDescription.getMinRoundTripTimeNanos())));
+        return withTimeoutContext(timeoutContext.withMinRoundTripTime(TimeUnit.NANOSECONDS.toMillis(serverDescription.getMinRoundTripTimeNanos())));
     }
 
     public OperationContext withOverride(final TimeoutContextOverride timeoutContextOverrideFunction) {
-        return this.withTimeoutContext(timeoutContextOverrideFunction.apply(timeoutContext));
+        return withTimeoutContext(timeoutContextOverrideFunction.apply(timeoutContext));
     }
 
     public static final class ServerDeprioritization {

From 7fa7e1f7a19f61675c7796838221f5bb5d7238b7 Mon Sep 17 00:00:00 2001
From: Viacheslav Babanin 
Date: Sun, 7 Sep 2025 13:33:43 -0700
Subject: [PATCH 22/36] Update
 driver-core/src/main/com/mongodb/internal/operation/CommandReadOperation.java

Co-authored-by: Ross Lawley 
---
 .../com/mongodb/internal/operation/CommandReadOperation.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/driver-core/src/main/com/mongodb/internal/operation/CommandReadOperation.java b/driver-core/src/main/com/mongodb/internal/operation/CommandReadOperation.java
index 0a5d7ffadc7..2259849f571 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/CommandReadOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/CommandReadOperation.java
@@ -22,7 +22,7 @@
 import com.mongodb.internal.connection.OperationContext;
 import org.bson.BsonDocument;
 import org.bson.codecs.Decoder;
-import org.jetbrains.annotations.NotNull;
+import com.mongodb.lang.NotNull;
 
 import static com.mongodb.assertions.Assertions.notNull;
 import static com.mongodb.internal.operation.AsyncOperationHelper.CommandReadTransformerAsync;

From 7ed97d8d30ea2e9ce8baa175d4ae29b936be632c Mon Sep 17 00:00:00 2001
From: "slav.babanin" 
Date: Sun, 7 Sep 2025 18:37:25 -0700
Subject: [PATCH 23/36] Rename cursor interfaces. Remove DEBUG level logging.
 Remove redundant methods.

---
 .../internal/binding/AsyncClusterBinding.java |   2 +-
 .../internal/binding/ClusterBinding.java      |   2 +-
 .../connection/SaslAuthenticator.java         |   6 +-
 .../operation/AggregateOperationImpl.java     |   4 +-
 .../AsyncChangeStreamBatchCursor.java         |  35 ++---
 .../operation/AsyncCommandBatchCursor.java    |   6 +-
 ...oreCursor.java => AsyncCommandCursor.java} |   4 +-
 ...{AsyncCoreCursor.java => AsyncCursor.java} |   2 +-
 .../operation/AsyncOperationHelper.java       |  16 +-
 .../operation/ChangeStreamBatchCursor.java    |  39 +++--
 .../operation/ChangeStreamOperation.java      |   4 +-
 .../operation/ClientBulkWriteOperation.java   |   4 +-
 .../operation/CommandBatchCursor.java         |   6 +-
 ...mandCoreCursor.java => CommandCursor.java} |   4 +-
 .../{CoreCursor.java => Cursor.java}          |   2 +-
 .../operation/CursorResourceManager.java      |  20 ++-
 .../internal/operation/FindOperation.java     |  35 ++---
 .../operation/SyncOperationHelper.java        |   2 +-
 ...AsyncCommandBatchCursorFunctionalTest.java |  48 +++---
 .../AsyncCommandBatchCursorTest.java          |   4 +-
 ...rTest.java => AsyncCommandCursorTest.java} |  16 +-
 .../CommandBatchCursorFunctionalTest.java     |  48 +++---
 ...hangeStreamBatchCursorSpecification.groovy |   6 +-
 ...syncCommandBatchCursorSpecification.groovy |  20 +--
 ...hangeStreamBatchCursorSpecification.groovy |   2 +-
 .../ChangeStreamBatchCursorTest.java          | 138 +++++++++---------
 .../CommandBatchCursorSpecification.groovy    |  24 +--
 .../operation/CommandBatchCursorTest.java     |  16 +-
 ...CursorTest.java => CommandCursorTest.java} |  24 +--
 .../internal/MapReducePublisherImpl.java      |   5 -
 .../ReadOperationCursorAsyncOnly.java         |   3 +-
 ...dReadOperationThenCursorReadOperation.java |   5 -
 ...WriteOperationThenCursorReadOperation.java |   5 -
 .../src/test/resources/logback-test.xml       |   2 +-
 .../src/test/resources/logback-test.xml       |   2 +-
 35 files changed, 269 insertions(+), 292 deletions(-)
 rename driver-core/src/main/com/mongodb/internal/operation/{AsyncCommandCoreCursor.java => AsyncCommandCursor.java} (99%)
 rename driver-core/src/main/com/mongodb/internal/operation/{AsyncCoreCursor.java => AsyncCursor.java} (98%)
 rename driver-core/src/main/com/mongodb/internal/operation/{CommandCoreCursor.java => CommandCursor.java} (99%)
 rename driver-core/src/main/com/mongodb/internal/operation/{CoreCursor.java => Cursor.java} (98%)
 rename driver-core/src/test/functional/com/mongodb/internal/operation/{AsyncCommandCoreCursorTest.java => AsyncCommandCursorTest.java} (95%)
 rename driver-core/src/test/unit/com/mongodb/internal/operation/{CommandCoreCursorTest.java => CommandCursorTest.java} (92%)

diff --git a/driver-core/src/main/com/mongodb/internal/binding/AsyncClusterBinding.java b/driver-core/src/main/com/mongodb/internal/binding/AsyncClusterBinding.java
index 295aba948b2..c04cd58dec7 100644
--- a/driver-core/src/main/com/mongodb/internal/binding/AsyncClusterBinding.java
+++ b/driver-core/src/main/com/mongodb/internal/binding/AsyncClusterBinding.java
@@ -148,7 +148,7 @@ public ReadPreference getReadPreference() {
         public void getConnection(final OperationContext operationContext, final SingleResultCallback callback) {
             /*
              The first read in a causally consistent session MUST not send afterClusterTime to the server
-             (because the operationTime has not yet been determined). Therefore, we use ReadConcernAwareNoOpSessionContext to
+             (because the operationTime has not yet been determined). Therefore, we use ReadConcernAwareNoOpSessionContext
              so that we do not advance clusterTime on ClientSession in given operationContext because it might not be yet set.
              */
             ReadConcern readConcern = operationContext.getSessionContext().getReadConcern();
diff --git a/driver-core/src/main/com/mongodb/internal/binding/ClusterBinding.java b/driver-core/src/main/com/mongodb/internal/binding/ClusterBinding.java
index c77f0bf7e13..e6e1804c87f 100644
--- a/driver-core/src/main/com/mongodb/internal/binding/ClusterBinding.java
+++ b/driver-core/src/main/com/mongodb/internal/binding/ClusterBinding.java
@@ -127,7 +127,7 @@ public ReadPreference getReadPreference() {
         public Connection getConnection(final OperationContext operationContext) {
             /*
              The first read in a causally consistent session MUST not send afterClusterTime to the server
-             (because the operationTime has not yet been determined). Therefore, we use ReadConcernAwareNoOpSessionContext to
+             (because the operationTime has not yet been determined). Therefore, we use ReadConcernAwareNoOpSessionContext
              so that we do not advance clusterTime on ClientSession in given operationContext because it might not be yet set.
              */
             ReadConcern readConcern = operationContext.getSessionContext().getReadConcern();
diff --git a/driver-core/src/main/com/mongodb/internal/connection/SaslAuthenticator.java b/driver-core/src/main/com/mongodb/internal/connection/SaslAuthenticator.java
index 3e8c0bf612a..050a4862b17 100644
--- a/driver-core/src/main/com/mongodb/internal/connection/SaslAuthenticator.java
+++ b/driver-core/src/main/com/mongodb/internal/connection/SaslAuthenticator.java
@@ -316,7 +316,7 @@ private final class Continuator implements SingleResultCallback {
         private final SaslClient saslClient;
         private final BsonDocument saslStartDocument;
         private final InternalConnection connection;
-        private OperationContext operationContext;
+        private final OperationContext operationContext;
         private final SingleResultCallback callback;
 
         Continuator(final SaslClient saslClient, final BsonDocument saslStartDocument, final InternalConnection connection,
@@ -340,7 +340,6 @@ public void onResult(@Nullable final BsonDocument result, @Nullable final Throwa
                 verifySaslClientComplete(saslClient, result, callback);
                 disposeOfSaslClient(saslClient);
             } else {
-                operationContext = operationContext.withOverride(TimeoutContext::withNewlyStartedMaintenanceTimeout);
                 continueConversation(result);
             }
         }
@@ -355,7 +354,8 @@ private void continueConversation(final BsonDocument result) {
                     try {
                         sendSaslContinueAsync(saslStartDocument.getInt32("conversationId"),
                                 saslClient.evaluateChallenge((result.getBinary("payload")).getData()), connection,
-                                operationContext, Continuator.this);
+                                operationContext.withOverride(TimeoutContext::withNewlyStartedMaintenanceTimeout),
+                                Continuator.this);
                     } catch (SaslException e) {
                         throw wrapException(e);
                     }
diff --git a/driver-core/src/main/com/mongodb/internal/operation/AggregateOperationImpl.java b/driver-core/src/main/com/mongodb/internal/operation/AggregateOperationImpl.java
index 91cc5581599..2471fdd76e8 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/AggregateOperationImpl.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/AggregateOperationImpl.java
@@ -242,7 +242,7 @@ BsonDocument getCommand(final OperationContext operationContext, final int maxWi
 
     private CommandReadTransformer> transformer() {
         return (result, source, connection, operationContext) ->
-                new CommandBatchCursor<>(getTimeoutMode(), getMaxTimeForCursor(operationContext.getTimeoutContext()), operationContext, new CommandCoreCursor<>(
+                new CommandBatchCursor<>(getTimeoutMode(), getMaxTimeForCursor(operationContext.getTimeoutContext()), operationContext, new CommandCursor<>(
                         result, batchSize != null ? batchSize : 0,
                         decoder, comment, source, connection
                 ));
@@ -251,7 +251,7 @@ private CommandReadTransformer> transformer(
     private CommandReadTransformerAsync> asyncTransformer() {
         return (result, source, connection, operationContext) ->
             new AsyncCommandBatchCursor<>(getTimeoutMode(), getMaxTimeForCursor(operationContext.getTimeoutContext()),
-                    operationContext, new AsyncCommandCoreCursor<>(
+                    operationContext, new AsyncCommandCursor<>(
                     result, batchSize != null ? batchSize : 0, decoder, comment, source, connection
             ));
     }
diff --git a/driver-core/src/main/com/mongodb/internal/operation/AsyncChangeStreamBatchCursor.java b/driver-core/src/main/com/mongodb/internal/operation/AsyncChangeStreamBatchCursor.java
index 82b1906a480..89704035223 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/AsyncChangeStreamBatchCursor.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/AsyncChangeStreamBatchCursor.java
@@ -44,7 +44,7 @@
 
 final class AsyncChangeStreamBatchCursor implements AsyncAggregateResponseBatchCursor {
     private final AsyncReadBinding binding;
-    private OperationContext operationContext;
+    private final OperationContext initialOperationContext;
     private final ChangeStreamOperation changeStreamOperation;
     private final int maxWireVersion;
 
@@ -54,41 +54,41 @@ final class AsyncChangeStreamBatchCursor implements AsyncAggregateResponseBat
      * {@code wrapped} containing {@code null} and {@link #isClosed} being {@code false}.
      * This represents a situation in which the wrapped object was closed by {@code this} but {@code this} remained open.
      */
-    private final AtomicReference> wrapped;
+    private final AtomicReference> wrapped;
     private final AtomicBoolean isClosed;
 
     AsyncChangeStreamBatchCursor(final ChangeStreamOperation changeStreamOperation,
-                                 final AsyncCoreCursor wrapped,
+                                 final AsyncCursor wrapped,
                                  final AsyncReadBinding binding,
-                                 final OperationContext operationContext,
+                                 final OperationContext initialOperationContext,
                                  @Nullable final BsonDocument resumeToken,
                                  final int maxWireVersion) {
         this.changeStreamOperation = changeStreamOperation;
         this.wrapped = new AtomicReference<>(assertNotNull(wrapped));
         this.binding = binding;
         binding.retain();
-        this.operationContext = operationContext.withOverride(TimeoutContext::withMaxTimeAsMaxAwaitTimeOverride);
+        this.initialOperationContext = initialOperationContext.withOverride(TimeoutContext::withMaxTimeAsMaxAwaitTimeOverride);
         this.resumeToken = resumeToken;
         this.maxWireVersion = maxWireVersion;
         isClosed = new AtomicBoolean();
     }
 
     @NonNull
-    AsyncCoreCursor getWrapped() {
+    AsyncCursor getWrapped() {
         return assertNotNull(wrapped.get());
     }
 
     @Override
     public void next(final SingleResultCallback> callback) {
-        OperationContext operationContext = resetTimeout();
-        resumeableOperation(AsyncCoreCursor::next, callback, operationContext, false);
+        OperationContext operationContext = initialOperationContext.withNewlyStartedTimeout();
+        resumeableOperation(AsyncCursor::next, callback, operationContext, false);
     }
 
     @Override
     public void close() {
         if (isClosed.compareAndSet(false, true)) {
             try {
-                nullifyAndCloseWrapped(operationContext.withNewlyStartedTimeout());
+                nullifyAndCloseWrapped(initialOperationContext.withNewlyStartedTimeout());
             } finally {
                 binding.release();
             }
@@ -118,7 +118,7 @@ public boolean isClosed() {
     }
 
     private boolean wrappedClosedItself() {
-        AsyncCoreCursor observedWrapped = wrapped.get();
+        AsyncCursor observedWrapped = wrapped.get();
         return observedWrapped != null && observedWrapped.isClosed();
     }
 
@@ -128,7 +128,7 @@ private boolean wrappedClosedItself() {
      * then it closed itself as opposed to being closed by {@code this}.
      */
     private void nullifyAndCloseWrapped(final OperationContext operationContext) {
-        AsyncCoreCursor observedWrapped = wrapped.getAndSet(null);
+        AsyncCursor observedWrapped = wrapped.getAndSet(null);
         if (observedWrapped != null) {
             observedWrapped.close(operationContext);
         }
@@ -139,7 +139,7 @@ private void nullifyAndCloseWrapped(final OperationContext operationContext) {
      * {@code setWrappedOrCloseIt(AsyncCommandBatchCursor)} is called concurrently with or after (in the happens-before order)
      * the method {@link #close()}.
      */
-    private void setWrappedOrCloseIt(final AsyncCoreCursor newValue, final OperationContext operationContext) {
+    private void setWrappedOrCloseIt(final AsyncCursor newValue, final OperationContext operationContext) {
         if (isClosed()) {
             assertNull(wrapped.get());
             newValue.close(operationContext);
@@ -171,7 +171,7 @@ public int getMaxWireVersion() {
         return maxWireVersion;
     }
 
-    private void cachePostBatchResumeToken(final AsyncCoreCursor cursor) {
+    private void cachePostBatchResumeToken(final AsyncCursor cursor) {
         BsonDocument resumeToken = cursor.getPostBatchResumeToken();
         if (resumeToken != null) {
             this.resumeToken = resumeToken;
@@ -179,7 +179,7 @@ private void cachePostBatchResumeToken(final AsyncCoreCursor cu
     }
 
     private interface AsyncBlock {
-        void apply(AsyncCoreCursor cursor, OperationContext operationContext,
+        void apply(AsyncCursor cursor, OperationContext operationContext,
                    SingleResultCallback> callback);
     }
 
@@ -193,7 +193,7 @@ private void resumeableOperation(final AsyncBlock asyncBlock,
                     tryNext ? "tryNext()" : "next()")));
             return;
         }
-        AsyncCoreCursor wrappedCursor = getWrapped();
+        AsyncCursor wrappedCursor = getWrapped();
         asyncBlock.apply(wrappedCursor, operationContext, (result, t) -> {
             if (t == null) {
                 try {
@@ -250,10 +250,5 @@ private void retryOperation(final AsyncBlock asyncBlock,
             }
         });
     }
-
-    private OperationContext resetTimeout() {
-        operationContext = operationContext.withNewlyStartedTimeout();
-        return operationContext;
-    }
 }
 
diff --git a/driver-core/src/main/com/mongodb/internal/operation/AsyncCommandBatchCursor.java b/driver-core/src/main/com/mongodb/internal/operation/AsyncCommandBatchCursor.java
index 42af8656e2c..f390981694e 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/AsyncCommandBatchCursor.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/AsyncCommandBatchCursor.java
@@ -31,13 +31,13 @@ public class AsyncCommandBatchCursor implements AsyncAggregateResponseBatchCu
     private final TimeoutMode timeoutMode;
     private OperationContext operationContext;
 
-    private AsyncCoreCursor wrapped;
+    private AsyncCursor wrapped;
 
     AsyncCommandBatchCursor(
             final TimeoutMode timeoutMode,
             final long maxTimeMs,
             final OperationContext operationContext,
-            final AsyncCoreCursor wrapped) {
+            final AsyncCursor wrapped) {
         this.operationContext = operationContext.withOverride(timeoutContext ->
                 timeoutContext.withMaxTimeOverride(maxTimeMs));
         this.timeoutMode = timeoutMode;
@@ -102,7 +102,7 @@ private void resetTimeout() {
         }
     }
 
-    AsyncCoreCursor getWrapped() {
+    AsyncCursor getWrapped() {
         return wrapped;
     }
 }
diff --git a/driver-core/src/main/com/mongodb/internal/operation/AsyncCommandCoreCursor.java b/driver-core/src/main/com/mongodb/internal/operation/AsyncCommandCursor.java
similarity index 99%
rename from driver-core/src/main/com/mongodb/internal/operation/AsyncCommandCoreCursor.java
rename to driver-core/src/main/com/mongodb/internal/operation/AsyncCommandCursor.java
index de49f1fc972..a87828969cf 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/AsyncCommandCoreCursor.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/AsyncCommandCursor.java
@@ -60,7 +60,7 @@
 import static com.mongodb.internal.operation.CommandBatchCursorHelper.translateCommandException;
 import static java.util.Collections.emptyList;
 
-class AsyncCommandCoreCursor implements AsyncCoreCursor {
+class AsyncCommandCursor implements AsyncCursor {
 
     private final MongoNamespace namespace;
     private final Decoder decoder;
@@ -73,7 +73,7 @@ class AsyncCommandCoreCursor implements AsyncCoreCursor {
     private int batchSize;
     private volatile CommandCursorResult commandCursorResult;
 
-    AsyncCommandCoreCursor(
+    AsyncCommandCursor(
             final BsonDocument commandCursorDocument,
             final int batchSize,
             final Decoder decoder,
diff --git a/driver-core/src/main/com/mongodb/internal/operation/AsyncCoreCursor.java b/driver-core/src/main/com/mongodb/internal/operation/AsyncCursor.java
similarity index 98%
rename from driver-core/src/main/com/mongodb/internal/operation/AsyncCoreCursor.java
rename to driver-core/src/main/com/mongodb/internal/operation/AsyncCursor.java
index c689d48f7df..3028057c7ee 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/AsyncCoreCursor.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/AsyncCursor.java
@@ -26,7 +26,7 @@
 
 import java.util.List;
 
-public interface AsyncCoreCursor {
+public interface AsyncCursor {
     void close(OperationContext operationContext);
     void next(OperationContext operationContext, SingleResultCallback> callback);
 
diff --git a/driver-core/src/main/com/mongodb/internal/operation/AsyncOperationHelper.java b/driver-core/src/main/com/mongodb/internal/operation/AsyncOperationHelper.java
index e5973124ef9..3063826fbe8 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/AsyncOperationHelper.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/AsyncOperationHelper.java
@@ -75,25 +75,11 @@ interface AsyncCallableWithSource {
     }
 
     interface CommandWriteTransformerAsync {
-
-        /**
-         * Yield an appropriate result object for the input object.
-         *
-         * @param t the input object
-         * @return the function result
-         */
         @Nullable
         R apply(T t, AsyncConnection connection);
     }
 
     interface CommandReadTransformerAsync {
-
-        /**
-         * Yield an appropriate result object for the input object.
-         *
-         * @param t the input object
-         * @return the function result
-         */
         @Nullable
         R apply(T t, AsyncConnectionSource source, AsyncConnection connection, OperationContext operationContext);
     }
@@ -384,7 +370,7 @@ static  AsyncBatchCursor cursorDocumentToAsyncBatchCursor(final TimeoutMod
                                                                     final AsyncConnectionSource source,
                                                                     final AsyncConnection connection,
                                                                     final OperationContext operationContext) {
-        return new AsyncCommandBatchCursor<>(timeoutMode, 0, operationContext, new AsyncCommandCoreCursor<>(
+        return new AsyncCommandBatchCursor<>(timeoutMode, 0, operationContext, new AsyncCommandCursor<>(
                 cursorDocument, batchSize, decoder, comment, source, connection
         ));
     }
diff --git a/driver-core/src/main/com/mongodb/internal/operation/ChangeStreamBatchCursor.java b/driver-core/src/main/com/mongodb/internal/operation/ChangeStreamBatchCursor.java
index 4f2f31214e4..70f4b8f4ac4 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/ChangeStreamBatchCursor.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/ChangeStreamBatchCursor.java
@@ -1,5 +1,3 @@
-package com.mongodb.internal.operation;
-
 /*
  * Copyright 2008-present MongoDB, Inc.
  *
@@ -15,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+package com.mongodb.internal.operation;
 
 
 import com.mongodb.MongoChangeStreamException;
@@ -42,7 +41,7 @@
 import static com.mongodb.internal.operation.SyncOperationHelper.withReadConnectionSource;
 
 /**
- * A change stream cursor that wraps {@link CommandBatchCursor} with automatic resumption capabilities in the event
+ * A change stream cursor that wraps {@link Cursor} with automatic resumption capabilities in the event
  * of timeouts or transient errors.
  * 

  * Upon encountering a resumable error during {@code hasNext()}, {@code next()}, or {@code tryNext()} calls, the {@link ChangeStreamBatchCursor}
@@ -61,7 +60,7 @@ final class ChangeStreamBatchCursor implements AggregateResponseBatchCursor changeStreamOperation;
     private final int maxWireVersion;
-    private CoreCursor wrapped;
+    private Cursor wrapped;
     private BsonDocument resumeToken;
     private final AtomicBoolean closed;
 
@@ -73,7 +72,7 @@ final class ChangeStreamBatchCursor implements AggregateResponseBatchCursor changeStreamOperation,
-                            final CoreCursor wrapped,
+                            final Cursor wrapped,
                             final ReadBinding binding,
                             final OperationContext operationContext,
                             @Nullable final BsonDocument resumeToken,
@@ -88,29 +87,29 @@ final class ChangeStreamBatchCursor implements AggregateResponseBatchCursor getWrapped() {
+    Cursor getWrapped() {
         return wrapped;
     }
 
     @Override
     public boolean hasNext() {
-        return resumeableOperation(commandBatchCursor -> {
+        return resumeableOperation(coreCursor -> {
             try {
-                return commandBatchCursor.hasNext(operationContext);
+                return coreCursor.hasNext(operationContext);
             } finally {
-                cachePostBatchResumeToken(commandBatchCursor);
+                cachePostBatchResumeToken(coreCursor);
             }
         });
     }
 
     @Override
     public List next() {
-        return resumeableOperation(commandBatchCursor -> {
+        return resumeableOperation(coreCursor -> {
             try {
-                return convertAndProduceLastId(commandBatchCursor.next(operationContext), changeStreamOperation.getDecoder(),
+                return convertAndProduceLastId(coreCursor.next(operationContext), changeStreamOperation.getDecoder(),
                         lastId -> resumeToken = lastId);
             } finally {
-                cachePostBatchResumeToken(commandBatchCursor);
+                cachePostBatchResumeToken(coreCursor);
             }
         });
     }
@@ -126,13 +125,13 @@ public int available() {
 
     @Override
     public List tryNext() {
-        return resumeableOperation(commandBatchCursor -> {
+        return resumeableOperation(coreCursor -> {
             try {
-                List tryNext = commandBatchCursor.tryNext(operationContext);
+                List tryNext = coreCursor.tryNext(operationContext);
                 return tryNext == null ? null
                         : convertAndProduceLastId(tryNext, changeStreamOperation.getDecoder(), lastId -> resumeToken = lastId);
             } finally {
-                cachePostBatchResumeToken(commandBatchCursor);
+                cachePostBatchResumeToken(coreCursor);
             }
         });
     }
@@ -190,9 +189,9 @@ public int getMaxWireVersion() {
         return maxWireVersion;
     }
 
-    private void cachePostBatchResumeToken(final CoreCursor commandBatchCursor) {
-        if (commandBatchCursor.getPostBatchResumeToken() != null) {
-            resumeToken = commandBatchCursor.getPostBatchResumeToken();
+    private void cachePostBatchResumeToken(final Cursor cursor) {
+        if (cursor.getPostBatchResumeToken() != null) {
+            resumeToken = cursor.getPostBatchResumeToken();
         }
     }
 
@@ -216,7 +215,7 @@ static  List convertAndProduceLastId(final List rawDocume
         return results;
     }
 
-     R resumeableOperation(final Function, R> function) {
+     R resumeableOperation(final Function, R> function) {
         restartTimeout();
         try {
             R result = execute(function);
@@ -228,7 +227,7 @@  R resumeableOperation(final Function, R> functio
         }
     }
 
-    private  R execute(final Function, R> function) {
+    private  R execute(final Function, R> function) {
         boolean shouldBeResumed = hasPreviousNextTimedOut();
         while (true) {
             if (shouldBeResumed) {
diff --git a/driver-core/src/main/com/mongodb/internal/operation/ChangeStreamOperation.java b/driver-core/src/main/com/mongodb/internal/operation/ChangeStreamOperation.java
index e0ea7063d7f..ee45e885ceb 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/ChangeStreamOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/ChangeStreamOperation.java
@@ -201,7 +201,7 @@ public String getCommandName() {
 
     @Override
     public BatchCursor execute(final ReadBinding binding, final OperationContext operationContext) {
-        CoreCursor cursor = ((CommandBatchCursor) getAggregateOperation(operationContext.getTimeoutContext())
+        Cursor cursor = ((CommandBatchCursor) getAggregateOperation(operationContext.getTimeoutContext())
                 .execute(binding, operationContext))
                 .getWrapped();
 
@@ -223,7 +223,7 @@ public void executeAsync(final AsyncReadBinding binding, final OperationContext
             if (t != null) {
                 callback.onResult(null, t);
             } else {
-                AsyncCoreCursor cursor = ((AsyncCommandBatchCursor) assertNotNull(result))
+                AsyncCursor cursor = ((AsyncCommandBatchCursor) assertNotNull(result))
                         .getWrapped();
 
                 callback.onResult(new AsyncChangeStreamBatchCursor<>(ChangeStreamOperation.this, cursor, binding,
diff --git a/driver-core/src/main/com/mongodb/internal/operation/ClientBulkWriteOperation.java b/driver-core/src/main/com/mongodb/internal/operation/ClientBulkWriteOperation.java
index 14adf9727cd..0b8cbe2db05 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/ClientBulkWriteOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/ClientBulkWriteOperation.java
@@ -284,7 +284,7 @@ private Integer executeBatch(
                 // If connection pinning is required, `binding` handles that,
                 // and `ClientSession`, `TransactionContext` are aware of that.
                 () -> withSourceAndConnection(binding::getWriteConnectionSource, true,
-                        (connectionSource, connection, commandOperationContext) -> {
+                        (connectionSource, connection, operationContextWithMinRtt) -> {
                             ConnectionDescription connectionDescription = connection.getDescription();
                             boolean effectiveRetryWrites = isRetryableWrite(
                                     retryWritesSetting, effectiveWriteConcern, connectionDescription, sessionContext);
@@ -296,7 +296,7 @@ private Integer executeBatch(
                                     retryState, effectiveRetryWrites, effectiveWriteConcern, sessionContext, unexecutedModels, batchEncoder,
                                     () -> retryState.attach(AttachmentKeys.retryableCommandFlag(), true, true));
                             return executeBulkWriteCommandAndExhaustOkResponse(
-                                    retryState, connectionSource, connection, bulkWriteCommand, effectiveWriteConcern, commandOperationContext);
+                                    retryState, connectionSource, connection, bulkWriteCommand, effectiveWriteConcern, operationContextWithMinRtt);
                         }, operationContext)
         );
 
diff --git a/driver-core/src/main/com/mongodb/internal/operation/CommandBatchCursor.java b/driver-core/src/main/com/mongodb/internal/operation/CommandBatchCursor.java
index dbe42fbadb4..32f4785516d 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/CommandBatchCursor.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/CommandBatchCursor.java
@@ -30,13 +30,13 @@ class CommandBatchCursor implements AggregateResponseBatchCursor {
 
     private final TimeoutMode timeoutMode;
     private OperationContext operationContext;
-    private CoreCursor wrapped;
+    private Cursor wrapped;
 
     CommandBatchCursor(
             final TimeoutMode timeoutMode,
             final long maxTimeMs,
             final OperationContext operationContext,
-            final CoreCursor wrapped) {
+            final Cursor wrapped) {
         this.operationContext = operationContext.withOverride(timeoutContext ->
                 timeoutContext.withMaxTimeOverride(maxTimeMs));
         this.timeoutMode = timeoutMode;
@@ -129,7 +129,7 @@ private void resetTimeout() {
         }
     }
 
-    CoreCursor getWrapped() {
+    Cursor getWrapped() {
         return wrapped;
     }
 }
diff --git a/driver-core/src/main/com/mongodb/internal/operation/CommandCoreCursor.java b/driver-core/src/main/com/mongodb/internal/operation/CommandCursor.java
similarity index 99%
rename from driver-core/src/main/com/mongodb/internal/operation/CommandCoreCursor.java
rename to driver-core/src/main/com/mongodb/internal/operation/CommandCursor.java
index e49f2fb7292..a20a54016d1 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/CommandCoreCursor.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/CommandCursor.java
@@ -56,7 +56,7 @@
 import static com.mongodb.internal.operation.CommandBatchCursorHelper.logCommandCursorResult;
 import static com.mongodb.internal.operation.CommandBatchCursorHelper.translateCommandException;
 
-class CommandCoreCursor implements CoreCursor {
+class CommandCursor implements Cursor {
 
     private final MongoNamespace namespace;
     private final Decoder decoder;
@@ -71,7 +71,7 @@ class CommandCoreCursor implements CoreCursor {
     @Nullable
     private List nextBatch;
 
-    CommandCoreCursor(
+    CommandCursor(
             final BsonDocument commandCursorDocument,
             final int batchSize,
             final Decoder decoder,
diff --git a/driver-core/src/main/com/mongodb/internal/operation/CoreCursor.java b/driver-core/src/main/com/mongodb/internal/operation/Cursor.java
similarity index 98%
rename from driver-core/src/main/com/mongodb/internal/operation/CoreCursor.java
rename to driver-core/src/main/com/mongodb/internal/operation/Cursor.java
index 5f797c1089f..fa0ab0902c4 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/CoreCursor.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/Cursor.java
@@ -25,7 +25,7 @@
 
 import java.util.List;
 
-interface CoreCursor {
+interface Cursor {
     void close(OperationContext operationContext);
 
     boolean hasNext(OperationContext operationContext);
diff --git a/driver-core/src/main/com/mongodb/internal/operation/CursorResourceManager.java b/driver-core/src/main/com/mongodb/internal/operation/CursorResourceManager.java
index 522ab2ebe54..f57938fb39e 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/CursorResourceManager.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/CursorResourceManager.java
@@ -1,5 +1,3 @@
-package com.mongodb.internal.operation;
-
 /*
  * Copyright 2008-present MongoDB, Inc.
  *
@@ -15,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+package com.mongodb.internal.operation;
 
 import com.mongodb.MongoNamespace;
 import com.mongodb.MongoSocketException;
@@ -35,6 +34,23 @@
 import static com.mongodb.internal.Locks.withLock;
 import static com.mongodb.internal.operation.CommandBatchCursorHelper.MESSAGE_IF_CONCURRENT_OPERATION;
 
+/**
+ * This is the resource manager for {@link CommandBatchCursor} or {@link AsyncCommandBatchCursor} implementations.
+ * 

+ * This class maintains all resources that must be released in {@link CommandBatchCursor#close()} /
+ * {@link AsyncCommandBatchCursor#close()}. The abstract {@linkplain #doClose(OperationContext)} deferred close action} is such that it is totally
+ * ordered with other operations of {@link CommandBatchCursor} / {@link AsyncCommandBatchCursor} (methods {@link #tryStartOperation()}/
+ * {@link #endOperation(OperationContext)} must be used properly to enforce the order) despite the method {@link CommandBatchCursor#close()} /
+ * {@link AsyncCommandBatchCursor#close()} being called concurrently with those operations.
+ * 

+ * This total order induces the happens-before order.
+ * 

+ * The deferred close action does not violate externally observable idempotence of {@link CommandBatchCursor#close()} /
+ * {@link AsyncCommandBatchCursor#close()}, because the close method is allowed to release resources "eventually".
+ * 

+ * Only methods explicitly documented as thread-safe are thread-safe,
+ * others are not and rely on the total order mentioned above.
+ */
 @ThreadSafe
 abstract class CursorResourceManager {
     private final Lock lock;
diff --git a/driver-core/src/main/com/mongodb/internal/operation/FindOperation.java b/driver-core/src/main/com/mongodb/internal/operation/FindOperation.java
index 3db5590df2c..3606431943b 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/FindOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/FindOperation.java
@@ -297,13 +297,7 @@ public BatchCursor execute(final ReadBinding binding, final OperationContext
             throw invalidTimeoutModeException;
         }
 
-        OperationContext findOperationContext;
-        if (shouldDisableMaxTimeMS()) {
-            findOperationContext = operationContext.withOverride(TimeoutContext::withDisabledMaxTime);
-        } else {
-            findOperationContext = operationContext;
-        }
-
+        OperationContext findOperationContext = getFindOperationContext(operationContext);
         RetryState retryState = initialRetryState(retryReads, findOperationContext.getTimeoutContext());
         Supplier> read = decorateReadWithRetries(retryState, findOperationContext, () ->
                 withSourceAndConnection(binding::getReadConnectionSource, false,
@@ -321,10 +315,6 @@ public BatchCursor execute(final ReadBinding binding, final OperationContext
         return read.get();
     }
 
-    private boolean shouldDisableMaxTimeMS() {
-        return isTailableCursor() && !isAwaitData() || timeoutMode == TimeoutMode.ITERATION;
-    }
-
     @Override
     public void executeAsync(final AsyncReadBinding binding, final OperationContext operationContext, final SingleResultCallback> callback) {
         IllegalStateException invalidTimeoutModeException = invalidTimeoutModeException();
@@ -333,13 +323,7 @@ public void executeAsync(final AsyncReadBinding binding, final OperationContext
             return;
         }
 
-        OperationContext findOperationContext;
-        if (shouldDisableMaxTimeMS()) {
-            findOperationContext = operationContext.withOverride(TimeoutContext::withDisabledMaxTime);
-        } else {
-            findOperationContext = operationContext;
-        }
-
+        OperationContext findOperationContext = getFindOperationContext(operationContext);
         RetryState retryState = initialRetryState(retryReads, findOperationContext.getTimeoutContext());
         binding.retain();
         AsyncCallbackSupplier> asyncRead = decorateReadWithRetriesAsync(
@@ -485,7 +469,7 @@ private TimeoutMode getTimeoutMode() {
     private CommandReadTransformer> transformer() {
         return (result, source, connection, operationContext) ->
                 new CommandBatchCursor<>(getTimeoutMode(), getMaxTimeForCursor(operationContext), operationContext,
-                        new CommandCoreCursor<>(
+                        new CommandCursor<>(
                                 result, batchSize, decoder, comment, source, connection
                 ));
     }
@@ -493,7 +477,7 @@ private CommandReadTransformer> transformer(
     private CommandReadTransformerAsync> asyncTransformer() {
         return (result, source, connection, operationContext) ->
                 new AsyncCommandBatchCursor<>(getTimeoutMode(), getMaxTimeForCursor(operationContext), operationContext,
-                        new AsyncCommandCoreCursor<>(
+                        new AsyncCommandCursor<>(
                                 result, batchSize, decoder,
                                 comment, source, connection
                         ));
@@ -512,4 +496,15 @@ private IllegalStateException invalidTimeoutModeException() {
         }
         return null;
     }
+
+    private boolean shouldDisableMaxTimeMS() {
+        return isTailableCursor() && !isAwaitData() || timeoutMode == TimeoutMode.ITERATION;
+    }
+
+    private OperationContext getFindOperationContext(final OperationContext operationContext) {
+        if (shouldDisableMaxTimeMS()) {
+            return operationContext.withOverride(TimeoutContext::withDisabledMaxTime);
+        }
+        return operationContext;
+    }
 }
diff --git a/driver-core/src/main/com/mongodb/internal/operation/SyncOperationHelper.java b/driver-core/src/main/com/mongodb/internal/operation/SyncOperationHelper.java
index f015bd55d4f..15406d0b7cb 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/SyncOperationHelper.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/SyncOperationHelper.java
@@ -358,7 +358,7 @@ static  CommandBatchCursor cursorDocumentToBatchCursor(final TimeoutMode t
                                                                  final int batchSize, final Decoder decoder,
                                                                  @Nullable final BsonValue comment, final ConnectionSource source,
                                                                  final Connection connection, final OperationContext operationContext) {
-        return new CommandBatchCursor<>(timeoutMode, 0, operationContext, new CommandCoreCursor<>(
+        return new CommandBatchCursor<>(timeoutMode, 0, operationContext, new CommandCursor<>(
                 cursorDocument, batchSize, decoder, comment, source, connection
         ));
 
diff --git a/driver-core/src/test/functional/com/mongodb/internal/operation/AsyncCommandBatchCursorFunctionalTest.java b/driver-core/src/test/functional/com/mongodb/internal/operation/AsyncCommandBatchCursorFunctionalTest.java
index 58e01242420..58e3e47ba74 100644
--- a/driver-core/src/test/functional/com/mongodb/internal/operation/AsyncCommandBatchCursorFunctionalTest.java
+++ b/driver-core/src/test/functional/com/mongodb/internal/operation/AsyncCommandBatchCursorFunctionalTest.java
@@ -112,7 +112,7 @@ void shouldExhaustCursorAsyncWithMultipleBatches() {
         // given
         BsonDocument commandResult = executeFindCommand(0, 3); // Fetch in batches of size 3
         cursor = new AsyncCommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
-                new AsyncCommandCoreCursor<>(commandResult, 3, DOCUMENT_DECODER, null, connectionSource, connection));
+                new AsyncCommandCursor<>(commandResult, 3, DOCUMENT_DECODER, null, connectionSource, connection));
 
        // when
         FutureResultCallback>> futureCallback = new FutureResultCallback<>();
@@ -134,7 +134,7 @@ void shouldExhaustCursorAsyncWithClosedCursor() {
         // given
         BsonDocument commandResult = executeFindCommand(0, 3);
         cursor = new AsyncCommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
-                new AsyncCommandCoreCursor<>(commandResult, 3, DOCUMENT_DECODER, null, connectionSource, connection));
+                new AsyncCommandCursor<>(commandResult, 3, DOCUMENT_DECODER, null, connectionSource, connection));
 
         cursor.close();
 
@@ -157,7 +157,7 @@ void shouldExhaustCursorAsyncWithEmptyCursor() {
 
         BsonDocument commandResult = executeFindCommand(0, 3); // No documents to fetch
         cursor = new AsyncCommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
-                new AsyncCommandCoreCursor<>(commandResult, 3, DOCUMENT_DECODER, null, connectionSource, connection));
+                new AsyncCommandCursor<>(commandResult, 3, DOCUMENT_DECODER, null, connectionSource, connection));
 
         // when
         FutureResultCallback>> futureCallback = new FutureResultCallback<>();
@@ -173,8 +173,8 @@ void shouldExhaustCursorAsyncWithEmptyCursor() {
     @DisplayName("server cursor should not be null")
     void theServerCursorShouldNotBeNull() {
         BsonDocument commandResult = executeFindCommand(2);
-        AsyncCommandCoreCursor coreCursor =
-                new AsyncCommandCoreCursor<>(commandResult, 0, DOCUMENT_DECODER, null, connectionSource, connection);
+        AsyncCommandCursor coreCursor =
+                new AsyncCommandCursor<>(commandResult, 0, DOCUMENT_DECODER, null, connectionSource, connection);
         cursor = new AsyncCommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
                 coreCursor);
 
@@ -185,8 +185,8 @@ void theServerCursorShouldNotBeNull() {
     @DisplayName("should get Exceptions for operations on the cursor after closing")
     void shouldGetExceptionsForOperationsOnTheCursorAfterClosing() {
         BsonDocument commandResult = executeFindCommand(5);
-        AsyncCommandCoreCursor coreCursor =
-                new AsyncCommandCoreCursor<>(commandResult, 0, DOCUMENT_DECODER, null, connectionSource, connection);
+        AsyncCommandCursor coreCursor =
+                new AsyncCommandCursor<>(commandResult, 0, DOCUMENT_DECODER, null, connectionSource, connection);
         cursor = new AsyncCommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
                 coreCursor);
 
@@ -203,7 +203,7 @@ void shouldGetExceptionsForOperationsOnTheCursorAfterClosing() {
     void shouldThrowAnExceptionWhenGoingOffTheEnd() {
         BsonDocument commandResult = executeFindCommand(2, 1);
         cursor = new AsyncCommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
-                new AsyncCommandCoreCursor<>(commandResult, 0, DOCUMENT_DECODER, null, connectionSource, connection));
+                new AsyncCommandCursor<>(commandResult, 0, DOCUMENT_DECODER, null, connectionSource, connection));
 
         cursorNext();
         cursorNext();
@@ -217,7 +217,7 @@ void shouldThrowAnExceptionWhenGoingOffTheEnd() {
     void testNormalExhaustion() {
         BsonDocument commandResult = executeFindCommand();
         cursor = new AsyncCommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
-                new AsyncCommandCoreCursor<>(commandResult, 3, DOCUMENT_DECODER, null, connectionSource, connection));
+                new AsyncCommandCursor<>(commandResult, 3, DOCUMENT_DECODER, null, connectionSource, connection));
 
         assertEquals(10, cursorFlatten().size());
     }
@@ -228,7 +228,7 @@ void testNormalExhaustion() {
     void testLimitExhaustion(final int limit, final int batchSize, final int expectedTotal) {
         BsonDocument commandResult = executeFindCommand(limit, batchSize);
         cursor = new AsyncCommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
-                new AsyncCommandCoreCursor<>(commandResult, batchSize, DOCUMENT_DECODER, null, connectionSource, connection));
+                new AsyncCommandCursor<>(commandResult, batchSize, DOCUMENT_DECODER, null, connectionSource, connection));
 
 
         assertEquals(expectedTotal, cursorFlatten().size());
@@ -247,7 +247,7 @@ void shouldBlockWaitingForNextBatchOnATailableCursor(final boolean awaitData, fi
         BsonDocument commandResult = executeFindCommand(new BsonDocument("ts",
                 new BsonDocument("$gte", new BsonTimestamp(5, 0))), 0, 2, true, awaitData);
         cursor = new AsyncCommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, maxTimeMS, OPERATION_CONTEXT,
-                new AsyncCommandCoreCursor<>(commandResult, 2, DOCUMENT_DECODER, null, connectionSource, connection));
+                new AsyncCommandCursor<>(commandResult, 2, DOCUMENT_DECODER, null, connectionSource, connection));
 
         assertFalse(cursor.isClosed());
         assertEquals(1, cursorNext().get(0).get("_id"));
@@ -270,7 +270,7 @@ void testTailableInterrupt() throws InterruptedException {
         BsonDocument commandResult = executeFindCommand(new BsonDocument("ts",
                 new BsonDocument("$gte", new BsonTimestamp(5, 0))), 0, 2, true, true);
         cursor = new AsyncCommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
-                new AsyncCommandCoreCursor<>(commandResult, 2, DOCUMENT_DECODER, null, connectionSource, connection));
+                new AsyncCommandCursor<>(commandResult, 2, DOCUMENT_DECODER, null, connectionSource, connection));
 
         CountDownLatch latch = new CountDownLatch(1);
         AtomicInteger seen = new AtomicInteger();
@@ -302,8 +302,8 @@ void testTailableInterrupt() throws InterruptedException {
     void shouldKillCursorIfLimitIsReachedOnInitialQuery() {
         assumeFalse(isSharded());
         BsonDocument commandResult = executeFindCommand(5, 10);
-        AsyncCommandCoreCursor coreCursor =
-                new AsyncCommandCoreCursor<>(commandResult, 0, DOCUMENT_DECODER, null, connectionSource, connection);
+        AsyncCommandCursor coreCursor =
+                new AsyncCommandCursor<>(commandResult, 0, DOCUMENT_DECODER, null, connectionSource, connection);
         cursor = new AsyncCommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
                 coreCursor);
 
@@ -317,8 +317,8 @@ void shouldKillCursorIfLimitIsReachedOnInitialQuery() {
     void shouldKillCursorIfLimitIsReachedOnGetMore() {
         assumeFalse(isSharded());
         BsonDocument commandResult = executeFindCommand(5, 3);
-        AsyncCommandCoreCursor coreCursor =
-                new AsyncCommandCoreCursor<>(commandResult, 3, DOCUMENT_DECODER, null, connectionSource, connection);
+        AsyncCommandCursor coreCursor =
+                new AsyncCommandCursor<>(commandResult, 3, DOCUMENT_DECODER, null, connectionSource, connection);
         cursor = new AsyncCommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
                 coreCursor);
 
@@ -339,8 +339,8 @@ void shouldReleaseConnectionSourceIfLimitIsReachedOnInitialQuery() {
         assumeFalse(isSharded());
 
         BsonDocument commandResult = executeFindCommand(5, 10);
-        AsyncCommandCoreCursor coreCursor =
-                new AsyncCommandCoreCursor<>(commandResult, 0, DOCUMENT_DECODER, null, connectionSource, connection);
+        AsyncCommandCursor coreCursor =
+                new AsyncCommandCursor<>(commandResult, 0, DOCUMENT_DECODER, null, connectionSource, connection);
         cursor = new AsyncCommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
                 coreCursor);
 
@@ -355,7 +355,7 @@ void shouldReleaseConnectionSourceIfLimitIsReachedOnGetMore() {
         assumeFalse(isSharded());
         BsonDocument commandResult = executeFindCommand(5, 3);
         cursor = new AsyncCommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
-                new AsyncCommandCoreCursor<>(commandResult, 3, DOCUMENT_DECODER, null, connectionSource, connection));
+                new AsyncCommandCursor<>(commandResult, 3, DOCUMENT_DECODER, null, connectionSource, connection));
 
         assertNotNull(cursorNext());
         assertNotNull(cursorNext());
@@ -368,7 +368,7 @@ void shouldReleaseConnectionSourceIfLimitIsReachedOnGetMore() {
     void testLimitWithGetMore() {
         BsonDocument commandResult = executeFindCommand(5, 2);
         cursor = new AsyncCommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
-                new AsyncCommandCoreCursor<>(commandResult, 2, DOCUMENT_DECODER, null, connectionSource, connection));
+                new AsyncCommandCursor<>(commandResult, 2, DOCUMENT_DECODER, null, connectionSource, connection));
 
         assertNotNull(cursorNext());
         assertNotNull(cursorNext());
@@ -391,7 +391,7 @@ void testLimitWithLargeDocuments() {
 
         BsonDocument commandResult = executeFindCommand(300, 0);
         cursor = new AsyncCommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
-                new AsyncCommandCoreCursor<>(commandResult, 0, DOCUMENT_DECODER, null, connectionSource, connection));
+                new AsyncCommandCursor<>(commandResult, 0, DOCUMENT_DECODER, null, connectionSource, connection));
 
         assertEquals(300, cursorFlatten().size());
     }
@@ -401,7 +401,7 @@ void testLimitWithLargeDocuments() {
     void shouldRespectBatchSize() {
         BsonDocument commandResult = executeFindCommand(2);
         cursor = new AsyncCommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
-                new AsyncCommandCoreCursor<>(commandResult, 2, DOCUMENT_DECODER, null, connectionSource, connection));
+                new AsyncCommandCursor<>(commandResult, 2, DOCUMENT_DECODER, null, connectionSource, connection));
 
         assertEquals(2, cursor.getBatchSize());
         assertEquals(2, cursorNext().size());
@@ -417,8 +417,8 @@ void shouldRespectBatchSize() {
     @DisplayName("should throw cursor not found exception")
     void shouldThrowCursorNotFoundException() throws Throwable {
         BsonDocument commandResult = executeFindCommand(2);
-        AsyncCommandCoreCursor coreCursor =
-                new AsyncCommandCoreCursor<>(commandResult, 2, DOCUMENT_DECODER, null, connectionSource, connection);
+        AsyncCommandCursor coreCursor =
+                new AsyncCommandCursor<>(commandResult, 2, DOCUMENT_DECODER, null, connectionSource, connection);
         cursor = new AsyncCommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
                 coreCursor);
 
diff --git a/driver-core/src/test/functional/com/mongodb/internal/operation/AsyncCommandBatchCursorTest.java b/driver-core/src/test/functional/com/mongodb/internal/operation/AsyncCommandBatchCursorTest.java
index 499f6724d6e..1b35cf1a326 100644
--- a/driver-core/src/test/functional/com/mongodb/internal/operation/AsyncCommandBatchCursorTest.java
+++ b/driver-core/src/test/functional/com/mongodb/internal/operation/AsyncCommandBatchCursorTest.java
@@ -41,11 +41,11 @@ class AsyncCommandBatchCursorTest {
     private static final Duration TIMEOUT = Duration.ofMillis(3_000);
     private OperationContext operationContext;
     private TimeoutContext timeoutContext;
-    private AsyncCoreCursor coreCursor;
+    private AsyncCursor coreCursor;
 
     @BeforeEach
     void setUp() {
-        coreCursor = mock(AsyncCoreCursor.class);
+        coreCursor = mock(AsyncCursor.class);
         timeoutContext = spy(new TimeoutContext(TimeoutSettings.create(
                 MongoClientSettings.builder().timeout(TIMEOUT.toMillis(), MILLISECONDS).build())));
         operationContext = spy(new OperationContext(
diff --git a/driver-core/src/test/functional/com/mongodb/internal/operation/AsyncCommandCoreCursorTest.java b/driver-core/src/test/functional/com/mongodb/internal/operation/AsyncCommandCursorTest.java
similarity index 95%
rename from driver-core/src/test/functional/com/mongodb/internal/operation/AsyncCommandCoreCursorTest.java
rename to driver-core/src/test/functional/com/mongodb/internal/operation/AsyncCommandCursorTest.java
index 453166438eb..464e817d606 100644
--- a/driver-core/src/test/functional/com/mongodb/internal/operation/AsyncCommandCoreCursorTest.java
+++ b/driver-core/src/test/functional/com/mongodb/internal/operation/AsyncCommandCursorTest.java
@@ -60,7 +60,7 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-class AsyncCommandCoreCursorTest {
+class AsyncCommandCursorTest {
 
     private static final MongoNamespace NAMESPACE = new MongoNamespace("test", "test");
     private static final BsonInt64 CURSOR_ID = new BsonInt64(1);
@@ -80,11 +80,11 @@ class AsyncCommandCoreCursorTest {
     private OperationContext operationContext;
     private TimeoutContext timeoutContext;
     private ServerDescription serverDescription;
-    private AsyncCoreCursor coreCursor;
+    private AsyncCursor coreCursor;
 
     @BeforeEach
     void setUp() {
-        coreCursor = mock(AsyncCoreCursor.class);
+        coreCursor = mock(AsyncCursor.class);
         timeoutContext = spy(new TimeoutContext(TimeoutSettings.create(
                 MongoClientSettings.builder().timeout(TIMEOUT.toMillis(), MILLISECONDS).build())));
         operationContext = spy(new OperationContext(
@@ -122,7 +122,7 @@ void shouldSkipKillsCursorsCommandWhenNetworkErrorOccurs() {
             return null;
         }).when(mockConnection).commandAsync(eq(NAMESPACE.getDatabaseName()), any(), any(), any(), any(), any(), any());
         when(serverDescription.getType()).thenReturn(ServerType.LOAD_BALANCER);
-        AsyncCoreCursor commandBatchCursor = createBatchCursor();
+        AsyncCursor commandBatchCursor = createBatchCursor();
 
         //when
         commandBatchCursor.next(operationContext, (result, t) -> {
@@ -147,7 +147,7 @@ void shouldNotSkipKillsCursorsCommandWhenTimeoutExceptionDoesNotHaveNetworkError
         }).when(mockConnection).commandAsync(eq(NAMESPACE.getDatabaseName()), any(), any(), any(), any(), any(), any());
         when(serverDescription.getType()).thenReturn(ServerType.LOAD_BALANCER);
 
-        AsyncCoreCursor commandBatchCursor = createBatchCursor();
+        AsyncCursor commandBatchCursor = createBatchCursor();
 
         //when
         commandBatchCursor.next(operationContext, (result, t) -> {
@@ -178,7 +178,7 @@ void shouldSkipKillsCursorsCommandWhenTimeoutExceptionHaveNetworkErrorCause() {
         }).when(mockConnection).commandAsync(eq(NAMESPACE.getDatabaseName()), any(), any(), any(), any(), any(), any());
         when(serverDescription.getType()).thenReturn(ServerType.LOAD_BALANCER);
 
-        AsyncCoreCursor commandBatchCursor = createBatchCursor();
+        AsyncCursor commandBatchCursor = createBatchCursor();
 
         //when
         commandBatchCursor.next(operationContext, (result, t) -> {
@@ -199,8 +199,8 @@ void shouldSkipKillsCursorsCommandWhenTimeoutExceptionHaveNetworkErrorCause() {
     }
 
 
-    private AsyncCoreCursor createBatchCursor() {
-        return new AsyncCommandCoreCursor<>(
+    private AsyncCursor createBatchCursor() {
+        return new AsyncCommandCursor<>(
                 COMMAND_CURSOR_DOCUMENT,
                 0,
                 DOCUMENT_CODEC,
diff --git a/driver-core/src/test/functional/com/mongodb/internal/operation/CommandBatchCursorFunctionalTest.java b/driver-core/src/test/functional/com/mongodb/internal/operation/CommandBatchCursorFunctionalTest.java
index 3d0774d425a..407b03f5246 100644
--- a/driver-core/src/test/functional/com/mongodb/internal/operation/CommandBatchCursorFunctionalTest.java
+++ b/driver-core/src/test/functional/com/mongodb/internal/operation/CommandBatchCursorFunctionalTest.java
@@ -110,7 +110,7 @@ void shouldExhaustCursorWithMultipleBatches() {
         // given
         BsonDocument commandResult = executeFindCommand(0, 3); // Fetch in batches of size 3
         cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
-                new CommandCoreCursor<>(commandResult, 3, DOCUMENT_DECODER, null, connectionSource, connection));
+                new CommandCursor<>(commandResult, 3, DOCUMENT_DECODER, null, connectionSource, connection));
 
         // when
         List> result = cursor.exhaust();
@@ -128,7 +128,7 @@ void shouldExhaustCursorWithClosedCursor() {
         // given
         BsonDocument commandResult = executeFindCommand(0, 3);
         cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
-                new CommandCoreCursor<>(commandResult, 3, DOCUMENT_DECODER, null, connectionSource, connection));
+                new CommandCursor<>(commandResult, 3, DOCUMENT_DECODER, null, connectionSource, connection));
         cursor.close();
 
         // when & then
@@ -144,7 +144,7 @@ void shouldExhaustCursorWithEmptyCursor() {
 
         BsonDocument commandResult = executeFindCommand(0, 3); // No documents to fetch
         cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
-                new CommandCoreCursor<>(commandResult, 3, DOCUMENT_DECODER, null, connectionSource, connection));
+                new CommandCursor<>(commandResult, 3, DOCUMENT_DECODER, null, connectionSource, connection));
 
         // when
         List> result = cursor.exhaust();
@@ -158,7 +158,7 @@ void shouldExhaustCursorWithEmptyCursor() {
     void theServerCursorShouldNotBeNull() {
         BsonDocument commandResult = executeFindCommand(2);
         cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
-                new CommandCoreCursor<>(commandResult, 0, DOCUMENT_DECODER, null, connectionSource, connection));
+                new CommandCursor<>(commandResult, 0, DOCUMENT_DECODER, null, connectionSource, connection));
 
         assertNotNull(cursor.getServerCursor());
     }
@@ -168,7 +168,7 @@ void theServerCursorShouldNotBeNull() {
     void theServerAddressShouldNotNull() {
         BsonDocument commandResult = executeFindCommand();
         cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
-                new CommandCoreCursor<>(commandResult, 0, DOCUMENT_DECODER, null, connectionSource, connection));
+                new CommandCursor<>(commandResult, 0, DOCUMENT_DECODER, null, connectionSource, connection));
 
         assertNotNull(cursor.getServerAddress());
     }
@@ -178,7 +178,7 @@ void theServerAddressShouldNotNull() {
     void shouldGetExceptionsForOperationsOnTheCursorAfterClosing() {
         BsonDocument commandResult = executeFindCommand();
         cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
-                new CommandCoreCursor<>(commandResult, 0, DOCUMENT_DECODER, null, connectionSource, connection));
+                new CommandCursor<>(commandResult, 0, DOCUMENT_DECODER, null, connectionSource, connection));
 
         cursor.close();
 
@@ -193,7 +193,7 @@ void shouldGetExceptionsForOperationsOnTheCursorAfterClosing() {
     void shouldThrowAnExceptionWhenGoingOffTheEnd() {
         BsonDocument commandResult = executeFindCommand(1);
         cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
-                new CommandCoreCursor<>(commandResult, 0, DOCUMENT_DECODER, null, connectionSource, connection));
+                new CommandCursor<>(commandResult, 0, DOCUMENT_DECODER, null, connectionSource, connection));
 
         cursor.next();
         cursor.next();
@@ -205,7 +205,7 @@ void shouldThrowAnExceptionWhenGoingOffTheEnd() {
     void testCursorRemove() {
         BsonDocument commandResult = executeFindCommand();
         cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
-                new CommandCoreCursor<>(commandResult, 0, DOCUMENT_DECODER, null, connectionSource, connection));
+                new CommandCursor<>(commandResult, 0, DOCUMENT_DECODER, null, connectionSource, connection));
 
         assertThrows(UnsupportedOperationException.class, () -> cursor.remove());
     }
@@ -215,7 +215,7 @@ void testCursorRemove() {
     void testNormalExhaustion() {
         BsonDocument commandResult = executeFindCommand();
         cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
-                new CommandCoreCursor<>(commandResult, 0, DOCUMENT_DECODER, null, connectionSource, connection));
+                new CommandCursor<>(commandResult, 0, DOCUMENT_DECODER, null, connectionSource, connection));
 
         assertEquals(10, cursorFlatten().size());
     }
@@ -226,7 +226,7 @@ void testNormalExhaustion() {
     void testLimitExhaustion(final int limit, final int batchSize, final int expectedTotal) {
         BsonDocument commandResult = executeFindCommand(limit, batchSize);
         cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
-                new CommandCoreCursor<>(commandResult, 0, DOCUMENT_DECODER, null, connectionSource, connection));
+                new CommandCursor<>(commandResult, 0, DOCUMENT_DECODER, null, connectionSource, connection));
 
         assertEquals(expectedTotal, cursorFlatten().size());
 
@@ -245,7 +245,7 @@ void shouldBlockWaitingForNextBatchOnATailableCursor(final boolean awaitData, fi
         BsonDocument commandResult = executeFindCommand(new BsonDocument("ts",
                 new BsonDocument("$gte", new BsonTimestamp(5, 0))), 0, 2, true, awaitData);
         cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, maxTimeMS, OPERATION_CONTEXT,
-                new CommandCoreCursor<>(commandResult, 2, DOCUMENT_DECODER, null, connectionSource, connection));
+                new CommandCursor<>(commandResult, 2, DOCUMENT_DECODER, null, connectionSource, connection));
 
         assertTrue(cursor.hasNext());
         assertEquals(1, cursor.next().get(0).get("_id"));
@@ -268,7 +268,7 @@ void testTryNextWithTailable() {
         BsonDocument commandResult = executeFindCommand(new BsonDocument("ts",
                 new BsonDocument("$gte", new BsonTimestamp(5, 0))), 0, 2, true, true);
         cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
-                new CommandCoreCursor<>(commandResult, 2, DOCUMENT_DECODER, null, connectionSource, connection));
+                new CommandCursor<>(commandResult, 2, DOCUMENT_DECODER, null, connectionSource, connection));
 
         List nextBatch = cursor.tryNext();
         assertNotNull(nextBatch);
@@ -294,7 +294,7 @@ void hasNextShouldThrowWhenCursorIsClosedInAnotherThread() throws InterruptedExc
         BsonDocument commandResult = executeFindCommand(new BsonDocument("ts",
                 new BsonDocument("$gte", new BsonTimestamp(5, 0))), 0, 2, true, true);
         cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
-                new CommandCoreCursor<>(commandResult, 2, DOCUMENT_DECODER, null, connectionSource, connection));
+                new CommandCursor<>(commandResult, 2, DOCUMENT_DECODER, null, connectionSource, connection));
 
         assertTrue(cursor.hasNext());
         assertEquals(1, cursor.next().get(0).get("_id"));
@@ -321,7 +321,7 @@ void testMaxTimeMS() {
         BsonDocument commandResult = executeFindCommand(new BsonDocument("ts",
                 new BsonDocument("$gte", new BsonTimestamp(5, 0))), 0, 2, true, true);
         cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, maxTimeMS, OPERATION_CONTEXT,
-                new CommandCoreCursor<>(commandResult, 2, DOCUMENT_DECODER, null, connectionSource, connection));
+                new CommandCursor<>(commandResult, 2, DOCUMENT_DECODER, null, connectionSource, connection));
 
         List nextBatch = cursor.tryNext();
         assertNotNull(nextBatch);
@@ -345,7 +345,7 @@ void testTailableInterrupt() throws InterruptedException {
         BsonDocument commandResult = executeFindCommand(new BsonDocument("ts",
                 new BsonDocument("$gte", new BsonTimestamp(5, 0))), 0, 2, true, true);
         cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
-                new CommandCoreCursor<>(commandResult, 2, DOCUMENT_DECODER, null, connectionSource, connection));
+                new CommandCursor<>(commandResult, 2, DOCUMENT_DECODER, null, connectionSource, connection));
 
         CountDownLatch latch = new CountDownLatch(1);
         AtomicInteger seen = new AtomicInteger();
@@ -378,7 +378,7 @@ void shouldKillCursorIfLimitIsReachedOnInitialQuery() {
         assumeFalse(isSharded());
         BsonDocument commandResult = executeFindCommand(5, 10);
         cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
-                new CommandCoreCursor<>(commandResult, 0, DOCUMENT_DECODER, null, connectionSource, connection));
+                new CommandCursor<>(commandResult, 0, DOCUMENT_DECODER, null, connectionSource, connection));
 
         assertNotNull(cursor.next());
         assertFalse(cursor.hasNext());
@@ -391,7 +391,7 @@ void shouldKillCursorIfLimitIsReachedOnGetMore() {
         assumeFalse(isSharded());
         BsonDocument commandResult = executeFindCommand(5, 3);
         cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
-                new CommandCoreCursor<>(commandResult, 3, DOCUMENT_DECODER, null, connectionSource, connection));
+                new CommandCursor<>(commandResult, 3, DOCUMENT_DECODER, null, connectionSource, connection));
 
         ServerCursor serverCursor = cursor.getServerCursor();
         assertNotNull(serverCursor);
@@ -410,7 +410,7 @@ void shouldReleaseConnectionSourceIfLimitIsReachedOnInitialQuery() {
         assumeFalse(isSharded());
         BsonDocument commandResult = executeFindCommand(5, 10);
         cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
-                new CommandCoreCursor<>(commandResult, 0, DOCUMENT_DECODER, null, connectionSource, connection));
+                new CommandCursor<>(commandResult, 0, DOCUMENT_DECODER, null, connectionSource, connection));
 
         assertNull(cursor.getServerCursor());
         assertDoesNotThrow(() -> checkReferenceCountReachesTarget(connectionSource, 1));
@@ -423,7 +423,7 @@ void shouldReleaseConnectionSourceIfLimitIsReachedOnGetMore() {
         assumeFalse(isSharded());
         BsonDocument commandResult = executeFindCommand(5, 3);
         cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
-                new CommandCoreCursor<>(commandResult, 3, DOCUMENT_DECODER, null, connectionSource, connection));
+                new CommandCursor<>(commandResult, 3, DOCUMENT_DECODER, null, connectionSource, connection));
 
         assertNotNull(cursor.next());
         assertNotNull(cursor.next());
@@ -436,7 +436,7 @@ void shouldReleaseConnectionSourceIfLimitIsReachedOnGetMore() {
     void testLimitWithGetMore() {
         BsonDocument commandResult = executeFindCommand(5, 2);
         cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
-                new CommandCoreCursor<>(commandResult, 2, DOCUMENT_DECODER, null, connectionSource, connection));
+                new CommandCursor<>(commandResult, 2, DOCUMENT_DECODER, null, connectionSource, connection));
 
         assertNotNull(cursor.next());
         assertNotNull(cursor.next());
@@ -457,7 +457,7 @@ void testLimitWithLargeDocuments() {
 
         BsonDocument commandResult = executeFindCommand(300, 0);
         cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
-                new CommandCoreCursor<>(commandResult, 0, DOCUMENT_DECODER, null, connectionSource, connection));
+                new CommandCursor<>(commandResult, 0, DOCUMENT_DECODER, null, connectionSource, connection));
 
         assertEquals(300, cursorFlatten().size());
     }
@@ -467,7 +467,7 @@ void testLimitWithLargeDocuments() {
     void shouldRespectBatchSize() {
         BsonDocument commandResult = executeFindCommand(2);
         cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
-                new CommandCoreCursor<>(commandResult, 2, DOCUMENT_DECODER, null, connectionSource, connection));
+                new CommandCursor<>(commandResult, 2, DOCUMENT_DECODER, null, connectionSource, connection));
 
         assertEquals(2, cursor.getBatchSize());
         assertEquals(2, cursor.next().size());
@@ -484,7 +484,7 @@ void shouldRespectBatchSize() {
     void shouldThrowCursorNotFoundException() {
         BsonDocument commandResult = executeFindCommand(2);
         cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
-                new CommandCoreCursor<>(commandResult, 2, DOCUMENT_DECODER, null, connectionSource, connection));
+                new CommandCursor<>(commandResult, 2, DOCUMENT_DECODER, null, connectionSource, connection));
 
         ServerCursor serverCursor = cursor.getServerCursor();
         assertNotNull(serverCursor);
@@ -507,7 +507,7 @@ void shouldThrowCursorNotFoundException() {
     void shouldReportAvailableDocuments() {
         BsonDocument commandResult = executeFindCommand(3);
         cursor = new CommandBatchCursor<>(TimeoutMode.CURSOR_LIFETIME, 0, OPERATION_CONTEXT,
-                new CommandCoreCursor<>(commandResult, 2, DOCUMENT_DECODER, null, connectionSource, connection));
+                new CommandCursor<>(commandResult, 2, DOCUMENT_DECODER, null, connectionSource, connection));
 
         assertEquals(3, cursor.available());
 
diff --git a/driver-core/src/test/unit/com/mongodb/internal/operation/AsyncChangeStreamBatchCursorSpecification.groovy b/driver-core/src/test/unit/com/mongodb/internal/operation/AsyncChangeStreamBatchCursorSpecification.groovy
index 37a7220a851..b3f213fc679 100644
--- a/driver-core/src/test/unit/com/mongodb/internal/operation/AsyncChangeStreamBatchCursorSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/internal/operation/AsyncChangeStreamBatchCursorSpecification.groovy
@@ -44,7 +44,7 @@ class AsyncChangeStreamBatchCursorSpecification extends Specification {
         operationContext.getTimeoutContext().hasTimeoutMS() >> hasTimeoutMS
 
         def callback = Stub(SingleResultCallback)
-        AsyncCoreCursor wrapped = Mock(AsyncCoreCursor)
+        AsyncCursor wrapped = Mock(AsyncCursor)
         def cursor = new AsyncChangeStreamBatchCursor(changeStreamOperation,
                 wrapped, binding, operationContext, null,
                 ServerVersionHelper.FOUR_DOT_FOUR_WIRE_VERSION)
@@ -86,7 +86,7 @@ class AsyncChangeStreamBatchCursorSpecification extends Specification {
         operationContext.getTimeoutContext().hasTimeoutMS() >> hasTimeoutMS
 
         def callback = Stub(SingleResultCallback)
-        AsyncCoreCursor wrapped = Mock(AsyncCoreCursor)
+        AsyncCursor wrapped = Mock(AsyncCursor)
         def cursor = new AsyncChangeStreamBatchCursor(changeStreamOpertation,
                 wrapped, binding, operationContext, null,
                 ServerVersionHelper.FOUR_DOT_FOUR_WIRE_VERSION)
@@ -117,7 +117,7 @@ class AsyncChangeStreamBatchCursorSpecification extends Specification {
         def operationContext = getOperationContext()
         operationContext.getTimeoutContext().hasTimeoutMS() >> hasTimeoutMS
 
-        AsyncCoreCursor wrapped = Mock(AsyncCoreCursor)
+        AsyncCursor wrapped = Mock(AsyncCursor)
         def cursor = new AsyncChangeStreamBatchCursor(changeStreamOpertation,
                 wrapped, binding, operationContext, null,
                 ServerVersionHelper.FOUR_DOT_FOUR_WIRE_VERSION)
diff --git a/driver-core/src/test/unit/com/mongodb/internal/operation/AsyncCommandBatchCursorSpecification.groovy b/driver-core/src/test/unit/com/mongodb/internal/operation/AsyncCommandBatchCursorSpecification.groovy
index 901c2607ead..0c1d144695f 100644
--- a/driver-core/src/test/unit/com/mongodb/internal/operation/AsyncCommandBatchCursorSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/internal/operation/AsyncCommandBatchCursorSpecification.groovy
@@ -73,7 +73,7 @@ class AsyncCommandBatchCursorSpecification extends Specification {
         def reply =  getMoreResponse([], 0)
 
         when:
-        def commandCoreCursor = new AsyncCommandCoreCursor<>(firstBatch, batchSize, CODEC, null, connectionSource, initialConnection)
+        def commandCoreCursor = new AsyncCommandCursor<>(firstBatch, batchSize, CODEC, null, connectionSource, initialConnection)
         def cursor = new AsyncCommandBatchCursor(TimeoutMode.CURSOR_LIFETIME, maxTimeMS, operationContext, commandCoreCursor)
         then:
         1 * timeoutContext.withMaxTimeOverride(*_)
@@ -112,7 +112,7 @@ class AsyncCommandBatchCursorSpecification extends Specification {
         def connection = referenceCountedAsyncConnection(serverVersion)
         def connectionSource = getAsyncConnectionSource(connection)
         def operationContext = getOperationContext()
-        def commandCoreCursor = new AsyncCommandCoreCursor<>(firstBatch, 0, CODEC, null, connectionSource, initialConnection)
+        def commandCoreCursor = new AsyncCommandCursor<>(firstBatch, 0, CODEC, null, connectionSource, initialConnection)
         def cursor = new AsyncCommandBatchCursor(TimeoutMode.CURSOR_LIFETIME, 0, operationContext, commandCoreCursor)
 
         when:
@@ -143,7 +143,7 @@ class AsyncCommandBatchCursorSpecification extends Specification {
 
         when:
         def firstBatch = createCommandResult(FIRST_BATCH, 0)
-        def commandCoreCursor = new AsyncCommandCoreCursor<>(firstBatch, 0, CODEC, null, connectionSource, initialConnection)
+        def commandCoreCursor = new AsyncCommandCursor<>(firstBatch, 0, CODEC, null, connectionSource, initialConnection)
         def cursor = new AsyncCommandBatchCursor(TimeoutMode.CURSOR_LIFETIME, 0, operationContext, commandCoreCursor)
 
         then:
@@ -173,7 +173,7 @@ class AsyncCommandBatchCursorSpecification extends Specification {
 
         when:
         def firstBatch = createCommandResult([], CURSOR_ID)
-        def commandCoreCursor = new AsyncCommandCoreCursor<>(firstBatch, 0, CODEC, null, connectionSource, initialConnection)
+        def commandCoreCursor = new AsyncCommandCursor<>(firstBatch, 0, CODEC, null, connectionSource, initialConnection)
         def cursor = new AsyncCommandBatchCursor(TimeoutMode.CURSOR_LIFETIME, 0, operationContext, commandCoreCursor)
         def batch = nextBatch(cursor)
 
@@ -219,7 +219,7 @@ class AsyncCommandBatchCursorSpecification extends Specification {
         def firstBatch = createCommandResult()
 
         when:
-        def commandCoreCursor = new AsyncCommandCoreCursor<>(firstBatch, 0, CODEC, null, connectionSource, initialConnection)
+        def commandCoreCursor = new AsyncCommandCursor<>(firstBatch, 0, CODEC, null, connectionSource, initialConnection)
         def cursor = new AsyncCommandBatchCursor(TimeoutMode.CURSOR_LIFETIME, 0, operationContext, commandCoreCursor)
         def batch = nextBatch(cursor)
 
@@ -273,7 +273,7 @@ class AsyncCommandBatchCursorSpecification extends Specification {
         def connectionSource = getAsyncConnectionSource(connectionA, connectionB)
 
         when:
-        def commandCoreCursor = new AsyncCommandCoreCursor<>(createCommandResult(FIRST_BATCH, 42), 0,
+        def commandCoreCursor = new AsyncCommandCursor<>(createCommandResult(FIRST_BATCH, 42), 0,
                 CODEC, null, connectionSource, initialConnection)
         def cursor = new AsyncCommandBatchCursor(TimeoutMode.CURSOR_LIFETIME, 0, operationContext, commandCoreCursor)
         def batch = nextBatch(cursor)
@@ -310,7 +310,7 @@ class AsyncCommandBatchCursorSpecification extends Specification {
         def firstBatch = createCommandResult()
 
         when:
-        def commandCoreCursor = new AsyncCommandCoreCursor<>(firstBatch, 0, CODEC, null, connectionSource, initialConnection)
+        def commandCoreCursor = new AsyncCommandCursor<>(firstBatch, 0, CODEC, null, connectionSource, initialConnection)
         def cursor = new AsyncCommandBatchCursor(TimeoutMode.CURSOR_LIFETIME, 0, operationContext, commandCoreCursor)
         def batch = nextBatch(cursor)
 
@@ -350,7 +350,7 @@ class AsyncCommandBatchCursorSpecification extends Specification {
         def initialConnection = referenceCountedAsyncConnection()
         def connectionSource = getAsyncConnectionSourceWithResult(ServerType.STANDALONE) { [null, MONGO_EXCEPTION] }
         def firstBatch = createCommandResult()
-        def commandCoreCursor = new AsyncCommandCoreCursor<>(firstBatch, 0, CODEC, null, connectionSource, initialConnection)
+        def commandCoreCursor = new AsyncCommandCursor<>(firstBatch, 0, CODEC, null, connectionSource, initialConnection)
         def cursor = new AsyncCommandBatchCursor(TimeoutMode.CURSOR_LIFETIME, 0, operationContext, commandCoreCursor)
 
         when:
@@ -370,7 +370,7 @@ class AsyncCommandBatchCursorSpecification extends Specification {
 
         when:
         def firstBatch = createCommandResult()
-        def commandCoreCursor = new AsyncCommandCoreCursor<>(firstBatch, 0, CODEC, null, connectionSource, initialConnection)
+        def commandCoreCursor = new AsyncCommandCursor<>(firstBatch, 0, CODEC, null, connectionSource, initialConnection)
         def cursor = new AsyncCommandBatchCursor(TimeoutMode.CURSOR_LIFETIME, 0, operationContext, commandCoreCursor)
 
         then:
@@ -397,7 +397,7 @@ class AsyncCommandBatchCursorSpecification extends Specification {
 
         when:
         def firstBatch = createCommandResult()
-        def commandCoreCursor = new AsyncCommandCoreCursor<>(firstBatch, 0, CODEC, null, connectionSource, initialConnection)
+        def commandCoreCursor = new AsyncCommandCursor<>(firstBatch, 0, CODEC, null, connectionSource, initialConnection)
         def cursor = new AsyncCommandBatchCursor(TimeoutMode.CURSOR_LIFETIME, 0, operationContext, commandCoreCursor)
 
         then:
diff --git a/driver-core/src/test/unit/com/mongodb/internal/operation/ChangeStreamBatchCursorSpecification.groovy b/driver-core/src/test/unit/com/mongodb/internal/operation/ChangeStreamBatchCursorSpecification.groovy
index 919258a57c7..5f2d023c5a7 100644
--- a/driver-core/src/test/unit/com/mongodb/internal/operation/ChangeStreamBatchCursorSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/internal/operation/ChangeStreamBatchCursorSpecification.groovy
@@ -40,7 +40,7 @@ class ChangeStreamBatchCursorSpecification extends Specification {
         def binding = Stub(ReadBinding)
         def resumeToken = new BsonDocument('_id': new BsonInt32(1))
         def operationContext = getOperationContext()
-        CoreCursor wrapped = Mock(CoreCursor)
+        Cursor wrapped = Mock(Cursor)
         def cursor = new ChangeStreamBatchCursor(changeStreamOperation,
                 wrapped, binding, operationContext, resumeToken,
                 ServerVersionHelper.FOUR_DOT_FOUR_WIRE_VERSION)
diff --git a/driver-core/src/test/unit/com/mongodb/internal/operation/ChangeStreamBatchCursorTest.java b/driver-core/src/test/unit/com/mongodb/internal/operation/ChangeStreamBatchCursorTest.java
index b0cc6bc4c96..3ce014986e8 100644
--- a/driver-core/src/test/unit/com/mongodb/internal/operation/ChangeStreamBatchCursorTest.java
+++ b/driver-core/src/test/unit/com/mongodb/internal/operation/ChangeStreamBatchCursorTest.java
@@ -80,15 +80,15 @@ final class ChangeStreamBatchCursorTest {
     private ConnectionSource connectionSource;
     private ReadBinding readBinding;
     private BsonDocument resumeToken;
-    private CoreCursor coreCursor;
-    private CoreCursor newCoreCursor;
+    private Cursor cursor;
+    private Cursor newCursor;
     private ChangeStreamBatchCursor newChangeStreamCursor;
     private ChangeStreamOperation changeStreamOperation;
 
     @Test
     @DisplayName("should return result on next")
     void shouldReturnResultOnNext() {
-        when(coreCursor.next(any())).thenReturn(RESULT_FROM_NEW_CURSOR);
+        when(cursor.next(any())).thenReturn(RESULT_FROM_NEW_CURSOR);
         ChangeStreamBatchCursor cursor = createChangeStreamCursor();
 
         //when
@@ -98,11 +98,11 @@ void shouldReturnResultOnNext() {
         //then
         assertEquals(RESULT_FROM_NEW_CURSOR, next);
         assertTimeoutWasRefreshedForOperation(operationContextCaptor ->
-                verify(coreCursor).next(operationContextCaptor.capture()));
+                verify(this.cursor).next(operationContextCaptor.capture()));
 
-        verify(coreCursor, times(1)).next(any());
-        verify(coreCursor, atLeastOnce()).getPostBatchResumeToken();
-        verifyNoMoreInteractions(coreCursor);
+        verify(this.cursor, times(1)).next(any());
+        verify(this.cursor, atLeastOnce()).getPostBatchResumeToken();
+        verifyNoMoreInteractions(this.cursor);
         verify(changeStreamOperation, times(1)).getDecoder();
         verifyNoMoreInteractions(changeStreamOperation);
     }
@@ -110,15 +110,15 @@ void shouldReturnResultOnNext() {
     @Test
     @DisplayName("should throw timeout exception without resume attempt on next")
     void shouldThrowTimeoutExceptionWithoutResumeAttemptOnNext() {
-        when(coreCursor.next(any())).thenThrow(new MongoOperationTimeoutException("timeout"));
+        when(cursor.next(any())).thenThrow(new MongoOperationTimeoutException("timeout"));
         ChangeStreamBatchCursor cursor = createChangeStreamCursor();
         //when
         assertThrows(MongoOperationTimeoutException.class, cursor::next);
 
         //then
-        verify(coreCursor, times(1)).next(any());
-        verify(coreCursor, atLeastOnce()).getPostBatchResumeToken();
-        verifyNoMoreInteractions(coreCursor);
+        verify(this.cursor, times(1)).next(any());
+        verify(this.cursor, atLeastOnce()).getPostBatchResumeToken();
+        verifyNoMoreInteractions(this.cursor);
         verifyNoResumeAttemptCalled();
     }
 
@@ -126,7 +126,7 @@ void shouldThrowTimeoutExceptionWithoutResumeAttemptOnNext() {
     @DisplayName("should not refresh timeout on next() after cursor close() when resume attempt is made")
     void shouldNotRefreshTimeoutOnNextAfterCloseWhenResumeAttemptIsMade() {
         // given
-        when(coreCursor.next(any())).thenThrow(new MongoOperationTimeoutException("timeout"));
+        when(cursor.next(any())).thenThrow(new MongoOperationTimeoutException("timeout"));
         ChangeStreamBatchCursor cursor = createChangeStreamCursor();
         // when
         assertThrows(MongoOperationTimeoutException.class, cursor::next);
@@ -134,9 +134,9 @@ void shouldNotRefreshTimeoutOnNextAfterCloseWhenResumeAttemptIsMade() {
         cursor.next();
 
         // then
-        TimeoutContext timeoutContextForClose = captureTimeoutContext(captor -> verify(coreCursor)
+        TimeoutContext timeoutContextForClose = captureTimeoutContext(captor -> verify(this.cursor)
                 .close(captor.capture()));
-        TimeoutContext timeoutContextForNext = captureTimeoutContext(captor -> verify(newCoreCursor)
+        TimeoutContext timeoutContextForNext = captureTimeoutContext(captor -> verify(newCursor)
                 .next(captor.capture()));
         assertEquals(timeoutContextForNext.getTimeout(), timeoutContextForClose.getTimeout(),
                 "Timeout should not be refreshed on close after resume attempt");
@@ -146,16 +146,16 @@ void shouldNotRefreshTimeoutOnNextAfterCloseWhenResumeAttemptIsMade() {
     @DisplayName("should not refresh timeout on close() after cursor next() when resume attempt is made")
     void shouldNotRefreshTimeoutOnCloseAfterNextWhenResumeAttemptIsMade() {
         // given
-        when(coreCursor.next(any())).thenThrow(new MongoNotPrimaryException(new BsonDocument(), new ServerAddress()));
+        when(cursor.next(any())).thenThrow(new MongoNotPrimaryException(new BsonDocument(), new ServerAddress()));
         ChangeStreamBatchCursor cursor = createChangeStreamCursor();
 
         // when
         cursor.next();
 
         // then
-        TimeoutContext timeoutContextForNext = captureTimeoutContext(captor -> verify(coreCursor)
+        TimeoutContext timeoutContextForNext = captureTimeoutContext(captor -> verify(this.cursor)
                 .next(captor.capture()));
-        TimeoutContext timeoutContextForClose = captureTimeoutContext(captor -> verify(coreCursor)
+        TimeoutContext timeoutContextForClose = captureTimeoutContext(captor -> verify(this.cursor)
                 .close(captor.capture()));
         assertEquals(timeoutContextForNext.getTimeout(), timeoutContextForClose.getTimeout(),
                 "Timeout should not be refreshed on close after resume attempt");
@@ -164,7 +164,7 @@ void shouldNotRefreshTimeoutOnCloseAfterNextWhenResumeAttemptIsMade() {
     @Test
     @DisplayName("should perform resume attempt on next when resumable error is thrown")
     void shouldPerformResumeAttemptOnNextWhenResumableErrorIsThrown() {
-        when(coreCursor.next(any())).thenThrow(new MongoNotPrimaryException(new BsonDocument(), new ServerAddress()));
+        when(cursor.next(any())).thenThrow(new MongoNotPrimaryException(new BsonDocument(), new ServerAddress()));
         ChangeStreamBatchCursor cursor = createChangeStreamCursor();
 
         //when
@@ -174,15 +174,15 @@ void shouldPerformResumeAttemptOnNextWhenResumableErrorIsThrown() {
         //then
         assertEquals(RESULT_FROM_NEW_CURSOR, next);
         assertTimeoutWasRefreshedForOperation(operationContextCaptor ->
-                verify(newCoreCursor).next(operationContextCaptor.capture()));
-        verify(coreCursor, times(1)).next(any());
-        verify(coreCursor, atLeastOnce()).getPostBatchResumeToken();
+                verify(newCursor).next(operationContextCaptor.capture()));
+        verify(this.cursor, times(1)).next(any());
+        verify(this.cursor, atLeastOnce()).getPostBatchResumeToken();
         verifyResumeAttemptCalled();
         verify(changeStreamOperation, times(1)).getDecoder();
-        verify(newCoreCursor, times(1)).next(any());
-        verify(newCoreCursor, atLeastOnce()).getPostBatchResumeToken();
+        verify(newCursor, times(1)).next(any());
+        verify(newCursor, atLeastOnce()).getPostBatchResumeToken();
 
-        verifyNoMoreInteractions(newCoreCursor);
+        verifyNoMoreInteractions(newCursor);
         verifyNoMoreInteractions(changeStreamOperation);
     }
 
@@ -190,19 +190,19 @@ void shouldPerformResumeAttemptOnNextWhenResumableErrorIsThrown() {
     @Test
     @DisplayName("should resume only once on subsequent calls after timeout error")
     void shouldResumeOnlyOnceOnSubsequentCallsAfterTimeoutError() {
-        when(coreCursor.next(any())).thenThrow(new MongoOperationTimeoutException("timeout"));
+        when(cursor.next(any())).thenThrow(new MongoOperationTimeoutException("timeout"));
         ChangeStreamBatchCursor cursor = createChangeStreamCursor();
         //when
         assertThrows(MongoOperationTimeoutException.class, cursor::next);
 
         //then
         assertTimeoutWasRefreshedForOperation(operationContextCaptor ->
-                verify(coreCursor).next(operationContextCaptor.capture()));
-        verify(coreCursor, times(1)).next(any());
-        verify(coreCursor, atLeastOnce()).getPostBatchResumeToken();
-        verifyNoMoreInteractions(coreCursor);
+                verify(this.cursor).next(operationContextCaptor.capture()));
+        verify(this.cursor, times(1)).next(any());
+        verify(this.cursor, atLeastOnce()).getPostBatchResumeToken();
+        verifyNoMoreInteractions(this.cursor);
         verifyNoResumeAttemptCalled();
-        clearInvocations(coreCursor, newCoreCursor, timeoutContext, changeStreamOperation, readBinding);
+        clearInvocations(this.cursor, newCursor, timeoutContext, changeStreamOperation, readBinding);
 
         //when seconds next is called. Resume is attempted.
         sleep(TIMEOUT_CONSUMPTION_SLEEP_MS);
@@ -210,17 +210,17 @@ void shouldResumeOnlyOnceOnSubsequentCallsAfterTimeoutError() {
 
         //then
         assertEquals(Collections.emptyList(), next);
-        verify(coreCursor, times(1)).close(any());
-        verifyNoMoreInteractions(coreCursor);
+        verify(this.cursor, times(1)).close(any());
+        verifyNoMoreInteractions(this.cursor);
         assertTimeoutWasRefreshedForOperation(operationContextCaptor ->
-                verify(newCoreCursor).next(operationContextCaptor.capture()));
+                verify(newCursor).next(operationContextCaptor.capture()));
         verify(changeStreamOperation).setChangeStreamOptionsForResume(resumeToken, maxWireVersion);
         verify(changeStreamOperation, times(1)).getDecoder();
         verify(changeStreamOperation, times(1)).execute(eq(readBinding), any());
         verifyNoMoreInteractions(changeStreamOperation);
-        verify(newCoreCursor, times(1)).next(any());
-        verify(newCoreCursor, atLeastOnce()).getPostBatchResumeToken();
-        clearInvocations(coreCursor, newCoreCursor, timeoutContext, changeStreamOperation, readBinding);
+        verify(newCursor, times(1)).next(any());
+        verify(newCursor, atLeastOnce()).getPostBatchResumeToken();
+        clearInvocations(this.cursor, newCursor, timeoutContext, changeStreamOperation, readBinding);
 
         //when third next is called. No resume is attempted.
         sleep(TIMEOUT_CONSUMPTION_SLEEP_MS);
@@ -228,12 +228,12 @@ void shouldResumeOnlyOnceOnSubsequentCallsAfterTimeoutError() {
 
         //then
         assertEquals(Collections.emptyList(), next2);
-        verifyNoInteractions(coreCursor);
+        verifyNoInteractions(this.cursor);
         assertTimeoutWasRefreshedForOperation(operationContextCaptor ->
-                verify(newCoreCursor).next(operationContextCaptor.capture()));
-        verify(newCoreCursor, times(1)).next(any());
-        verify(newCoreCursor, atLeastOnce()).getPostBatchResumeToken();
-        verifyNoMoreInteractions(newCoreCursor);
+                verify(newCursor).next(operationContextCaptor.capture()));
+        verify(newCursor, times(1)).next(any());
+        verify(newCursor, atLeastOnce()).getPostBatchResumeToken();
+        verifyNoMoreInteractions(newCursor);
         verify(changeStreamOperation, times(1)).getDecoder();
         verifyNoMoreInteractions(changeStreamOperation);
         verifyNoInteractions(readBinding);
@@ -243,20 +243,20 @@ void shouldResumeOnlyOnceOnSubsequentCallsAfterTimeoutError() {
     @Test
     @DisplayName("should propagate any errors occurred in aggregate operation during creating new change stream when previous next timed out")
     void shouldPropagateAnyErrorsOccurredInAggregateOperation() {
-        when(coreCursor.next(any())).thenThrow(new MongoOperationTimeoutException("timeout"));
+        when(cursor.next(any())).thenThrow(new MongoOperationTimeoutException("timeout"));
         MongoNotPrimaryException resumableError = new MongoNotPrimaryException(new BsonDocument(), new ServerAddress());
         when(changeStreamOperation.execute(eq(readBinding), any())).thenThrow(resumableError);
 
         ChangeStreamBatchCursor cursor = createChangeStreamCursor();
         //when
         assertThrows(MongoOperationTimeoutException.class, cursor::next);
-        clearInvocations(coreCursor, newCoreCursor, timeoutContext, changeStreamOperation, readBinding);
+        clearInvocations(this.cursor, newCursor, timeoutContext, changeStreamOperation, readBinding);
         assertThrows(MongoNotPrimaryException.class, cursor::next);
 
         //then
         verifyResumeAttemptCalled();
         verifyNoMoreInteractions(changeStreamOperation);
-        verifyNoInteractions(newCoreCursor);
+        verifyNoInteractions(newCursor);
     }
 
 
@@ -267,15 +267,15 @@ void shouldResumeAfterTimeoutInAggregateOnNextCall() {
         ChangeStreamBatchCursor cursor = createChangeStreamCursor();
 
         //first next operation times out on getMore
-        when(coreCursor.next(any())).thenThrow(new MongoOperationTimeoutException("timeout during next call"));
+        when(this.cursor.next(any())).thenThrow(new MongoOperationTimeoutException("timeout during next call"));
         assertThrows(MongoOperationTimeoutException.class, cursor::next);
-        clearInvocations(coreCursor, newCoreCursor, timeoutContext, changeStreamOperation, readBinding);
+        clearInvocations(this.cursor, newCursor, timeoutContext, changeStreamOperation, readBinding);
 
         //second next operation times out on resume attempt when creating change stream
         when(changeStreamOperation.execute(eq(readBinding), any())).thenThrow(
                 new MongoOperationTimeoutException("timeout during resumption"));
         assertThrows(MongoOperationTimeoutException.class, cursor::next);
-        clearInvocations(coreCursor, newCoreCursor, timeoutContext, changeStreamOperation);
+        clearInvocations(this.cursor, newCursor, timeoutContext, changeStreamOperation);
 
         doReturn(newChangeStreamCursor).when(changeStreamOperation).execute(eq(readBinding), any());
 
@@ -290,10 +290,10 @@ void shouldResumeAfterTimeoutInAggregateOnNextCall() {
         verifyNoMoreInteractions(changeStreamOperation);
 
         assertTimeoutWasRefreshedForOperation(operationContextCaptor ->
-                verify(newCoreCursor).next(operationContextCaptor.capture()));
-        verify(newCoreCursor, times(1)).next(any());
-        verify(newCoreCursor, atLeastOnce()).getPostBatchResumeToken();
-        verifyNoMoreInteractions(newCoreCursor);
+                verify(newCursor).next(operationContextCaptor.capture()));
+        verify(newCursor, times(1)).next(any());
+        verify(newCursor, atLeastOnce()).getPostBatchResumeToken();
+        verifyNoMoreInteractions(newCursor);
     }
 
     @Test
@@ -303,9 +303,9 @@ void shouldCloseChangeStreamWhenResumeOperationFailsDueToNonTimeoutError() {
         ChangeStreamBatchCursor cursor = createChangeStreamCursor();
 
         //first next operation times out on getMore
-        when(coreCursor.next(any())).thenThrow(new MongoOperationTimeoutException("timeout during next call"));
+        when(this.cursor.next(any())).thenThrow(new MongoOperationTimeoutException("timeout during next call"));
         assertThrows(MongoOperationTimeoutException.class, cursor::next);
-        clearInvocations(coreCursor, newCoreCursor, timeoutContext, changeStreamOperation, readBinding);
+        clearInvocations(this.cursor, newCursor, timeoutContext, changeStreamOperation, readBinding);
 
         //when second next operation errors on resume attempt when creating change stream
         when(changeStreamOperation.execute(eq(readBinding), any())).thenThrow(
@@ -315,11 +315,11 @@ void shouldCloseChangeStreamWhenResumeOperationFailsDueToNonTimeoutError() {
         //then
         verifyResumeAttemptCalled();
         verifyNoMoreInteractions(changeStreamOperation);
-        verifyNoInteractions(newCoreCursor);
-        clearInvocations(coreCursor, newCoreCursor, timeoutContext, changeStreamOperation, readBinding);
+        verifyNoInteractions(newCursor);
+        clearInvocations(this.cursor, newCursor, timeoutContext, changeStreamOperation, readBinding);
 
         //when third next operation errors with cursor closed exception
-        doThrow(new IllegalStateException(MESSAGE_IF_CLOSED_AS_CURSOR)).when(coreCursor).next(any());
+        doThrow(new IllegalStateException(MESSAGE_IF_CLOSED_AS_CURSOR)).when(this.cursor).next(any());
         MongoException mongoException = assertThrows(MongoException.class, cursor::next);
 
         //then
@@ -329,23 +329,23 @@ void shouldCloseChangeStreamWhenResumeOperationFailsDueToNonTimeoutError() {
 
     private ChangeStreamBatchCursor createChangeStreamCursor() {
         ChangeStreamBatchCursor cursor =
-                new ChangeStreamBatchCursor<>(changeStreamOperation, coreCursor, readBinding, operationContext, null, maxWireVersion);
-        clearInvocations(coreCursor, newCoreCursor, timeoutContext, changeStreamOperation, readBinding);
+                new ChangeStreamBatchCursor<>(changeStreamOperation, this.cursor, readBinding, operationContext, null, maxWireVersion);
+        clearInvocations(this.cursor, newCursor, timeoutContext, changeStreamOperation, readBinding);
         return cursor;
     }
 
     private void verifyNoResumeAttemptCalled() {
         verifyNoInteractions(changeStreamOperation);
-        verifyNoInteractions(newCoreCursor);
+        verifyNoInteractions(newCursor);
         verifyNoInteractions(readBinding);
     }
 
 
     private void verifyResumeAttemptCalled() {
-        verify(coreCursor, times(1)).close(any());
+        verify(cursor, times(1)).close(any());
         verify(changeStreamOperation).setChangeStreamOptionsForResume(resumeToken, maxWireVersion);
         verify(changeStreamOperation, times(1)).execute(eq(readBinding), any());
-        verifyNoMoreInteractions(coreCursor);
+        verifyNoMoreInteractions(cursor);
     }
 
     @BeforeEach
@@ -379,17 +379,17 @@ void setUp() {
         when(readBinding.getReadConnectionSource(any())).thenReturn(connectionSource);
 
 
-        coreCursor = mock(CoreCursor.class);
-        when(coreCursor.getPostBatchResumeToken()).thenReturn(resumeToken);
-        doNothing().when(coreCursor).close(any());
+        cursor = mock(Cursor.class);
+        when(cursor.getPostBatchResumeToken()).thenReturn(resumeToken);
+        doNothing().when(cursor).close(any());
 
-        newCoreCursor = mock(CoreCursor.class);
-        when(newCoreCursor.getPostBatchResumeToken()).thenReturn(resumeToken);
-        when(newCoreCursor.next(any())).thenReturn(RESULT_FROM_NEW_CURSOR);
-        doNothing().when(newCoreCursor).close(any());
+        newCursor = mock(Cursor.class);
+        when(newCursor.getPostBatchResumeToken()).thenReturn(resumeToken);
+        when(newCursor.next(any())).thenReturn(RESULT_FROM_NEW_CURSOR);
+        doNothing().when(newCursor).close(any());
 
         newChangeStreamCursor = mock(ChangeStreamBatchCursor.class);
-        when(newChangeStreamCursor.getWrapped()).thenReturn(newCoreCursor);
+        when(newChangeStreamCursor.getWrapped()).thenReturn(newCursor);
 
         changeStreamOperation = mock(ChangeStreamOperation.class);
         when(changeStreamOperation.getDecoder()).thenReturn(new DocumentCodec());
diff --git a/driver-core/src/test/unit/com/mongodb/internal/operation/CommandBatchCursorSpecification.groovy b/driver-core/src/test/unit/com/mongodb/internal/operation/CommandBatchCursorSpecification.groovy
index c81c9ad759c..ccbf1b53efd 100644
--- a/driver-core/src/test/unit/com/mongodb/internal/operation/CommandBatchCursorSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/internal/operation/CommandBatchCursorSpecification.groovy
@@ -73,7 +73,7 @@ class CommandBatchCursorSpecification extends Specification {
         def reply =  getMoreResponse([], 0)
 
         when:
-        def commandCoreCursor = new CommandCoreCursor<>(firstBatch, batchSize, CODEC, null, connectionSource, initialConnection)
+        def commandCoreCursor = new CommandCursor<>(firstBatch, batchSize, CODEC, null, connectionSource, initialConnection)
         def cursor = new CommandBatchCursor(TimeoutMode.CURSOR_LIFETIME, maxTimeMS, operationContext, commandCoreCursor)
 
         then:
@@ -109,7 +109,7 @@ class CommandBatchCursorSpecification extends Specification {
         def serverVersion = new ServerVersion([3, 6, 0])
         def connection = referenceCountedConnection(serverVersion)
         def connectionSource = getConnectionSource(connection)
-        def commandCoreCursor = new CommandCoreCursor<>(firstBatch, 0, CODEC, null, connectionSource, initialConnection)
+        def commandCoreCursor = new CommandCursor<>(firstBatch, 0, CODEC, null, connectionSource, initialConnection)
         def cursor = new CommandBatchCursor(TimeoutMode.CURSOR_LIFETIME, 0, operationContext, commandCoreCursor)
 
         when:
@@ -137,7 +137,7 @@ class CommandBatchCursorSpecification extends Specification {
 
         when:
         def firstBatch = createCommandResult(FIRST_BATCH, 0)
-        def commandCoreCursor = new CommandCoreCursor<>(firstBatch, 0, CODEC, null, connectionSource, initialConnection)
+        def commandCoreCursor = new CommandCursor<>(firstBatch, 0, CODEC, null, connectionSource, initialConnection)
         def cursor = new CommandBatchCursor(TimeoutMode.CURSOR_LIFETIME, 0, operationContext, commandCoreCursor)
 
         then:
@@ -161,7 +161,7 @@ class CommandBatchCursorSpecification extends Specification {
 
         when:
         def firstBatch = createCommandResult([], CURSOR_ID)
-        def commandCoreCursor = new CommandCoreCursor<>(firstBatch, 0, CODEC, null, connectionSource, initialConnection)
+        def commandCoreCursor = new CommandCursor<>(firstBatch, 0, CODEC, null, connectionSource, initialConnection)
         def cursor = new CommandBatchCursor(TimeoutMode.CURSOR_LIFETIME, 0, operationContext, commandCoreCursor)
         def batch = cursor.next()
 
@@ -215,7 +215,7 @@ class CommandBatchCursorSpecification extends Specification {
         def firstBatch = createCommandResult()
 
         when:
-        def commandCoreCursor = new CommandCoreCursor<>(firstBatch, 0, CODEC, null, connectionSource, initialConnection)
+        def commandCoreCursor = new CommandCursor<>(firstBatch, 0, CODEC, null, connectionSource, initialConnection)
         def cursor = new CommandBatchCursor(TimeoutMode.CURSOR_LIFETIME, 0, operationContext, commandCoreCursor)
         List batch = cursor.next()
 
@@ -267,7 +267,7 @@ class CommandBatchCursorSpecification extends Specification {
         def connectionSource = getConnectionSource(connectionA, connectionB)
 
         when:
-        def commandCoreCursor = new CommandCoreCursor<>(createCommandResult(FIRST_BATCH, 42), 0, CODEC,
+        def commandCoreCursor = new CommandCursor<>(createCommandResult(FIRST_BATCH, 42), 0, CODEC,
                 null, connectionSource, initialConnection)
         def cursor = new CommandBatchCursor(TimeoutMode.CURSOR_LIFETIME, 0, operationContext, commandCoreCursor)
         def batch = cursor.next()
@@ -304,7 +304,7 @@ class CommandBatchCursorSpecification extends Specification {
         def firstBatch = createCommandResult()
 
         when:
-        def commandCoreCursor = new CommandCoreCursor<>(firstBatch, 0, CODEC, null, connectionSource, initialConnection)
+        def commandCoreCursor = new CommandCursor<>(firstBatch, 0, CODEC, null, connectionSource, initialConnection)
         def cursor = new CommandBatchCursor(TimeoutMode.CURSOR_LIFETIME, 0, operationContext, commandCoreCursor)
         def batch = cursor.next()
 
@@ -343,7 +343,7 @@ class CommandBatchCursorSpecification extends Specification {
         def initialConnection = referenceCountedConnection()
         def connectionSource = getConnectionSourceWithResult(ServerType.STANDALONE) { throw MONGO_EXCEPTION }
         def firstBatch = createCommandResult()
-        def commandCoreCursor = new CommandCoreCursor<>(firstBatch, 0, CODEC, null, connectionSource, initialConnection)
+        def commandCoreCursor = new CommandCursor<>(firstBatch, 0, CODEC, null, connectionSource, initialConnection)
         def cursor = new CommandBatchCursor(TimeoutMode.CURSOR_LIFETIME, 0, operationContext, commandCoreCursor)
 
         when:
@@ -364,7 +364,7 @@ class CommandBatchCursorSpecification extends Specification {
 
         when:
         def firstBatch = createCommandResult()
-        def commandCoreCursor = new CommandCoreCursor<>(firstBatch, 0, CODEC, null, connectionSource, initialConnection)
+        def commandCoreCursor = new CommandCursor<>(firstBatch, 0, CODEC, null, connectionSource, initialConnection)
         def cursor = new CommandBatchCursor(TimeoutMode.CURSOR_LIFETIME, 0, operationContext, commandCoreCursor)
 
         then:
@@ -391,7 +391,7 @@ class CommandBatchCursorSpecification extends Specification {
 
         when:
         def firstBatch = createCommandResult()
-        def commandCoreCursor = new CommandCoreCursor<>(firstBatch, 0, CODEC, null, connectionSource, initialConnection)
+        def commandCoreCursor = new CommandCursor<>(firstBatch, 0, CODEC, null, connectionSource, initialConnection)
         def cursor = new CommandBatchCursor(TimeoutMode.CURSOR_LIFETIME, 0, operationContext, commandCoreCursor)
         then:
         connectionSource.getCount() == 1
@@ -450,7 +450,7 @@ class CommandBatchCursorSpecification extends Specification {
         connectionSource.retain() >> connectionSource
 
         def initialResults = createCommandResult([])
-        def commandCoreCursor = new CommandCoreCursor<>(initialResults, 2, CODEC, null, connectionSource, initialConnection)
+        def commandCoreCursor = new CommandCursor<>(initialResults, 2, CODEC, null, connectionSource, initialConnection)
         def cursor = new CommandBatchCursor(TimeoutMode.CURSOR_LIFETIME, 100, operationContext, commandCoreCursor)
 
         when:
@@ -476,7 +476,7 @@ class CommandBatchCursorSpecification extends Specification {
         connectionSource.retain() >> connectionSource
 
         def initialResults = createCommandResult([])
-        def commandCoreCursor = new CommandCoreCursor<>(initialResults, 2, CODEC, null, connectionSource, initialConnection)
+        def commandCoreCursor = new CommandCursor<>(initialResults, 2, CODEC, null, connectionSource, initialConnection)
         def cursor = new CommandBatchCursor(TimeoutMode.CURSOR_LIFETIME, 100, operationContext, commandCoreCursor)
 
         when:
diff --git a/driver-core/src/test/unit/com/mongodb/internal/operation/CommandBatchCursorTest.java b/driver-core/src/test/unit/com/mongodb/internal/operation/CommandBatchCursorTest.java
index 78f65e04328..cdd0005d74d 100644
--- a/driver-core/src/test/unit/com/mongodb/internal/operation/CommandBatchCursorTest.java
+++ b/driver-core/src/test/unit/com/mongodb/internal/operation/CommandBatchCursorTest.java
@@ -43,11 +43,11 @@ class CommandBatchCursorTest {
     private static final Duration TIMEOUT = Duration.ofMillis(3_000);
     private OperationContext operationContext;
     private TimeoutContext timeoutContext;
-    private CoreCursor coreCursor;
+    private Cursor cursor;
 
     @BeforeEach
     void setUp() {
-        coreCursor = mock(CoreCursor.class);
+        cursor = mock(Cursor.class);
         timeoutContext = spy(new TimeoutContext(TimeoutSettings.create(
                 MongoClientSettings.builder().timeout(TIMEOUT.toMillis(), MILLISECONDS).build())));
         operationContext = spy(new OperationContext(
@@ -62,7 +62,7 @@ private CommandBatchCursor createBatchCursor(final long maxTimeMS) {
                 TimeoutMode.CURSOR_LIFETIME,
                 maxTimeMS,
                 operationContext,
-                coreCursor);
+                cursor);
     }
 
     @Test
@@ -79,7 +79,7 @@ void nextShouldUseTimeoutContextWithMaxTimeOverride() {
 
             // then verify that the `maxTimeMS` override was applied
             ArgumentCaptor operationContextArgumentCaptor = ArgumentCaptor.forClass(OperationContext.class);
-            verify(coreCursor).next(operationContextArgumentCaptor.capture());
+            verify(cursor).next(operationContextArgumentCaptor.capture());
             OperationContext operationContextForNext = operationContextArgumentCaptor.getValue();
             operationContextForNext.getTimeoutContext()
                     .runMaxTimeMS(remainingMillis -> assertEquals(maxTimeMS, remainingMillis, "MaxTieMs override not applied"));
@@ -100,7 +100,7 @@ void tryNextShouldUseTimeoutContextWithMaxTimeOverride() {
 
             // then verify that the `maxTimeMS` override was applied
             ArgumentCaptor operationContextArgumentCaptor = ArgumentCaptor.forClass(OperationContext.class);
-            verify(coreCursor).tryNext(operationContextArgumentCaptor.capture());
+            verify(cursor).tryNext(operationContextArgumentCaptor.capture());
             OperationContext operationContextForNext = operationContextArgumentCaptor.getValue();
             operationContextForNext.getTimeoutContext()
                     .runMaxTimeMS(remainingMillis -> assertEquals(maxTimeMS, remainingMillis, "MaxTieMs override not applied"));
@@ -119,7 +119,7 @@ void nextShouldNotUseTimeoutContextWithMaxTimeOverride() {
 
             // then verify that the `maxTimeMS` override was not applied
             ArgumentCaptor operationContextArgumentCaptor = ArgumentCaptor.forClass(OperationContext.class);
-            verify(coreCursor).next(operationContextArgumentCaptor.capture());
+            verify(cursor).next(operationContextArgumentCaptor.capture());
             OperationContext operationContextForNext = operationContextArgumentCaptor.getValue();
             operationContextForNext.getTimeoutContext().runMaxTimeMS(remainingMillis -> {
                 // verify that the `maxTimeMS` override was reset
@@ -141,7 +141,7 @@ void tryNextShouldNotUseTimeoutContextWithMaxTimeOverride() {
 
             // then verify that the `maxTimeMS` override was not applied
             ArgumentCaptor operationContextArgumentCaptor = ArgumentCaptor.forClass(OperationContext.class);
-            verify(coreCursor).tryNext(operationContextArgumentCaptor.capture());
+            verify(cursor).tryNext(operationContextArgumentCaptor.capture());
             OperationContext operationContextForNext = operationContextArgumentCaptor.getValue();
             operationContextForNext.getTimeoutContext().runMaxTimeMS(remainingMillis -> {
                 // verify that the `maxTimeMS` override was reset
@@ -163,7 +163,7 @@ void closeShouldResetTimeoutContextToDefaultMaxTime(final int maxTimeMS) {
 
             // then verify that the `maxTimeMS` override was not applied
             ArgumentCaptor operationContextArgumentCaptor = ArgumentCaptor.forClass(OperationContext.class);
-            verify(coreCursor).close(operationContextArgumentCaptor.capture());
+            verify(cursor).close(operationContextArgumentCaptor.capture());
             OperationContext operationContextForNext = operationContextArgumentCaptor.getValue();
             operationContextForNext.getTimeoutContext().runMaxTimeMS(remainingMillis -> {
                 // verify that the `maxTimeMS` override was reset
diff --git a/driver-core/src/test/unit/com/mongodb/internal/operation/CommandCoreCursorTest.java b/driver-core/src/test/unit/com/mongodb/internal/operation/CommandCursorTest.java
similarity index 92%
rename from driver-core/src/test/unit/com/mongodb/internal/operation/CommandCoreCursorTest.java
rename to driver-core/src/test/unit/com/mongodb/internal/operation/CommandCursorTest.java
index b6b7e22a616..b59c47f7b60 100644
--- a/driver-core/src/test/unit/com/mongodb/internal/operation/CommandCoreCursorTest.java
+++ b/driver-core/src/test/unit/com/mongodb/internal/operation/CommandCursorTest.java
@@ -58,7 +58,7 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-class CommandCoreCursorTest {
+class CommandCursorTest {
     private static final MongoNamespace NAMESPACE = new MongoNamespace("test", "test");
     private static final BsonInt64 CURSOR_ID = new BsonInt64(1);
     private static final BsonDocument COMMAND_CURSOR_DOCUMENT = new BsonDocument("ok", new BsonInt32(1))
@@ -110,12 +110,12 @@ void shouldSkipKillsCursorsCommandWhenNetworkErrorOccurs() {
                 new MongoSocketException("test", new ServerAddress()));
         when(serverDescription.getType()).thenReturn(ServerType.LOAD_BALANCER);
 
-        CoreCursor coreCursor = createCoreCursor();
+        Cursor cursor = createCoreCursor();
         //when
-        assertThrows(MongoSocketException.class, () -> coreCursor.next(operationContext));
+        assertThrows(MongoSocketException.class, () -> cursor.next(operationContext));
 
         //then
-        coreCursor.close(operationContext);
+        cursor.close(operationContext);
         verify(mockConnection, times(1)).command(eq(NAMESPACE.getDatabaseName()), any(), any(), any(), any(), any());
     }
 
@@ -126,12 +126,12 @@ void shouldNotSkipKillsCursorsCommandWhenTimeoutExceptionDoesNotHaveNetworkError
                 new MongoOperationTimeoutException("test"));
         when(serverDescription.getType()).thenReturn(ServerType.LOAD_BALANCER);
 
-        CoreCursor coreCursor = createCoreCursor();
+        Cursor cursor = createCoreCursor();
 
         //when
-        assertThrows(MongoOperationTimeoutException.class, () -> coreCursor.next(operationContext));
+        assertThrows(MongoOperationTimeoutException.class, () -> cursor.next(operationContext));
 
-        coreCursor.close(operationContext);
+        cursor.close(operationContext);
 
 
         //then
@@ -150,11 +150,11 @@ void shouldSkipKillsCursorsCommandWhenTimeoutExceptionHaveNetworkErrorCause() {
                 new MongoOperationTimeoutException("test", new MongoSocketException("test", new ServerAddress())));
         when(serverDescription.getType()).thenReturn(ServerType.LOAD_BALANCER);
 
-        CoreCursor coreCursor = createCoreCursor();
+        Cursor cursor = createCoreCursor();
 
         //when
-        assertThrows(MongoOperationTimeoutException.class, () -> coreCursor.next(operationContext));
-        coreCursor.close(operationContext);
+        assertThrows(MongoOperationTimeoutException.class, () -> cursor.next(operationContext));
+        cursor.close(operationContext);
 
         //then
         verify(mockConnection, times(1)).command(any(),
@@ -165,8 +165,8 @@ void shouldSkipKillsCursorsCommandWhenTimeoutExceptionHaveNetworkErrorCause() {
                 argThat(bsonDocument -> bsonDocument.containsKey("killCursors")), any(), any(), any(), any());
     }
 
-    private CoreCursor createCoreCursor() {
-        return new CommandCoreCursor<>(
+    private Cursor createCoreCursor() {
+        return new CommandCursor<>(
                 COMMAND_CURSOR_DOCUMENT,
                 0,
                 DOCUMENT_CODEC,
diff --git a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/MapReducePublisherImpl.java b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/MapReducePublisherImpl.java
index aa1100d7791..6d5880b20df 100644
--- a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/MapReducePublisherImpl.java
+++ b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/MapReducePublisherImpl.java
@@ -243,11 +243,6 @@ public String getCommandName() {
             return operation.getCommandName();
         }
 
-        @Override
-        public BatchCursor execute(final ReadBinding binding, final OperationContext operationContext) {
-            throw new UnsupportedOperationException("This operation is async only");
-        }
-
         @Override
         public void executeAsync(final AsyncReadBinding binding, final OperationContext operationContext, final SingleResultCallback> callback) {
             operation.executeAsync(binding, operationContext, callback::onResult);
diff --git a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/ReadOperationCursorAsyncOnly.java b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/ReadOperationCursorAsyncOnly.java
index c1a28e1849e..1d8a5e08541 100644
--- a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/ReadOperationCursorAsyncOnly.java
+++ b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/ReadOperationCursorAsyncOnly.java
@@ -17,12 +17,13 @@
 package com.mongodb.reactivestreams.client.internal;
 
 import com.mongodb.internal.binding.ReadBinding;
+import com.mongodb.internal.connection.OperationContext;
 import com.mongodb.internal.operation.BatchCursor;
 import com.mongodb.internal.operation.ReadOperationCursor;
 
 public interface ReadOperationCursorAsyncOnly extends ReadOperationCursor {
 
-    default BatchCursor execute(final ReadBinding binding) {
+    default BatchCursor execute(final ReadBinding binding, final OperationContext operationContext) {
         throw new UnsupportedOperationException("This operation is async only");
     }
 
diff --git a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/VoidReadOperationThenCursorReadOperation.java b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/VoidReadOperationThenCursorReadOperation.java
index 884e037165f..46aaaf959a4 100644
--- a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/VoidReadOperationThenCursorReadOperation.java
+++ b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/VoidReadOperationThenCursorReadOperation.java
@@ -48,11 +48,6 @@ public String getCommandName() {
         return readOperation.getCommandName();
     }
 
-    @Override
-    public BatchCursor execute(final ReadBinding binding, final OperationContext operationContext) {
-        throw new UnsupportedOperationException("This operation is async only");
-    }
-
     @Override
     public void executeAsync(final AsyncReadBinding binding, final OperationContext operationContext, final SingleResultCallback> callback) {
         readOperation.executeAsync(binding, operationContext, (result, t) -> {
diff --git a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/VoidWriteOperationThenCursorReadOperation.java b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/VoidWriteOperationThenCursorReadOperation.java
index 80eb33048d9..16bb74a7ea9 100644
--- a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/VoidWriteOperationThenCursorReadOperation.java
+++ b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/VoidWriteOperationThenCursorReadOperation.java
@@ -41,11 +41,6 @@ public String getCommandName() {
         return writeOperation.getCommandName();
     }
 
-    @Override
-    public BatchCursor execute(final ReadBinding binding, final OperationContext operationContext) {
-        throw new UnsupportedOperationException("This operation is async only");
-    }
-
     @Override
     public void executeAsync(final AsyncReadBinding binding, final OperationContext operationContext, final SingleResultCallback> callback) {
         writeOperation.executeAsync((AsyncWriteBinding) binding, operationContext,  (result, t) -> {
diff --git a/driver-reactive-streams/src/test/resources/logback-test.xml b/driver-reactive-streams/src/test/resources/logback-test.xml
index b25f68499b2..022806f0e4e 100644
--- a/driver-reactive-streams/src/test/resources/logback-test.xml
+++ b/driver-reactive-streams/src/test/resources/logback-test.xml
@@ -6,7 +6,7 @@
         
     
 
-    
+    
         
     
 
diff --git a/driver-sync/src/test/resources/logback-test.xml b/driver-sync/src/test/resources/logback-test.xml
index b25f68499b2..022806f0e4e 100644
--- a/driver-sync/src/test/resources/logback-test.xml
+++ b/driver-sync/src/test/resources/logback-test.xml
@@ -6,7 +6,7 @@
         
     
 
-    
+    
         
     
 

From 58a9619bd6be9e13883ea661b7821d490d06c315 Mon Sep 17 00:00:00 2001
From: "slav.babanin" 
Date: Wed, 17 Sep 2025 06:18:50 -0700
Subject: [PATCH 24/36] Consolidate connection establishment SessionContext
 creation.

---
 .../internal/binding/AsyncClusterBinding.java        | 10 +---------
 .../com/mongodb/internal/binding/ClusterBinding.java | 10 +---------
 .../mongodb/internal/connection/Authenticator.java   |  9 ++-------
 .../internal/connection/OidcAuthenticator.java       |  4 ++--
 .../internal/connection/OperationContext.java        | 12 ++++++++++++
 5 files changed, 18 insertions(+), 27 deletions(-)

diff --git a/driver-core/src/main/com/mongodb/internal/binding/AsyncClusterBinding.java b/driver-core/src/main/com/mongodb/internal/binding/AsyncClusterBinding.java
index c04cd58dec7..cc4c00fce9c 100644
--- a/driver-core/src/main/com/mongodb/internal/binding/AsyncClusterBinding.java
+++ b/driver-core/src/main/com/mongodb/internal/binding/AsyncClusterBinding.java
@@ -16,7 +16,6 @@
 
 package com.mongodb.internal.binding;
 
-import com.mongodb.ReadConcern;
 import com.mongodb.ReadPreference;
 import com.mongodb.ServerAddress;
 import com.mongodb.connection.ClusterConnectionMode;
@@ -25,7 +24,6 @@
 import com.mongodb.internal.connection.AsyncConnection;
 import com.mongodb.internal.connection.Cluster;
 import com.mongodb.internal.connection.OperationContext;
-import com.mongodb.internal.connection.ReadConcernAwareNoOpSessionContext;
 import com.mongodb.internal.connection.Server;
 import com.mongodb.internal.selector.ReadPreferenceServerSelector;
 import com.mongodb.internal.selector.ReadPreferenceWithFallbackServerSelector;
@@ -146,13 +144,7 @@ public ReadPreference getReadPreference() {
 
         @Override
         public void getConnection(final OperationContext operationContext, final SingleResultCallback callback) {
-            /*
-             The first read in a causally consistent session MUST not send afterClusterTime to the server
-             (because the operationTime has not yet been determined). Therefore, we use ReadConcernAwareNoOpSessionContext
-             so that we do not advance clusterTime on ClientSession in given operationContext because it might not be yet set.
-             */
-            ReadConcern readConcern = operationContext.getSessionContext().getReadConcern();
-            server.getConnectionAsync(operationContext.withSessionContext(new ReadConcernAwareNoOpSessionContext(readConcern)), callback);
+            server.getConnectionAsync(operationContext.withConnectionEstablishmentSessionContext(), callback);
         }
 
         public AsyncConnectionSource retain() {
diff --git a/driver-core/src/main/com/mongodb/internal/binding/ClusterBinding.java b/driver-core/src/main/com/mongodb/internal/binding/ClusterBinding.java
index e6e1804c87f..6b7af04107e 100644
--- a/driver-core/src/main/com/mongodb/internal/binding/ClusterBinding.java
+++ b/driver-core/src/main/com/mongodb/internal/binding/ClusterBinding.java
@@ -16,7 +16,6 @@
 
 package com.mongodb.internal.binding;
 
-import com.mongodb.ReadConcern;
 import com.mongodb.ReadPreference;
 import com.mongodb.ServerAddress;
 import com.mongodb.connection.ClusterConnectionMode;
@@ -24,7 +23,6 @@
 import com.mongodb.internal.connection.Cluster;
 import com.mongodb.internal.connection.Connection;
 import com.mongodb.internal.connection.OperationContext;
-import com.mongodb.internal.connection.ReadConcernAwareNoOpSessionContext;
 import com.mongodb.internal.connection.Server;
 import com.mongodb.internal.connection.ServerTuple;
 import com.mongodb.internal.selector.ReadPreferenceServerSelector;
@@ -125,13 +123,7 @@ public ReadPreference getReadPreference() {
 
         @Override
         public Connection getConnection(final OperationContext operationContext) {
-            /*
-             The first read in a causally consistent session MUST not send afterClusterTime to the server
-             (because the operationTime has not yet been determined). Therefore, we use ReadConcernAwareNoOpSessionContext
-             so that we do not advance clusterTime on ClientSession in given operationContext because it might not be yet set.
-             */
-            ReadConcern readConcern = operationContext.getSessionContext().getReadConcern();
-            return server.getConnection(operationContext.withSessionContext(new ReadConcernAwareNoOpSessionContext(readConcern)));
+            return server.getConnection(operationContext.withConnectionEstablishmentSessionContext());
         }
 
         public ConnectionSource retain() {
diff --git a/driver-core/src/main/com/mongodb/internal/connection/Authenticator.java b/driver-core/src/main/com/mongodb/internal/connection/Authenticator.java
index 2889a938709..3ba899e0d79 100644
--- a/driver-core/src/main/com/mongodb/internal/connection/Authenticator.java
+++ b/driver-core/src/main/com/mongodb/internal/connection/Authenticator.java
@@ -103,18 +103,13 @@ abstract void authenticateAsync(InternalConnection connection, ConnectionDescrip
             OperationContext operationContext, SingleResultCallback callback);
 
     public void reauthenticate(final InternalConnection connection, final OperationContext operationContext) {
-        authenticate(connection, connection.getDescription(), operationContextWithoutSession(operationContext));
+        authenticate(connection, connection.getDescription(), operationContext.withConnectionEstablishmentSessionContext());
     }
 
     public void reauthenticateAsync(final InternalConnection connection, final OperationContext operationContext,
                                     final SingleResultCallback callback) {
         beginAsync().thenRun((c) -> {
-            authenticateAsync(connection, connection.getDescription(), operationContextWithoutSession(operationContext), c);
+            authenticateAsync(connection, connection.getDescription(), operationContext.withConnectionEstablishmentSessionContext(), c);
         }).finish(callback);
     }
-
-    static OperationContext operationContextWithoutSession(final OperationContext operationContext) {
-        return operationContext.withSessionContext(
-                new ReadConcernAwareNoOpSessionContext(operationContext.getSessionContext().getReadConcern()));
-    }
 }
diff --git a/driver-core/src/main/com/mongodb/internal/connection/OidcAuthenticator.java b/driver-core/src/main/com/mongodb/internal/connection/OidcAuthenticator.java
index 87f48b3308b..f8c7f3ea893 100644
--- a/driver-core/src/main/com/mongodb/internal/connection/OidcAuthenticator.java
+++ b/driver-core/src/main/com/mongodb/internal/connection/OidcAuthenticator.java
@@ -272,7 +272,7 @@ static OidcCallback getGcpCallback(final MongoCredential credential) {
     @Override
     public void reauthenticate(final InternalConnection connection, final OperationContext operationContext) {
         assertTrue(connection.opened());
-        authenticationLoop(connection, connection.getDescription(), operationContextWithoutSession(operationContext));
+        authenticationLoop(connection, connection.getDescription(), operationContext.withConnectionEstablishmentSessionContext());
     }
 
     @Override
@@ -281,7 +281,7 @@ public void reauthenticateAsync(final InternalConnection connection,
                                     final SingleResultCallback callback) {
         beginAsync().thenRun(c -> {
             assertTrue(connection.opened());
-            authenticationLoopAsync(connection, connection.getDescription(), operationContextWithoutSession(operationContext), c);
+            authenticationLoopAsync(connection, connection.getDescription(), operationContext.withConnectionEstablishmentSessionContext(), c);
         }).finish(callback);
     }
 
diff --git a/driver-core/src/main/com/mongodb/internal/connection/OperationContext.java b/driver-core/src/main/com/mongodb/internal/connection/OperationContext.java
index 3338604e79c..d33dd5007f7 100644
--- a/driver-core/src/main/com/mongodb/internal/connection/OperationContext.java
+++ b/driver-core/src/main/com/mongodb/internal/connection/OperationContext.java
@@ -17,6 +17,7 @@
 
 import com.mongodb.Function;
 import com.mongodb.MongoConnectionPoolClearedException;
+import com.mongodb.ReadConcern;
 import com.mongodb.RequestContext;
 import com.mongodb.ServerAddress;
 import com.mongodb.ServerApi;
@@ -166,6 +167,17 @@ public OperationContext withNewlyStartedTimeout() {
         return withTimeoutContext(timeoutContext.withNewlyStartedTimeout());
     }
 
+    /**
+     * Create a new OperationContext with a SessionContext that does not send a session ID.
+     * 

+     * The driver MUST NOT append a session ID to any command sent during the process of
+     * opening and authenticating a connection.
+     */
+    public OperationContext withConnectionEstablishmentSessionContext() {
+        ReadConcern readConcern = getSessionContext().getReadConcern();
+        return withSessionContext(new ReadConcernAwareNoOpSessionContext(readConcern));
+    }
+
     public OperationContext withMinRoundTripTime(final ServerDescription serverDescription) {
         return withTimeoutContext(timeoutContext.withMinRoundTripTime(TimeUnit.NANOSECONDS.toMillis(serverDescription.getMinRoundTripTimeNanos())));
     }

From 0b6d0413daf24b1238f0f1906c8f16bce2717ec5 Mon Sep 17 00:00:00 2001
From: "slav.babanin" 
Date: Wed, 17 Sep 2025 07:53:56 -0700
Subject: [PATCH 25/36] Refactor ChangeStreamBatchCursor to use
 initialOperationContext.

---
 .../AsyncChangeStreamBatchCursor.java         |  3 ++
 .../operation/ChangeStreamBatchCursor.java    | 38 +++++++++----------
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/driver-core/src/main/com/mongodb/internal/operation/AsyncChangeStreamBatchCursor.java b/driver-core/src/main/com/mongodb/internal/operation/AsyncChangeStreamBatchCursor.java
index 89704035223..6d5f76eccb2 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/AsyncChangeStreamBatchCursor.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/AsyncChangeStreamBatchCursor.java
@@ -44,6 +44,9 @@
 
 final class AsyncChangeStreamBatchCursor implements AsyncAggregateResponseBatchCursor {
     private final AsyncReadBinding binding;
+    /**
+     * The initial operation context, which is used as an initial state to create new operation contexts for each operation.
+     */
     private final OperationContext initialOperationContext;
     private final ChangeStreamOperation changeStreamOperation;
     private final int maxWireVersion;
diff --git a/driver-core/src/main/com/mongodb/internal/operation/ChangeStreamBatchCursor.java b/driver-core/src/main/com/mongodb/internal/operation/ChangeStreamBatchCursor.java
index 70f4b8f4ac4..4b6467f76a8 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/ChangeStreamBatchCursor.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/ChangeStreamBatchCursor.java
@@ -33,8 +33,8 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.function.BiFunction;
 import java.util.function.Consumer;
-import java.util.function.Function;
 
 import static com.mongodb.assertions.Assertions.assertNotNull;
 import static com.mongodb.internal.operation.ChangeStreamBatchCursorHelper.isResumableError;
@@ -57,7 +57,10 @@
  */
 final class ChangeStreamBatchCursor implements AggregateResponseBatchCursor {
     private ReadBinding binding;
-    private OperationContext operationContext;
+    /**
+     * The initial operation context, which is used as an initial state to create new operation contexts for each operation.
+     */
+    private final OperationContext initialOperationContext;
     private final ChangeStreamOperation changeStreamOperation;
     private final int maxWireVersion;
     private Cursor wrapped;
@@ -74,12 +77,12 @@ final class ChangeStreamBatchCursor implements AggregateResponseBatchCursor changeStreamOperation,
                             final Cursor wrapped,
                             final ReadBinding binding,
-                            final OperationContext operationContext,
+                            final OperationContext initialOperationContext,
                             @Nullable final BsonDocument resumeToken,
                             final int maxWireVersion) {
         this.changeStreamOperation = changeStreamOperation;
         this.binding = binding.retain();
-        this.operationContext = operationContext.withOverride(TimeoutContext::withMaxTimeAsMaxAwaitTimeOverride);
+        this.initialOperationContext = initialOperationContext.withOverride(TimeoutContext::withMaxTimeAsMaxAwaitTimeOverride);
         this.wrapped = wrapped;
         this.resumeToken = resumeToken;
         this.maxWireVersion = maxWireVersion;
@@ -93,7 +96,7 @@ Cursor getWrapped() {
 
     @Override
     public boolean hasNext() {
-        return resumeableOperation(coreCursor -> {
+        return resumeableOperation((coreCursor, operationContext) -> {
             try {
                 return coreCursor.hasNext(operationContext);
             } finally {
@@ -104,7 +107,7 @@ public boolean hasNext() {
 
     @Override
     public List next() {
-        return resumeableOperation(coreCursor -> {
+        return resumeableOperation((coreCursor, operationContext) -> {
             try {
                 return convertAndProduceLastId(coreCursor.next(operationContext), changeStreamOperation.getDecoder(),
                         lastId -> resumeToken = lastId);
@@ -114,10 +117,6 @@ public List next() {
         });
     }
 
-    private void restartTimeout() {
-        operationContext = operationContext.withNewlyStartedTimeout();
-    }
-
     @Override
     public int available() {
         return wrapped.available();
@@ -125,7 +124,7 @@ public int available() {
 
     @Override
     public List tryNext() {
-        return resumeableOperation(coreCursor -> {
+        return resumeableOperation((coreCursor, operationContext) -> {
             try {
                 List tryNext = coreCursor.tryNext(operationContext);
                 return tryNext == null ? null
@@ -139,7 +138,7 @@ public List tryNext() {
     @Override
     public void close() {
         if (!closed.getAndSet(true)) {
-            wrapped.close(operationContext);
+            wrapped.close(initialOperationContext);
             binding.release();
         }
     }
@@ -215,10 +214,10 @@ static  List convertAndProduceLastId(final List rawDocume
         return results;
     }
 
-     R resumeableOperation(final Function, R> function) {
-        restartTimeout();
+     R resumeableOperation(final BiFunction, OperationContext, R> function) {
+        OperationContext operationContextWithNewlyStartedTimeout = initialOperationContext.withNewlyStartedTimeout();
         try {
-            R result = execute(function);
+            R result = execute(function, operationContextWithNewlyStartedTimeout);
             lastOperationTimedOut = false;
             return result;
         } catch (Throwable exception) {
@@ -227,14 +226,15 @@  R resumeableOperation(final Function, R> function) {
         }
     }
 
-    private  R execute(final Function, R> function) {
+    private  R execute(final BiFunction, OperationContext, R> function,
+                          final OperationContext operationContext) {
         boolean shouldBeResumed = hasPreviousNextTimedOut();
         while (true) {
             if (shouldBeResumed) {
-                resumeChangeStream();
+                resumeChangeStream(operationContext);
             }
             try {
-                return function.apply(wrapped);
+                return function.apply(wrapped, operationContext);
             } catch (Throwable t) {
                 if (!isResumableError(t, maxWireVersion)) {
                     throw MongoException.fromThrowableNonNull(t);
@@ -244,7 +244,7 @@ private  R execute(final Function, R> function) {
         }
     }
 
-    private void resumeChangeStream() {
+    private void resumeChangeStream(final OperationContext operationContext) {
         OperationContext operationContextWithDefaultMaxTime = operationContext
                 .withTimeoutContext(operationContext.getTimeoutContext().withDefaultMaxTime());
 

From 0e4accd09911971035012db2b8de85bcb48aff5f Mon Sep 17 00:00:00 2001
From: Viacheslav Babanin 
Date: Tue, 23 Sep 2025 04:26:37 -0700
Subject: [PATCH 26/36] Update
 driver-core/src/main/com/mongodb/internal/operation/AsyncChangeStreamBatchCursor.java

Co-authored-by: Ross Lawley 
---
 .../internal/operation/AsyncChangeStreamBatchCursor.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/driver-core/src/main/com/mongodb/internal/operation/AsyncChangeStreamBatchCursor.java b/driver-core/src/main/com/mongodb/internal/operation/AsyncChangeStreamBatchCursor.java
index 6d5f76eccb2..608a8932dca 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/AsyncChangeStreamBatchCursor.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/AsyncChangeStreamBatchCursor.java
@@ -63,7 +63,7 @@ final class AsyncChangeStreamBatchCursor implements AsyncAggregateResponseBat
     AsyncChangeStreamBatchCursor(final ChangeStreamOperation changeStreamOperation,
                                  final AsyncCursor wrapped,
                                  final AsyncReadBinding binding,
-                                 final OperationContext initialOperationContext,
+                                 final OperationContext operationContext,
                                  @Nullable final BsonDocument resumeToken,
                                  final int maxWireVersion) {
         this.changeStreamOperation = changeStreamOperation;

From 3f7991eab9b0619c34f829c9c61860d87f201daf Mon Sep 17 00:00:00 2001
From: Viacheslav Babanin 
Date: Tue, 23 Sep 2025 04:27:13 -0700
Subject: [PATCH 27/36] Update
 driver-core/src/main/com/mongodb/internal/operation/AsyncChangeStreamBatchCursor.java

Co-authored-by: Ross Lawley 
---
 .../internal/operation/AsyncChangeStreamBatchCursor.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/driver-core/src/main/com/mongodb/internal/operation/AsyncChangeStreamBatchCursor.java b/driver-core/src/main/com/mongodb/internal/operation/AsyncChangeStreamBatchCursor.java
index 608a8932dca..92e090b7251 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/AsyncChangeStreamBatchCursor.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/AsyncChangeStreamBatchCursor.java
@@ -70,7 +70,7 @@ final class AsyncChangeStreamBatchCursor implements AsyncAggregateResponseBat
         this.wrapped = new AtomicReference<>(assertNotNull(wrapped));
         this.binding = binding;
         binding.retain();
-        this.initialOperationContext = initialOperationContext.withOverride(TimeoutContext::withMaxTimeAsMaxAwaitTimeOverride);
+        this.initialOperationContext = operationContext.withOverride(TimeoutContext::withMaxTimeAsMaxAwaitTimeOverride);
         this.resumeToken = resumeToken;
         this.maxWireVersion = maxWireVersion;
         isClosed = new AtomicBoolean();

From 4509d9c87bbe39544978a2eb17a736f9a8c05c53 Mon Sep 17 00:00:00 2001
From: Viacheslav Babanin 
Date: Tue, 23 Sep 2025 04:27:57 -0700
Subject: [PATCH 28/36] Update
 driver-core/src/main/com/mongodb/internal/operation/AsyncChangeStreamBatchCursor.java

Co-authored-by: Ross Lawley 
---
 .../internal/operation/AsyncChangeStreamBatchCursor.java       | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/driver-core/src/main/com/mongodb/internal/operation/AsyncChangeStreamBatchCursor.java b/driver-core/src/main/com/mongodb/internal/operation/AsyncChangeStreamBatchCursor.java
index 92e090b7251..89c30a22a05 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/AsyncChangeStreamBatchCursor.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/AsyncChangeStreamBatchCursor.java
@@ -83,8 +83,7 @@ AsyncCursor getWrapped() {
 
     @Override
     public void next(final SingleResultCallback> callback) {
-        OperationContext operationContext = initialOperationContext.withNewlyStartedTimeout();
-        resumeableOperation(AsyncCursor::next, callback, operationContext, false);
+        resumeableOperation(AsyncCursor::next, callback, initialOperationContext.withNewlyStartedTimeout(), false);
     }
 
     @Override

From 9e3324a2907c23ced2822f3822299795d21e80c7 Mon Sep 17 00:00:00 2001
From: Viacheslav Babanin 
Date: Tue, 23 Sep 2025 04:28:06 -0700
Subject: [PATCH 29/36] Update
 driver-core/src/main/com/mongodb/internal/operation/ChangeStreamBatchCursor.java

Co-authored-by: Ross Lawley 
---
 .../com/mongodb/internal/operation/ChangeStreamBatchCursor.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/driver-core/src/main/com/mongodb/internal/operation/ChangeStreamBatchCursor.java b/driver-core/src/main/com/mongodb/internal/operation/ChangeStreamBatchCursor.java
index 4b6467f76a8..2c5f7e3a08f 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/ChangeStreamBatchCursor.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/ChangeStreamBatchCursor.java
@@ -77,7 +77,7 @@ final class ChangeStreamBatchCursor implements AggregateResponseBatchCursor changeStreamOperation,
                             final Cursor wrapped,
                             final ReadBinding binding,
-                            final OperationContext initialOperationContext,
+                            final OperationContext operationContext,
                             @Nullable final BsonDocument resumeToken,
                             final int maxWireVersion) {
         this.changeStreamOperation = changeStreamOperation;

From 3d00c7e0ea3d1cde0ba9bbd8f8ca265f82b3f619 Mon Sep 17 00:00:00 2001
From: Viacheslav Babanin 
Date: Tue, 23 Sep 2025 04:29:01 -0700
Subject: [PATCH 30/36] Update
 driver-core/src/main/com/mongodb/internal/operation/AsyncChangeStreamBatchCursor.java

Co-authored-by: Ross Lawley 
---
 .../internal/operation/AsyncChangeStreamBatchCursor.java | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/driver-core/src/main/com/mongodb/internal/operation/AsyncChangeStreamBatchCursor.java b/driver-core/src/main/com/mongodb/internal/operation/AsyncChangeStreamBatchCursor.java
index 89c30a22a05..5bbd0ad0be7 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/AsyncChangeStreamBatchCursor.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/AsyncChangeStreamBatchCursor.java
@@ -1,5 +1,12 @@
 package com.mongodb.internal.operation;
 
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
 /*
  * Copyright 2008-present MongoDB, Inc.
  *
@@ -16,6 +23,8 @@
  * limitations under the License.
  */
 
+package com.mongodb.internal.operation;
+
 
 import com.mongodb.MongoException;
 import com.mongodb.internal.TimeoutContext;

From 3d5df6a2f9ea71fda1dd0122031b5463ba511981 Mon Sep 17 00:00:00 2001
From: "slav.babanin" 
Date: Tue, 23 Sep 2025 04:35:15 -0700
Subject: [PATCH 31/36] Improve clarity in variable naming.

---
 .../AsyncChangeStreamBatchCursor.java         |  2 --
 .../operation/ChangeStreamBatchCursor.java    | 20 +++++++++----------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/driver-core/src/main/com/mongodb/internal/operation/AsyncChangeStreamBatchCursor.java b/driver-core/src/main/com/mongodb/internal/operation/AsyncChangeStreamBatchCursor.java
index 5bbd0ad0be7..0f4bafe4d66 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/AsyncChangeStreamBatchCursor.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/AsyncChangeStreamBatchCursor.java
@@ -1,5 +1,3 @@
-package com.mongodb.internal.operation;
-
 /*
  * Copyright 2008-present MongoDB, Inc.
  *
diff --git a/driver-core/src/main/com/mongodb/internal/operation/ChangeStreamBatchCursor.java b/driver-core/src/main/com/mongodb/internal/operation/ChangeStreamBatchCursor.java
index 2c5f7e3a08f..7fe3ee68481 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/ChangeStreamBatchCursor.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/ChangeStreamBatchCursor.java
@@ -82,7 +82,7 @@ final class ChangeStreamBatchCursor implements AggregateResponseBatchCursor getWrapped() {
 
     @Override
     public boolean hasNext() {
-        return resumeableOperation((coreCursor, operationContext) -> {
+        return resumeableOperation((cursor, operationContext) -> {
             try {
-                return coreCursor.hasNext(operationContext);
+                return cursor.hasNext(operationContext);
             } finally {
-                cachePostBatchResumeToken(coreCursor);
+                cachePostBatchResumeToken(cursor);
             }
         });
     }
 
     @Override
     public List next() {
-        return resumeableOperation((coreCursor, operationContext) -> {
+        return resumeableOperation((cursor, operationContext) -> {
             try {
-                return convertAndProduceLastId(coreCursor.next(operationContext), changeStreamOperation.getDecoder(),
+                return convertAndProduceLastId(cursor.next(operationContext), changeStreamOperation.getDecoder(),
                         lastId -> resumeToken = lastId);
             } finally {
-                cachePostBatchResumeToken(coreCursor);
+                cachePostBatchResumeToken(cursor);
             }
         });
     }
@@ -124,13 +124,13 @@ public int available() {
 
     @Override
     public List tryNext() {
-        return resumeableOperation((coreCursor, operationContext) -> {
+        return resumeableOperation((cursor, operationContext) -> {
             try {
-                List tryNext = coreCursor.tryNext(operationContext);
+                List tryNext = cursor.tryNext(operationContext);
                 return tryNext == null ? null
                         : convertAndProduceLastId(tryNext, changeStreamOperation.getDecoder(), lastId -> resumeToken = lastId);
             } finally {
-                cachePostBatchResumeToken(coreCursor);
+                cachePostBatchResumeToken(cursor);
             }
         });
     }

From 392fce31c916d91b3950ac009f5f93a0efbbcda2 Mon Sep 17 00:00:00 2001
From: "slav.babanin" 
Date: Tue, 23 Sep 2025 07:15:07 -0700
Subject: [PATCH 32/36] Address TODOs.

---
 .../AbstractWriteSearchIndexOperation.java       |  6 ++----
 .../operation/ChangeStreamBatchCursor.java       |  1 -
 .../mongodb/internal/binding/SessionBinding.java |  2 --
 .../ClientSessionBindingSpecification.groovy     | 16 ----------------
 .../client/internal/MongoClusterImpl.java        |  8 ++++----
 .../ClientSessionBindingSpecification.groovy     | 16 ----------------
 6 files changed, 6 insertions(+), 43 deletions(-)

diff --git a/driver-core/src/main/com/mongodb/internal/operation/AbstractWriteSearchIndexOperation.java b/driver-core/src/main/com/mongodb/internal/operation/AbstractWriteSearchIndexOperation.java
index 010b9ca5f70..18c24b2ff28 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/AbstractWriteSearchIndexOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/AbstractWriteSearchIndexOperation.java
@@ -67,11 +67,9 @@ public void executeAsync(final AsyncWriteBinding binding, final OperationContext
                                 writeConcernErrorTransformerAsync(operationContextWithMinRtt.getTimeoutContext()), (result, commandExecutionError) -> {
                                     try {
                                         swallowOrThrow(commandExecutionError);
-                                        // TODO-JAVA-5640 why call callback and not cb?
-                                        callback.onResult(result, null);
+                                        cb.onResult(result, null);
                                     } catch (Throwable mongoCommandException) {
-                                        // TODO-JAVA-5640 why call callback and not cb?
-                                        callback.onResult(null, mongoCommandException);
+                                        cb.onResult(null, mongoCommandException);
                                     }
                                 }
                         ));
diff --git a/driver-core/src/main/com/mongodb/internal/operation/ChangeStreamBatchCursor.java b/driver-core/src/main/com/mongodb/internal/operation/ChangeStreamBatchCursor.java
index 7fe3ee68481..a750637a10e 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/ChangeStreamBatchCursor.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/ChangeStreamBatchCursor.java
@@ -249,7 +249,6 @@ private void resumeChangeStream(final OperationContext operationContext) {
                 .withTimeoutContext(operationContext.getTimeoutContext().withDefaultMaxTime());
 
         wrapped.close(operationContextWithDefaultMaxTime);
-        // TODO-JAVA-5640 why do we initiate server selection here just to get server description and then ignore the selected server further on line 259? So we do two server selections?
         withReadConnectionSource(binding, operationContext, (source, operationContextWithMinRtt) -> {
             changeStreamOperation.setChangeStreamOptionsForResume(resumeToken, source.getServerDescription().getMaxWireVersion());
             return null;
diff --git a/driver-core/src/test/functional/com/mongodb/internal/binding/SessionBinding.java b/driver-core/src/test/functional/com/mongodb/internal/binding/SessionBinding.java
index d8bf158d82e..b27acefbda3 100644
--- a/driver-core/src/test/functional/com/mongodb/internal/binding/SessionBinding.java
+++ b/driver-core/src/test/functional/com/mongodb/internal/binding/SessionBinding.java
@@ -28,8 +28,6 @@ public class SessionBinding implements ReadWriteBinding {
 
     public SessionBinding(final ReadWriteBinding wrapped) {
         this.wrapped = notNull("wrapped", wrapped);
-        // TODO-JAVA-5640
-       // this.operationContext = wrapped.getOperationContext().withSessionContext(new SimpleSessionContext());
     }
 
     @Override
diff --git a/driver-reactive-streams/src/test/unit/com/mongodb/reactivestreams/client/internal/ClientSessionBindingSpecification.groovy b/driver-reactive-streams/src/test/unit/com/mongodb/reactivestreams/client/internal/ClientSessionBindingSpecification.groovy
index dd3b4b29f08..cfe66a8031f 100644
--- a/driver-reactive-streams/src/test/unit/com/mongodb/reactivestreams/client/internal/ClientSessionBindingSpecification.groovy
+++ b/driver-reactive-streams/src/test/unit/com/mongodb/reactivestreams/client/internal/ClientSessionBindingSpecification.groovy
@@ -132,22 +132,6 @@ class ClientSessionBindingSpecification extends Specification {
         0 * session.close()
     }
 
-    // TODO-JAVA-5640 move to SessionContext test
-//    def 'owned session is implicit'() {
-//        given:
-//        def session = Mock(ClientSession)
-//        def wrappedBinding = createStubBinding()
-//
-//        when:
-//        def binding = new ClientSessionBinding(session, ownsSession, wrappedBinding)
-//
-//        then:
-//        binding.getOperationContext(_).getSessionContext().isImplicitSession() == ownsSession
-//
-//        where:
-//        ownsSession << [true, false]
-//    }
-
     private AsyncClusterAwareReadWriteBinding createStubBinding() {
         def cluster = Mock(Cluster) {
             selectServerAsync(_, _, _) >> {
diff --git a/driver-sync/src/main/com/mongodb/client/internal/MongoClusterImpl.java b/driver-sync/src/main/com/mongodb/client/internal/MongoClusterImpl.java
index 77d217f5c99..78aa95610ad 100644
--- a/driver-sync/src/main/com/mongodb/client/internal/MongoClusterImpl.java
+++ b/driver-sync/src/main/com/mongodb/client/internal/MongoClusterImpl.java
@@ -416,9 +416,10 @@ public  T execute(final ReadOperation operation, final ReadPreference r
             }
 
             ClientSession actualClientSession = getClientSession(session);
+            boolean implicitSession = isImplicitSession(session);
             OperationContext operationContext = getOperationContext(actualClientSession, readConcern, operation.getCommandName())
-                    .withSessionContext(new ClientSessionBinding.SyncClientSessionContext(actualClientSession, readConcern, isImplicitSession(session)));
-            ReadBinding binding = getReadBinding(readPreference, actualClientSession, isImplicitSession(session));
+                    .withSessionContext(new ClientSessionBinding.SyncClientSessionContext(actualClientSession, readConcern, implicitSession));
+            ReadBinding binding = getReadBinding(readPreference, actualClientSession, implicitSession);
 
             try {
                 if (actualClientSession.hasActiveTransaction() && !binding.getReadPreference().equals(primary())) {
@@ -476,8 +477,7 @@ WriteBinding getWriteBinding(final ClientSession session, final boolean ownsSess
             return getReadWriteBinding(primary(), session, ownsSession);
         }
 
-        ReadBinding getReadBinding(final ReadPreference readPreference, final ClientSession session,
-                final boolean ownsSession) {
+        ReadBinding getReadBinding(final ReadPreference readPreference, final ClientSession session, final boolean ownsSession) {
             return getReadWriteBinding(readPreference, session, ownsSession);
         }
 
diff --git a/driver-sync/src/test/unit/com/mongodb/client/internal/ClientSessionBindingSpecification.groovy b/driver-sync/src/test/unit/com/mongodb/client/internal/ClientSessionBindingSpecification.groovy
index 20d49fcf026..e2e664f324d 100644
--- a/driver-sync/src/test/unit/com/mongodb/client/internal/ClientSessionBindingSpecification.groovy
+++ b/driver-sync/src/test/unit/com/mongodb/client/internal/ClientSessionBindingSpecification.groovy
@@ -119,22 +119,6 @@ class ClientSessionBindingSpecification extends Specification {
         0 * session.close()
     }
 
-    // TODO-JAVA-5640 move to SessionContext test
-//    def 'owned session is implicit'() {
-//        given:
-//        def session = Mock(ClientSession)
-//        def wrappedBinding = createStubBinding()
-//
-//        when:
-//        def binding = new ClientSessionBinding(session, ownsSession, wrappedBinding)
-//
-//        then:
-//        binding.getOperationContext().getSessionContext().isImplicitSession() == ownsSession
-//
-//        where:
-//        ownsSession << [true, false]
-//    }
-
     private ReadWriteBinding createStubBinding() {
         def cluster = Stub(Cluster)
         new ClusterBinding(cluster, ReadPreference.primary())

From 59dc254586e42c060f260b7de8928f57b11b34e9 Mon Sep 17 00:00:00 2001
From: Ross Lawley 
Date: Mon, 29 Sep 2025 16:13:00 +0100
Subject: [PATCH 33/36] Update
 driver-core/src/main/com/mongodb/internal/operation/AsyncChangeStreamBatchCursor.java

---
 .../internal/operation/AsyncChangeStreamBatchCursor.java   | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/driver-core/src/main/com/mongodb/internal/operation/AsyncChangeStreamBatchCursor.java b/driver-core/src/main/com/mongodb/internal/operation/AsyncChangeStreamBatchCursor.java
index 0f4bafe4d66..a144888f859 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/AsyncChangeStreamBatchCursor.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/AsyncChangeStreamBatchCursor.java
@@ -1,10 +1,3 @@
-/*
- * Copyright 2008-present MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
 /*
  * Copyright 2008-present MongoDB, Inc.
  *

From 1505efca8569c24dd5b15e64129bfb3151ed5f14 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Sep 2025 20:33:05 +0000
Subject: [PATCH 34/36] build(deps): bump
 driver-core/src/test/resources/specifications

Bumps [driver-core/src/test/resources/specifications](https://github.com/mongodb/specifications) from `eb7f9a2` to `ace53b1`.
- [Release notes](https://github.com/mongodb/specifications/releases)
- [Commits](https://github.com/mongodb/specifications/compare/eb7f9a253c88b8255d55308b00ebb6e91f5d20c7...ace53b165f2ab83e8385de15fbda9346befc0ea7)

---
updated-dependencies:
- dependency-name: driver-core/src/test/resources/specifications
  dependency-version: ace53b165f2ab83e8385de15fbda9346befc0ea7
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] 
---
 driver-core/src/test/resources/specifications | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/driver-core/src/test/resources/specifications b/driver-core/src/test/resources/specifications
index eb7f9a253c8..ace53b165f2 160000
--- a/driver-core/src/test/resources/specifications
+++ b/driver-core/src/test/resources/specifications
@@ -1 +1 @@
-Subproject commit eb7f9a253c88b8255d55308b00ebb6e91f5d20c7
+Subproject commit ace53b165f2ab83e8385de15fbda9346befc0ea7

From 26cc57a2bdc953bbeb4f5433cdf1a506aad51a91 Mon Sep 17 00:00:00 2001
From: Nabil Hachicha 
Date: Thu, 2 Oct 2025 14:17:28 +0100
Subject: [PATCH 35/36] Refactor the tracing implementation to use Observation
 instead of working with micrometer-tracing directly

---
 driver-core/build.gradle.kts                  |   2 +-
 .../connection/InternalStreamConnection.java  | 104 ++++++----
 .../operation/ClientBulkWriteOperation.java   |   4 +-
 .../com/mongodb/internal/tracing/Span.java    |  53 +++--
 .../com/mongodb/internal/tracing/Tags.java    |  49 -----
 .../com/mongodb/internal/tracing/Tracer.java  |  38 +---
 .../internal/tracing/TracingManager.java      |  41 ++--
 .../internal/tracing/TransactionSpan.java     |   2 +
 .../com/mongodb/tracing/MicrometerTracer.java | 141 +++++++------
 .../mongodb/tracing/MongodbObservation.java   | 185 ++++++++++++++++++
 .../com/mongodb/tracing/package-info.java     |   2 +-
 driver-kotlin-coroutine/build.gradle.kts      |   2 +-
 driver-kotlin-sync/build.gradle.kts           |   2 +-
 driver-reactive-streams/build.gradle.kts      |   2 +-
 driver-sync/build.gradle.kts                  |   5 +-
 .../client/internal/MongoClusterImpl.java     |  32 ++-
 .../com/mongodb/client/tracing/SpanTree.java  |  68 ++++++-
 .../mongodb/client/tracing/ZipkinTracer.java  |  95 ---------
 .../com/mongodb/client/unified/Entities.java  |  26 ++-
 .../mongodb/client/unified/UnifiedTest.java   |  29 +--
 gradle/libs.versions.toml                     |  18 +-
 21 files changed, 528 insertions(+), 372 deletions(-)
 delete mode 100644 driver-core/src/main/com/mongodb/internal/tracing/Tags.java
 create mode 100644 driver-core/src/main/com/mongodb/tracing/MongodbObservation.java
 delete mode 100644 driver-sync/src/test/functional/com/mongodb/client/tracing/ZipkinTracer.java

diff --git a/driver-core/build.gradle.kts b/driver-core/build.gradle.kts
index 7e260b18d23..1614d9fb8d4 100644
--- a/driver-core/build.gradle.kts
+++ b/driver-core/build.gradle.kts
@@ -54,7 +54,7 @@ dependencies {
 
     optionalImplementation(libs.snappy.java)
     optionalImplementation(libs.zstd.jni)
-    optionalImplementation(libs.micrometer)
+    optionalImplementation(libs.micrometer.observation)
 
     testImplementation(project(path = ":bson", configuration = "testArtifacts"))
     testImplementation(libs.reflections)
diff --git a/driver-core/src/main/com/mongodb/internal/connection/InternalStreamConnection.java b/driver-core/src/main/com/mongodb/internal/connection/InternalStreamConnection.java
index 535c2fb2255..d4104462c8c 100644
--- a/driver-core/src/main/com/mongodb/internal/connection/InternalStreamConnection.java
+++ b/driver-core/src/main/com/mongodb/internal/connection/InternalStreamConnection.java
@@ -23,6 +23,7 @@
 import com.mongodb.MongoException;
 import com.mongodb.MongoInternalException;
 import com.mongodb.MongoInterruptedException;
+import com.mongodb.MongoNamespace;
 import com.mongodb.MongoOperationTimeoutException;
 import com.mongodb.MongoSocketClosedException;
 import com.mongodb.MongoSocketReadException;
@@ -55,6 +56,7 @@
 import com.mongodb.internal.tracing.Span;
 import com.mongodb.internal.tracing.TracingManager;
 import com.mongodb.lang.Nullable;
+import io.micrometer.common.KeyValues;
 import org.bson.BsonBinaryReader;
 import org.bson.BsonDocument;
 import org.bson.ByteBuf;
@@ -97,21 +99,22 @@
 import static com.mongodb.internal.connection.ProtocolHelper.isCommandOk;
 import static com.mongodb.internal.logging.LogMessage.Level.DEBUG;
 import static com.mongodb.internal.thread.InterruptionUtil.translateInterruptedException;
-import static com.mongodb.internal.tracing.Tags.CLIENT_CONNECTION_ID;
-import static com.mongodb.internal.tracing.Tags.COLLECTION;
-import static com.mongodb.internal.tracing.Tags.COMMAND_NAME;
-import static com.mongodb.internal.tracing.Tags.CURSOR_ID;
-import static com.mongodb.internal.tracing.Tags.NAMESPACE;
-import static com.mongodb.internal.tracing.Tags.NETWORK_TRANSPORT;
-import static com.mongodb.internal.tracing.Tags.QUERY_SUMMARY;
-import static com.mongodb.internal.tracing.Tags.QUERY_TEXT;
-import static com.mongodb.internal.tracing.Tags.SERVER_ADDRESS;
-import static com.mongodb.internal.tracing.Tags.SERVER_CONNECTION_ID;
-import static com.mongodb.internal.tracing.Tags.SERVER_PORT;
-import static com.mongodb.internal.tracing.Tags.SERVER_TYPE;
-import static com.mongodb.internal.tracing.Tags.SESSION_ID;
-import static com.mongodb.internal.tracing.Tags.SYSTEM;
-import static com.mongodb.internal.tracing.Tags.TRANSACTION_NUMBER;
+import static com.mongodb.tracing.MongodbObservation.HighCardinalityKeyNames.QUERY_TEXT;
+import static com.mongodb.tracing.MongodbObservation.LowCardinalityKeyNames.CLIENT_CONNECTION_ID;
+import static com.mongodb.tracing.MongodbObservation.LowCardinalityKeyNames.COLLECTION;
+import static com.mongodb.tracing.MongodbObservation.LowCardinalityKeyNames.COMMAND_NAME;
+import static com.mongodb.tracing.MongodbObservation.LowCardinalityKeyNames.CURSOR_ID;
+import static com.mongodb.tracing.MongodbObservation.LowCardinalityKeyNames.NAMESPACE;
+import static com.mongodb.tracing.MongodbObservation.LowCardinalityKeyNames.NETWORK_TRANSPORT;
+import static com.mongodb.tracing.MongodbObservation.LowCardinalityKeyNames.QUERY_SUMMARY;
+import static com.mongodb.tracing.MongodbObservation.LowCardinalityKeyNames.RESPONSE_STATUS_CODE;
+import static com.mongodb.tracing.MongodbObservation.LowCardinalityKeyNames.SERVER_ADDRESS;
+import static com.mongodb.tracing.MongodbObservation.LowCardinalityKeyNames.SERVER_CONNECTION_ID;
+import static com.mongodb.tracing.MongodbObservation.LowCardinalityKeyNames.SERVER_PORT;
+import static com.mongodb.tracing.MongodbObservation.LowCardinalityKeyNames.SERVER_TYPE;
+import static com.mongodb.tracing.MongodbObservation.LowCardinalityKeyNames.SESSION_ID;
+import static com.mongodb.tracing.MongodbObservation.LowCardinalityKeyNames.SYSTEM;
+import static com.mongodb.tracing.MongodbObservation.LowCardinalityKeyNames.TRANSACTION_NUMBER;
 import static java.util.Arrays.asList;
 
 /**
@@ -473,7 +476,7 @@ private  T sendAndReceiveInternal(final CommandMessage message, final Decoder
                 commandEventSender = new NoOpCommandEventSender();
             }
             if (isTracingCommandPayloadNeeded) {
-                tracingSpan.tag(QUERY_TEXT, commandDocument.toJson());
+                tracingSpan.tagHighCardinality(QUERY_TEXT.withValue(commandDocument.toJson()));
             }
 
             try {
@@ -584,6 +587,9 @@ private  T receiveCommandMessageResponse(final Decoder decoder, final Comm
                 commandEventSender.sendFailedEvent(e);
             }
             if (tracingSpan != null) {
+                if (e instanceof MongoCommandException) {
+                    tracingSpan.tagLowCardinality(RESPONSE_STATUS_CODE.withValue(String.valueOf(((MongoCommandException) e).getErrorCode())));
+                }
                 tracingSpan.error(e);
             }
             throw e;
@@ -1055,43 +1061,75 @@ private Span createTracingSpan(final CommandMessage message, final OperationCont
 
          Span operationSpan = operationContext.getTracingSpan();
          Span span = tracingManager
-                .addSpan("Command " + commandName,  operationSpan != null ? operationSpan.context() : null)
-                .tag(SYSTEM, "mongodb")
-                .tag(NAMESPACE, message.getNamespace().getDatabaseName())
-                .tag(COLLECTION, message.getCollectionName())
-                .tag(QUERY_SUMMARY, commandName)
-                .tag(COMMAND_NAME, commandName)
-                .tag(NETWORK_TRANSPORT, getServerAddress() instanceof UnixServerAddress ? "unix" : "tcp");
+                .addSpan(commandName,  operationSpan != null ? operationSpan.context() : null);
 
         if (command.containsKey("getMore")) {
             long cursorId = command.getInt64("getMore").longValue();
-            span.tag(CURSOR_ID, cursorId);
+            span.tagLowCardinality(CURSOR_ID.withValue(String.valueOf(cursorId)));
             if (operationSpan != null) {
-                operationSpan.tag(CURSOR_ID, cursorId);
+                operationSpan.tagLowCardinality(CURSOR_ID.withValue(String.valueOf(cursorId)));
             }
         }
 
+        tagNamespace(span, operationSpan, message, commandName);
         tagServerAndConnectionInfo(span, message);
         tagSessionAndTransactionInfo(span, operationContext);
 
         return span;
     }
 
+    private void tagNamespace(final Span span, @Nullable final Span parentSpan, final CommandMessage message, final String commandName) {
+        String namespace;
+        String collection;
+        if (parentSpan != null) {
+            MongoNamespace parentNamespace = parentSpan.getNamespace();
+            if (parentNamespace != null) {
+                namespace = parentNamespace.getDatabaseName();
+                collection =
+                        MongoNamespace.COMMAND_COLLECTION_NAME.equalsIgnoreCase(parentNamespace.getCollectionName()) ? ""
+                                : parentNamespace.getCollectionName();
+            } else {
+                namespace = message.getNamespace().getDatabaseName();
+                collection = message.getCollectionName().contains("$cmd") ? "" : message.getCollectionName();
+            }
+        } else {
+            namespace = message.getNamespace().getDatabaseName();
+            collection = message.getCollectionName().contains("$cmd") ? "" : message.getCollectionName();
+        }
+        String summary = commandName + " " + namespace + (collection.isEmpty() ? "" : "." + collection);
+
+        KeyValues keyValues = KeyValues.of(
+                SYSTEM.withValue("mongodb"),
+                NAMESPACE.withValue(namespace),
+                QUERY_SUMMARY.withValue(summary),
+                COMMAND_NAME.withValue(commandName));
+
+        if (!collection.isEmpty()) {
+            keyValues = keyValues.and(COLLECTION.withValue(collection));
+        }
+        span.tagLowCardinality(keyValues);
+    }
+
     private void tagServerAndConnectionInfo(final Span span, final CommandMessage message) {
-        span.tag(SERVER_ADDRESS, serverId.getAddress().getHost())
-                .tag(SERVER_PORT, String.valueOf(serverId.getAddress().getPort()))
-                .tag(SERVER_TYPE, message.getSettings().getServerType().name())
-                .tag(CLIENT_CONNECTION_ID, this.description.getConnectionId().toString())
-                .tag(SERVER_CONNECTION_ID, String.valueOf(this.description.getConnectionId().getServerValue()));
+        span.tagLowCardinality(KeyValues.of(
+                SERVER_ADDRESS.withValue(serverId.getAddress().getHost()),
+                SERVER_PORT.withValue(String.valueOf(serverId.getAddress().getPort())),
+                SERVER_TYPE.withValue(message.getSettings().getServerType().name()),
+                CLIENT_CONNECTION_ID.withValue(String.valueOf(this.description.getConnectionId().getLocalValue())),
+                SERVER_CONNECTION_ID.withValue(String.valueOf(this.description.getConnectionId().getServerValue())),
+                NETWORK_TRANSPORT.withValue(getServerAddress() instanceof UnixServerAddress ? "unix" : "tcp")
+        ));
     }
 
     private void tagSessionAndTransactionInfo(final Span span, final OperationContext operationContext) {
         SessionContext sessionContext = operationContext.getSessionContext();
         if (sessionContext.hasSession() && !sessionContext.isImplicitSession()) {
-            span.tag(TRANSACTION_NUMBER, String.valueOf(sessionContext.getTransactionNumber()))
-                    .tag(SESSION_ID, String.valueOf(sessionContext.getSessionId()
+            span.tagLowCardinality(KeyValues.of(
+                    TRANSACTION_NUMBER.withValue(String.valueOf(sessionContext.getTransactionNumber())),
+                    SESSION_ID.withValue(String.valueOf(sessionContext.getSessionId()
                             .get(sessionContext.getSessionId().getFirstKey())
-                            .asBinary().asUuid()));
+                            .asBinary().asUuid()))
+            ));
         }
     }
 }
diff --git a/driver-core/src/main/com/mongodb/internal/operation/ClientBulkWriteOperation.java b/driver-core/src/main/com/mongodb/internal/operation/ClientBulkWriteOperation.java
index ad380781f73..c94fcc04783 100644
--- a/driver-core/src/main/com/mongodb/internal/operation/ClientBulkWriteOperation.java
+++ b/driver-core/src/main/com/mongodb/internal/operation/ClientBulkWriteOperation.java
@@ -115,6 +115,7 @@
 import java.util.function.Supplier;
 import java.util.stream.Stream;
 
+import static com.mongodb.MongoNamespace.COMMAND_COLLECTION_NAME;
 import static com.mongodb.assertions.Assertions.assertFalse;
 import static com.mongodb.assertions.Assertions.assertNotNull;
 import static com.mongodb.assertions.Assertions.assertTrue;
@@ -184,7 +185,8 @@ public String getCommandName() {
 
     @Override
     public MongoNamespace getNamespace() {
-        return getNamespacedModel(models, 0).getNamespace();
+        // The bulkWrite command is executed on the "admin" database.
+        return new MongoNamespace("admin", COMMAND_COLLECTION_NAME);
     }
 
     @Override
diff --git a/driver-core/src/main/com/mongodb/internal/tracing/Span.java b/driver-core/src/main/com/mongodb/internal/tracing/Span.java
index 41f6ef0afdf..0549a194c6c 100644
--- a/driver-core/src/main/com/mongodb/internal/tracing/Span.java
+++ b/driver-core/src/main/com/mongodb/internal/tracing/Span.java
@@ -16,6 +16,10 @@
 
 package com.mongodb.internal.tracing;
 
+import com.mongodb.MongoNamespace;
+import com.mongodb.lang.Nullable;
+import io.micrometer.common.KeyValue;
+import io.micrometer.common.KeyValues;
 
 /**
  * Represents a tracing span for the driver internal operations.
@@ -32,7 +36,7 @@
  * 
  * 

  *
- * @since 5.6
+ * @since 5.7
  */
 public interface Span {
     /**
@@ -44,13 +48,15 @@ public interface Span {
      */
     Span EMPTY = new Span() {
         @Override
-        public Span tag(final String key, final String value) {
-            return this;
+        public void tagLowCardinality(final KeyValue tag) {
         }
 
         @Override
-        public Span tag(final String key, final Long value) {
-            return this;
+        public void tagLowCardinality(final KeyValues keyValues) {
+        }
+
+        @Override
+        public void tagHighCardinality(final KeyValue keyValue) {
         }
 
         @Override
@@ -69,25 +75,34 @@ public void end() {
         public TraceContext context() {
             return TraceContext.EMPTY;
         }
+
+        @Override
+        @Nullable
+        public MongoNamespace getNamespace() {
+            return null;
+        }
     };
 
     /**
-     * Adds a tag to the span with a key-value pair.
+     * Adds a low-cardinality tag to the span.
+     *
+     * @param keyValue The key-value pair representing the tag.
+     */
+    void tagLowCardinality(KeyValue keyValue);
+
+    /**
+     * Adds multiple low-cardinality tags to the span.
      *
-     * @param key   The tag key.
-     * @param value The tag value.
-     * @return The current instance of the span.
+     * @param keyValues The key-value pairs representing the tags.
      */
-    Span tag(String key, String value);
+    void tagLowCardinality(KeyValues keyValues);
 
     /**
-     * Adds a tag to the span with a key and a numeric value.
+     * Adds a high-cardinality (highly variable values) tag to the span.
      *
-     * @param key   The tag key.
-     * @param value The numeric tag value.
-     * @return The current instance of the span.
+     * @param keyValue The key-value pair representing the tag.
      */
-    Span tag(String key, Long value);
+    void tagHighCardinality(KeyValue keyValue);
 
     /**
      * Records an event in the span.
@@ -114,4 +129,12 @@ public TraceContext context() {
      * @return The trace context associated with the span.
      */
     TraceContext context();
+
+    /**
+     * Retrieves the MongoDB namespace associated with the span, if any.
+     *
+     * @return The MongoDB namespace, or null if none is associated.
+     */
+    @Nullable
+    MongoNamespace getNamespace();
 }
diff --git a/driver-core/src/main/com/mongodb/internal/tracing/Tags.java b/driver-core/src/main/com/mongodb/internal/tracing/Tags.java
deleted file mode 100644
index c7261a63af4..00000000000
--- a/driver-core/src/main/com/mongodb/internal/tracing/Tags.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright 2008-present MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.internal.tracing;
-
-/**
- * Contains constant tag names used for tracing and monitoring MongoDB operations.
- * These tags are typically used to annotate spans or events with relevant metadata.
- *
- * @since 5.6
- */
-public final class Tags {
-    private Tags() {
-    }
-
-    public static final String SYSTEM = "db.system";
-    public static final String NAMESPACE = "db.namespace";
-    public static final String COLLECTION = "db.collection.name";
-    public static final String OPERATION_NAME = "db.operation.name";
-    public static final String COMMAND_NAME = "db.command.name";
-    public static final String NETWORK_TRANSPORT = "network.transport";
-    public static final String OPERATION_SUMMARY = "db.operation.summary";
-    public static final String QUERY_SUMMARY = "db.query.summary";
-    public static final String QUERY_TEXT = "db.query.text";
-    public static final String CURSOR_ID = "db.mongodb.cursor_id";
-    public static final String SERVER_ADDRESS = "server.address";
-    public static final String SERVER_PORT = "server.port";
-    public static final String SERVER_TYPE = "server.type";
-    public static final String CLIENT_CONNECTION_ID = "db.mongodb.driver_connection_id";
-    public static final String SERVER_CONNECTION_ID = "db.mongodb.server_connection_id";
-    public static final String TRANSACTION_NUMBER = "db.mongodb.txnNumber";
-    public static final String SESSION_ID = "db.mongodb.lsid";
-    public static final String EXCEPTION_STACKTRACE = "exception.stacktrace";
-    public static final String EXCEPTION_TYPE = "exception.type";
-    public static final String EXCEPTION_MESSAGE = "exception.message";
-}
diff --git a/driver-core/src/main/com/mongodb/internal/tracing/Tracer.java b/driver-core/src/main/com/mongodb/internal/tracing/Tracer.java
index c2881e9e2fb..6f5403213d6 100644
--- a/driver-core/src/main/com/mongodb/internal/tracing/Tracer.java
+++ b/driver-core/src/main/com/mongodb/internal/tracing/Tracer.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.mongodb.internal.tracing;
 
+import com.mongodb.MongoNamespace;
 import com.mongodb.lang.Nullable;
 
 /**
@@ -25,23 +25,12 @@
  * It also includes a no-operation (NO_OP) implementation for cases where tracing is not required.
  * 

  *
- * @since 5.6
+ * @since 5.7
  */
 public interface Tracer {
     Tracer NO_OP = new Tracer() {
-
-        @Override
-        public TraceContext currentContext() {
-            return TraceContext.EMPTY;
-        }
-
-        @Override
-        public Span nextSpan(final String name) {
-            return Span.EMPTY;
-        }
-
         @Override
-        public Span nextSpan(final String name, @Nullable final TraceContext parent) {
+        public Span nextSpan(final String name, @Nullable final TraceContext parent, @Nullable final MongoNamespace namespace) {
             return Span.EMPTY;
         }
 
@@ -56,30 +45,15 @@ public boolean includeCommandPayload() {
         }
     };
 
-    /**
-     * Retrieves the current trace context from the Micrometer tracer.
-     *
-     * @return A {@link TraceContext} representing the underlying {@link io.micrometer.tracing.TraceContext}.
-     * exists.
-     */
-    TraceContext currentContext();
-
-    /**
-     * Creates a new span with the specified name.
-     *
-     * @param name The name of the span.
-     * @return A {@link Span} representing the newly created span.
-     */
-    Span nextSpan(String name); // uses current active span
-
     /**
      * Creates a new span with the specified name and optional parent trace context.
      *
      * @param name   The name of the span.
      * @param parent The parent {@link TraceContext}, or null if no parent context is provided.
+     * @param namespace The {@link MongoNamespace} associated with the span, or null if none is provided.
      * @return A {@link Span} representing the newly created span.
      */
-    Span nextSpan(String name, @Nullable TraceContext parent); // manually attach the next span to the provided parent
+    Span nextSpan(String name, @Nullable TraceContext parent, @Nullable MongoNamespace namespace);
 
     /**
      * Indicates whether tracing is enabled.
@@ -93,5 +67,5 @@ public boolean includeCommandPayload() {
      *
      * @return {@code true} if command payloads are allowed, {@code false} otherwise.
      */
-    boolean includeCommandPayload(); // whether the tracer allows command payloads in the trace context
+    boolean includeCommandPayload();
 }
diff --git a/driver-core/src/main/com/mongodb/internal/tracing/TracingManager.java b/driver-core/src/main/com/mongodb/internal/tracing/TracingManager.java
index 6db92f0d75a..6fa5613ef47 100644
--- a/driver-core/src/main/com/mongodb/internal/tracing/TracingManager.java
+++ b/driver-core/src/main/com/mongodb/internal/tracing/TracingManager.java
@@ -16,9 +16,10 @@
 
 package com.mongodb.internal.tracing;
 
+import com.mongodb.MongoNamespace;
 import com.mongodb.lang.Nullable;
 
-import static com.mongodb.internal.tracing.Tags.SYSTEM;
+import static com.mongodb.tracing.MongodbObservation.LowCardinalityKeyNames.SYSTEM;
 import static java.lang.System.getenv;
 
 /**
@@ -34,30 +35,17 @@ public class TracingManager {
      */
     public static final TracingManager NO_OP = new TracingManager(Tracer.NO_OP);
     private static final String ENV_ALLOW_COMMAND_PAYLOAD = "MONGODB_TRACING_ALLOW_COMMAND_PAYLOAD";
-
     private final Tracer tracer;
-    private final TraceContext parentContext;
     private final boolean enableCommandPayload;
 
-    /**
-     * Constructs a new TracingManager with the specified tracer.
-     *
-     * @param tracer The tracer to use for tracing operations.
-     */
-    public TracingManager(final Tracer tracer) {
-        this(tracer, tracer.currentContext());
-    }
-
     /**
      * Constructs a new TracingManager with the specified tracer and parent context.
      * Setting the environment variable {@code MONGODB_TRACING_ALLOW_COMMAND_PAYLOAD} to "true" will enable command payload tracing.
      *
      * @param tracer        The tracer to use for tracing operations.
-     * @param parentContext The parent trace context.
      */
-    public TracingManager(final Tracer tracer, final TraceContext parentContext) {
+    public TracingManager(final Tracer tracer) {
         this.tracer = tracer;
-        this.parentContext = parentContext;
         String envAllowCommandPayload = getenv(ENV_ALLOW_COMMAND_PAYLOAD);
         if (envAllowCommandPayload != null) {
             this.enableCommandPayload = Boolean.parseBoolean(envAllowCommandPayload);
@@ -78,7 +66,24 @@ public TracingManager(final Tracer tracer, final TraceContext parentContext) {
      * @return The created span.
      */
     public Span addSpan(final String name, @Nullable final TraceContext parentContext) {
-        return tracer.nextSpan(name, parentContext);
+        return tracer.nextSpan(name, parentContext, null);
+    }
+
+    /**
+     * Creates a new span with the specified name, parent trace context, and MongoDB namespace.
+     * 

+     * This method is used to create a span that is linked to a parent context,
+     * enabling hierarchical tracing of operations. The MongoDB namespace can be used
+     * by nested spans to access the database and collection name (which might not be easily accessible at connection layer).
+     * 

+     *
+     * @param name          The name of the span.
+     * @param parentContext The parent trace context to associate with the span.
+     * @param namespace     The MongoDB namespace associated with the operation.
+     * @return The created span.
+     */
+    public Span addSpan(final String name, @Nullable final TraceContext parentContext, final MongoNamespace namespace) {
+        return tracer.nextSpan(name, parentContext, namespace);
     }
 
     /**
@@ -87,8 +92,8 @@ public Span addSpan(final String name, @Nullable final TraceContext parentContex
      * @return The created transaction span.
      */
     public Span addTransactionSpan() {
-        Span span = tracer.nextSpan("transaction", parentContext);
-        span.tag(SYSTEM, "mongodb");
+        Span span = tracer.nextSpan("transaction", null, null);
+        span.tagLowCardinality(SYSTEM.withValue("mongodb"));
         return span;
     }
 
diff --git a/driver-core/src/main/com/mongodb/internal/tracing/TransactionSpan.java b/driver-core/src/main/com/mongodb/internal/tracing/TransactionSpan.java
index d975f6931e0..789f259e82c 100644
--- a/driver-core/src/main/com/mongodb/internal/tracing/TransactionSpan.java
+++ b/driver-core/src/main/com/mongodb/internal/tracing/TransactionSpan.java
@@ -20,6 +20,8 @@
 
 /**
  * State class for transaction tracing.
+ *
+ * @since 5.7
  */
 public class TransactionSpan {
     private boolean isConvenientTransaction = false;
diff --git a/driver-core/src/main/com/mongodb/tracing/MicrometerTracer.java b/driver-core/src/main/com/mongodb/tracing/MicrometerTracer.java
index 7ed0119d21d..ae5a708ef96 100644
--- a/driver-core/src/main/com/mongodb/tracing/MicrometerTracer.java
+++ b/driver-core/src/main/com/mongodb/tracing/MicrometerTracer.java
@@ -16,73 +16,71 @@
 
 package com.mongodb.tracing;
 
+import com.mongodb.MongoNamespace;
 import com.mongodb.internal.tracing.Span;
 import com.mongodb.internal.tracing.TraceContext;
 import com.mongodb.internal.tracing.Tracer;
 import com.mongodb.lang.Nullable;
+import io.micrometer.common.KeyValue;
+import io.micrometer.common.KeyValues;
+import io.micrometer.observation.Observation;
+import io.micrometer.observation.ObservationRegistry;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
 
-import static com.mongodb.internal.tracing.Tags.EXCEPTION_MESSAGE;
-import static com.mongodb.internal.tracing.Tags.EXCEPTION_STACKTRACE;
-import static com.mongodb.internal.tracing.Tags.EXCEPTION_TYPE;
+import static com.mongodb.tracing.MongodbObservation.LowCardinalityKeyNames.EXCEPTION_MESSAGE;
+import static com.mongodb.tracing.MongodbObservation.LowCardinalityKeyNames.EXCEPTION_STACKTRACE;
+import static com.mongodb.tracing.MongodbObservation.LowCardinalityKeyNames.EXCEPTION_TYPE;
+import static com.mongodb.tracing.MongodbObservation.MONGODB_OBSERVATION;
+
 
 /**
- * A {@link Tracer} implementation that delegates tracing operations to a Micrometer {@link io.micrometer.tracing.Tracer}.
+ * A {@link Tracer} implementation that delegates tracing operations to a Micrometer {@link io.micrometer.observation.ObservationRegistry}.
  * 

  * This class enables integration of MongoDB driver tracing with Micrometer-based tracing systems.
- * It provides methods to create and manage spans using the Micrometer tracing API.
+ * It provides integration with Micrometer to propagate observations into tracing API.
  * 

  *
- * @since 5.6
+ * @since 5.7
  */
 public class MicrometerTracer implements Tracer {
-    private final io.micrometer.tracing.Tracer tracer;
     private final boolean allowCommandPayload;
+    private final ObservationRegistry observationRegistry;
 
     /**
      * Constructs a new {@link MicrometerTracer} instance.
      *
-     * @param tracer The Micrometer {@link io.micrometer.tracing.Tracer} to delegate tracing operations to.
+     * @param observationRegistry The Micrometer {@link ObservationRegistry} to delegate tracing operations to.
      */
-    public MicrometerTracer(final io.micrometer.tracing.Tracer tracer) {
-        this(tracer, false);
+    public MicrometerTracer(final ObservationRegistry observationRegistry) {
+        this(observationRegistry, false);
     }
 
     /**
      * Constructs a new {@link MicrometerTracer} instance with an option to allow command payloads.
      *
-     * @param tracer              The Micrometer {@link io.micrometer.tracing.Tracer} to delegate tracing operations to.
+     * @param observationRegistry The Micrometer {@link ObservationRegistry} to delegate tracing operations to.
      * @param allowCommandPayload Whether to allow command payloads in the trace context.
      */
-    public MicrometerTracer(final io.micrometer.tracing.Tracer tracer, final boolean allowCommandPayload) {
-        this.tracer = tracer;
+    public MicrometerTracer(final ObservationRegistry observationRegistry, final boolean allowCommandPayload) {
         this.allowCommandPayload = allowCommandPayload;
+        this.observationRegistry = observationRegistry;
     }
 
     @Override
-    public TraceContext currentContext() {
-        return new MicrometerTraceContext(tracer.currentTraceContext().context());
-    }
-
-    @Override
-    public Span nextSpan(final String name) {
-        return new MicrometerSpan(tracer.nextSpan().name(name).start());
-    }
-
-    @Override
-    public Span nextSpan(final String name, @Nullable final TraceContext parent) {
+    public Span nextSpan(final String name, @Nullable final TraceContext parent, @Nullable final MongoNamespace namespace) {
         if (parent instanceof MicrometerTraceContext) {
-            io.micrometer.tracing.TraceContext micrometerContext = ((MicrometerTraceContext) parent).getTraceContext();
-            if (micrometerContext != null) {
-                return new MicrometerSpan(tracer.spanBuilder()
-                        .name(name)
-                        .setParent(micrometerContext)
-                        .start());
+            Observation parentObservation = ((MicrometerTraceContext) parent).observation;
+            if (parentObservation != null) {
+                return new MicrometerSpan(MONGODB_OBSERVATION
+                        .observation(observationRegistry)
+                        .contextualName(name)
+                        .parentObservation(parentObservation)
+                        .start(), namespace);
             }
         }
-        return nextSpan(name);
+        return new MicrometerSpan(MONGODB_OBSERVATION.observation(observationRegistry).contextualName(name).start(), namespace);
     }
 
     @Override
@@ -99,25 +97,15 @@ public boolean includeCommandPayload() {
      * Represents a Micrometer-based trace context.
      */
     private static class MicrometerTraceContext implements TraceContext {
-        private final io.micrometer.tracing.TraceContext traceContext;
+        private final Observation observation;
 
         /**
-         * Constructs a new {@link MicrometerTraceContext} instance.
+         * Constructs a new {@link MicrometerTraceContext} instance with an associated Observation.
          *
-         * @param traceContext The Micrometer {@link io.micrometer.tracing.TraceContext}, or null if none exists.
+         * @param observation The Micrometer {@link Observation}, or null if none exists.
          */
-        MicrometerTraceContext(@Nullable final io.micrometer.tracing.TraceContext traceContext) {
-            this.traceContext = traceContext;
-        }
-
-        /**
-         * Retrieves the underlying Micrometer trace context.
-         *
-         * @return The Micrometer {@link io.micrometer.tracing.TraceContext}, or null if none exists.
-         */
-        @Nullable
-        public io.micrometer.tracing.TraceContext getTraceContext() {
-            return traceContext;
+        MicrometerTraceContext(@Nullable final Observation observation) {
+            this.observation = observation;
         }
     }
 
@@ -125,50 +113,75 @@ public io.micrometer.tracing.TraceContext getTraceContext() {
      * Represents a Micrometer-based span.
      */
     private static class MicrometerSpan implements Span {
-        private final io.micrometer.tracing.Span span;
+        private final Observation observation;
+        @Nullable
+        private final MongoNamespace namespace;
 
         /**
-         * Constructs a new {@link MicrometerSpan} instance.
+         * Constructs a new {@link MicrometerSpan} instance with an associated Observation.
          *
-         * @param span The Micrometer {@link io.micrometer.tracing.Span} to delegate operations to.
+         * @param observation The Micrometer {@link Observation}, or null if none exists.
          */
-        MicrometerSpan(final io.micrometer.tracing.Span span) {
-            this.span = span;
+        MicrometerSpan(final Observation observation) {
+            this.observation = observation;
+            this.namespace = null;
+        }
+
+        /**
+         * Constructs a new {@link MicrometerSpan} instance with an associated Observation and MongoDB namespace.
+         *
+         * @param observation The Micrometer {@link Observation}, or null if none exists.
+         * @param namespace   The MongoDB namespace associated with the span.
+         */
+        MicrometerSpan(final Observation observation, @Nullable final MongoNamespace namespace) {
+            this.namespace = namespace;
+            this.observation = observation;
         }
 
         @Override
-        public Span tag(final String key, final String value) {
-            span.tag(key, value);
-            return this;
+        public void tagLowCardinality(final KeyValue keyValue) {
+            observation.lowCardinalityKeyValue(keyValue);
         }
 
         @Override
-        public Span tag(final String key, final Long value) {
-            span.tag(key, value);
-            return this;
+        public void tagLowCardinality(final KeyValues keyValues) {
+            observation.lowCardinalityKeyValues(keyValues);
+        }
+
+        @Override
+        public void tagHighCardinality(final KeyValue keyValue) {
+            observation.highCardinalityKeyValue(keyValue);
         }
 
         @Override
         public void event(final String event) {
-            span.event(event);
+            observation.event(() -> event);
         }
 
         @Override
         public void error(final Throwable throwable) {
-            span.tag(EXCEPTION_MESSAGE, throwable.getMessage());
-            span.tag(EXCEPTION_TYPE, throwable.getClass().getName());
-            span.tag(EXCEPTION_STACKTRACE, getStackTraceAsString(throwable));
-            span.error(throwable);
+            observation.lowCardinalityKeyValues(KeyValues.of(
+                    EXCEPTION_MESSAGE.withValue(throwable.getMessage()),
+                    EXCEPTION_TYPE.withValue(throwable.getClass().getName()),
+                    EXCEPTION_STACKTRACE.withValue(getStackTraceAsString(throwable))
+            ));
+            observation.error(throwable);
         }
 
         @Override
         public void end() {
-            span.end();
+            observation.stop();
         }
 
         @Override
         public TraceContext context() {
-            return new MicrometerTraceContext(span.context());
+            return new MicrometerTraceContext(observation);
+        }
+
+        @Override
+        @Nullable
+        public MongoNamespace getNamespace() {
+            return namespace;
         }
 
         private String getStackTraceAsString(final Throwable throwable) {
diff --git a/driver-core/src/main/com/mongodb/tracing/MongodbObservation.java b/driver-core/src/main/com/mongodb/tracing/MongodbObservation.java
new file mode 100644
index 00000000000..9b173e11ac9
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/tracing/MongodbObservation.java
@@ -0,0 +1,185 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.tracing;
+
+import io.micrometer.common.docs.KeyName;
+import io.micrometer.observation.docs.ObservationDocumentation;
+
+/**
+ * A MongoDB-based {@link io.micrometer.observation.Observation}.
+ *
+ * @since 5.7
+ */
+public enum MongodbObservation implements ObservationDocumentation {
+
+    MONGODB_OBSERVATION {
+        @Override
+        public String getName() {
+            return "mongodb";
+        }
+
+        @Override
+        public KeyName[] getLowCardinalityKeyNames() {
+            return LowCardinalityKeyNames.values();
+        }
+
+        @Override
+        public KeyName[] getHighCardinalityKeyNames() {
+            return HighCardinalityKeyNames.values();
+        }
+
+    };
+
+    /**
+     * Enums related to low cardinality key names for MongoDB tags.
+     */
+    public enum LowCardinalityKeyNames implements KeyName {
+
+        SYSTEM {
+            @Override
+            public String asString() {
+                return "db.system";
+            }
+        },
+        NAMESPACE {
+            @Override
+            public String asString() {
+                return "db.namespace";
+            }
+        },
+        COLLECTION {
+            @Override
+            public String asString() {
+                return "db.collection.name";
+            }
+        },
+        OPERATION_NAME {
+            @Override
+            public String asString() {
+                return "db.operation.name";
+            }
+        },
+        COMMAND_NAME {
+            @Override
+            public String asString() {
+                return "db.command.name";
+            }
+        },
+        NETWORK_TRANSPORT {
+            @Override
+            public String asString() {
+                return "network.transport";
+            }
+        },
+        OPERATION_SUMMARY {
+            @Override
+            public String asString() {
+                return "db.operation.summary";
+            }
+        },
+        QUERY_SUMMARY {
+            @Override
+            public String asString() {
+                return "db.query.summary";
+            }
+        },
+        CURSOR_ID {
+            @Override
+            public String asString() {
+                return "db.mongodb.cursor_id";
+            }
+        },
+        SERVER_ADDRESS {
+            @Override
+            public String asString() {
+                return "server.address";
+            }
+        },
+        SERVER_PORT {
+            @Override
+            public String asString() {
+                return "server.port";
+            }
+        },
+        SERVER_TYPE {
+            @Override
+            public String asString() {
+                return "server.type";
+            }
+        },
+        CLIENT_CONNECTION_ID {
+            @Override
+            public String asString() {
+                return "db.mongodb.driver_connection_id";
+            }
+        },
+        SERVER_CONNECTION_ID {
+            @Override
+            public String asString() {
+                return "db.mongodb.server_connection_id";
+            }
+        },
+        TRANSACTION_NUMBER {
+            @Override
+            public String asString() {
+                return "db.mongodb.txn_number";
+            }
+        },
+        SESSION_ID {
+            @Override
+            public String asString() {
+                return "db.mongodb.lsid";
+            }
+        },
+        EXCEPTION_STACKTRACE {
+            @Override
+            public String asString() {
+                return "exception.stacktrace";
+            }
+        },
+        EXCEPTION_TYPE {
+            @Override
+            public String asString() {
+                return "exception.type";
+            }
+        },
+        EXCEPTION_MESSAGE {
+            @Override
+            public String asString() {
+                return "exception.message";
+            }
+        },
+        RESPONSE_STATUS_CODE {
+            @Override
+            public String asString() {
+                return "db.response.status_code";
+            }
+        }
+    }
+
+    /**
+     * Enums related to high cardinality (highly variable values) key names for MongoDB tags.
+     */
+    public enum HighCardinalityKeyNames implements KeyName {
+        QUERY_TEXT {
+            @Override
+            public String asString() {
+                return "db.query.text";
+            }
+        }
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/tracing/package-info.java b/driver-core/src/main/com/mongodb/tracing/package-info.java
index 43e82603a09..247576d1537 100644
--- a/driver-core/src/main/com/mongodb/tracing/package-info.java
+++ b/driver-core/src/main/com/mongodb/tracing/package-info.java
@@ -17,7 +17,7 @@
 /**
  * This package defines the API for MongoDB driver tracing.
  *
- * @since 5.6
+ * @since 5.7
  */
 @NonNullApi
 package com.mongodb.tracing;
diff --git a/driver-kotlin-coroutine/build.gradle.kts b/driver-kotlin-coroutine/build.gradle.kts
index dd127a4dd6a..49e94bf7e2c 100644
--- a/driver-kotlin-coroutine/build.gradle.kts
+++ b/driver-kotlin-coroutine/build.gradle.kts
@@ -38,7 +38,7 @@ dependencies {
     integrationTestImplementation(project(path = ":bson", configuration = "testArtifacts"))
     integrationTestImplementation(project(path = ":driver-sync", configuration = "testArtifacts"))
     integrationTestImplementation(project(path = ":driver-core", configuration = "testArtifacts"))
-    integrationTestImplementation(libs.micrometer)
+    integrationTestImplementation(libs.micrometer.observation)
 }
 
 configureMavenPublication {
diff --git a/driver-kotlin-sync/build.gradle.kts b/driver-kotlin-sync/build.gradle.kts
index b6113200628..1a510220351 100644
--- a/driver-kotlin-sync/build.gradle.kts
+++ b/driver-kotlin-sync/build.gradle.kts
@@ -32,7 +32,7 @@ dependencies {
     integrationTestImplementation(project(path = ":bson", configuration = "testArtifacts"))
     integrationTestImplementation(project(path = ":driver-sync", configuration = "testArtifacts"))
     integrationTestImplementation(project(path = ":driver-core", configuration = "testArtifacts"))
-    integrationTestImplementation(libs.micrometer)
+    integrationTestImplementation(libs.micrometer.observation)
 }
 
 configureMavenPublication {
diff --git a/driver-reactive-streams/build.gradle.kts b/driver-reactive-streams/build.gradle.kts
index f9ac5301625..12c461b3257 100644
--- a/driver-reactive-streams/build.gradle.kts
+++ b/driver-reactive-streams/build.gradle.kts
@@ -46,7 +46,7 @@ dependencies {
     testImplementation(libs.reactive.streams.tck)
 
     // Tracing
-    testImplementation(libs.micrometer)
+    testImplementation(libs.micrometer.observation)
 }
 
 configureMavenPublication {
diff --git a/driver-sync/build.gradle.kts b/driver-sync/build.gradle.kts
index b37d0226295..1bed5ed69c0 100644
--- a/driver-sync/build.gradle.kts
+++ b/driver-sync/build.gradle.kts
@@ -35,12 +35,13 @@ dependencies {
 
     testImplementation(project(path = ":bson", configuration = "testArtifacts"))
     testImplementation(project(path = ":driver-core", configuration = "testArtifacts"))
+    optionalImplementation(libs.micrometer.observation)
 
     // lambda testing
     testImplementation(libs.aws.lambda.core)
 
-    // Tracing
-    testImplementation(libs.bundles.micrometer.test)
+    // Tracing testing
+    testImplementation(libs.micrometer.tracing.integration.test) { exclude(group = "org.junit.jupiter") }
 }
 
 configureMavenPublication {
diff --git a/driver-sync/src/main/com/mongodb/client/internal/MongoClusterImpl.java b/driver-sync/src/main/com/mongodb/client/internal/MongoClusterImpl.java
index db8fd03adaf..54f476e8a35 100644
--- a/driver-sync/src/main/com/mongodb/client/internal/MongoClusterImpl.java
+++ b/driver-sync/src/main/com/mongodb/client/internal/MongoClusterImpl.java
@@ -60,11 +60,11 @@
 import com.mongodb.internal.operation.WriteOperation;
 import com.mongodb.internal.session.ServerSessionPool;
 import com.mongodb.internal.tracing.Span;
-import com.mongodb.internal.tracing.Tags;
 import com.mongodb.internal.tracing.TraceContext;
 import com.mongodb.internal.tracing.TracingManager;
 import com.mongodb.internal.tracing.TransactionSpan;
 import com.mongodb.lang.Nullable;
+import io.micrometer.common.KeyValues;
 import org.bson.BsonDocument;
 import org.bson.Document;
 import org.bson.UuidRepresentation;
@@ -78,11 +78,17 @@
 
 import static com.mongodb.MongoException.TRANSIENT_TRANSACTION_ERROR_LABEL;
 import static com.mongodb.MongoException.UNKNOWN_TRANSACTION_COMMIT_RESULT_LABEL;
+import static com.mongodb.MongoNamespace.COMMAND_COLLECTION_NAME;
 import static com.mongodb.ReadPreference.primary;
 import static com.mongodb.assertions.Assertions.isTrue;
 import static com.mongodb.assertions.Assertions.isTrueArgument;
 import static com.mongodb.assertions.Assertions.notNull;
 import static com.mongodb.internal.TimeoutContext.createTimeoutContext;
+import static com.mongodb.tracing.MongodbObservation.LowCardinalityKeyNames.COLLECTION;
+import static com.mongodb.tracing.MongodbObservation.LowCardinalityKeyNames.NAMESPACE;
+import static com.mongodb.tracing.MongodbObservation.LowCardinalityKeyNames.OPERATION_NAME;
+import static com.mongodb.tracing.MongodbObservation.LowCardinalityKeyNames.OPERATION_SUMMARY;
+import static com.mongodb.tracing.MongodbObservation.LowCardinalityKeyNames.SYSTEM;
 
 final class MongoClusterImpl implements MongoCluster {
     @Nullable
@@ -601,17 +607,27 @@ private Span createOperationSpan(final ClientSession actualClientSession, final
                 if (transactionSpan != null) {
                     parentContext = transactionSpan.getContext();
                 }
-                String name = commandName + " " + namespace.getFullName();
+                String name = commandName + " " + namespace.getDatabaseName() + (COMMAND_COLLECTION_NAME.equalsIgnoreCase(namespace.getCollectionName())
+                        ? ""
+                        : "." + namespace.getCollectionName());
+
+                KeyValues keyValues = KeyValues.of(
+                        SYSTEM.withValue("mongodb"),
+                        NAMESPACE.withValue(namespace.getDatabaseName()));
+                if (!COMMAND_COLLECTION_NAME.equalsIgnoreCase(namespace.getCollectionName())) {
+                    keyValues = keyValues.and(COLLECTION.withValue(namespace.getCollectionName()));
+                }
+                keyValues = keyValues.and(OPERATION_NAME.withValue(commandName),
+                        OPERATION_SUMMARY.withValue(name));
+
                 Span span = binding
                         .getOperationContext()
                         .getTracingManager()
-                        .addSpan(name, parentContext);
+                        .addSpan(name, parentContext, namespace);
+
+                span.tagLowCardinality(keyValues);
+
                 binding.getOperationContext().setTracingSpan(span);
-                span.tag(Tags.SYSTEM, "mongodb");
-                span.tag(Tags.NAMESPACE, namespace.getDatabaseName());
-                span.tag(Tags.COLLECTION, namespace.getCollectionName());
-                span.tag(Tags.OPERATION_NAME, commandName);
-                span.tag(Tags.OPERATION_SUMMARY, name);
                 return span;
 
             } else {
diff --git a/driver-sync/src/test/functional/com/mongodb/client/tracing/SpanTree.java b/driver-sync/src/test/functional/com/mongodb/client/tracing/SpanTree.java
index bca04e6647a..c5ec573ad76 100644
--- a/driver-sync/src/test/functional/com/mongodb/client/tracing/SpanTree.java
+++ b/driver-sync/src/test/functional/com/mongodb/client/tracing/SpanTree.java
@@ -16,12 +16,13 @@
 
 package com.mongodb.client.tracing;
 
-import com.mongodb.internal.tracing.Tags;
 import com.mongodb.lang.Nullable;
+import io.micrometer.tracing.exporter.FinishedSpan;
 import io.micrometer.tracing.test.simple.SimpleSpan;
 import org.bson.BsonArray;
 import org.bson.BsonBinary;
 import org.bson.BsonDocument;
+import org.bson.BsonInt64;
 import org.bson.BsonString;
 import org.bson.BsonValue;
 
@@ -35,6 +36,12 @@
 import java.util.UUID;
 import java.util.function.BiConsumer;
 
+import static com.mongodb.tracing.MongodbObservation.LowCardinalityKeyNames.CLIENT_CONNECTION_ID;
+import static com.mongodb.tracing.MongodbObservation.LowCardinalityKeyNames.CURSOR_ID;
+import static com.mongodb.tracing.MongodbObservation.LowCardinalityKeyNames.SERVER_CONNECTION_ID;
+import static com.mongodb.tracing.MongodbObservation.LowCardinalityKeyNames.SERVER_PORT;
+import static com.mongodb.tracing.MongodbObservation.LowCardinalityKeyNames.SESSION_ID;
+import static com.mongodb.tracing.MongodbObservation.LowCardinalityKeyNames.TRANSACTION_NUMBER;
 import static org.bson.assertions.Assertions.notNull;
 import static org.junit.jupiter.api.Assertions.fail;
 
@@ -60,8 +67,8 @@ public static SpanTree from(final BsonArray spans) {
                 final SpanNode rootNode = new SpanNode(name);
                 spanTree.roots.add(rootNode);
 
-                if (spanDoc.containsKey("tags")) {
-                    rootNode.tags = spanDoc.getDocument("tags");
+                if (spanDoc.containsKey("attributes")) {
+                    rootNode.tags = spanDoc.getDocument("attributes");
                 }
 
                 if (spanDoc.containsKey("nested")) {
@@ -101,8 +108,15 @@ public static SpanTree from(final Deque spans) {
             for (final Map.Entry tag : span.getTags().entrySet()) {
                 // handle special case of session id (needs to be parsed into a BsonBinary)
                 // this is needed because the SimpleTracer reports all the collected tags as strings
-                if (tag.getKey().equals(Tags.SESSION_ID)) {
+                if (tag.getKey().equals(SESSION_ID.asString())) {
                     spanNode.tags.append(tag.getKey(), new BsonDocument().append("id", new BsonBinary(UUID.fromString(tag.getValue()))));
+
+                } else if (tag.getKey().equals(CURSOR_ID.asString())
+                        || tag.getKey().equals(SERVER_PORT.asString())
+                        || tag.getKey().equals(TRANSACTION_NUMBER.asString())
+                        || tag.getKey().equals(CLIENT_CONNECTION_ID.asString())
+                        || tag.getKey().equals(SERVER_CONNECTION_ID.asString())) {
+                    spanNode.tags.append(tag.getKey(), new BsonInt64(Long.parseLong(tag.getValue())));
                 } else {
                     spanNode.tags.append(tag.getKey(), new BsonString(tag.getValue()));
                 }
@@ -123,6 +137,43 @@ public static SpanTree from(final Deque spans) {
         return spanTree;
     }
 
+    public static SpanTree from(final List spans) {
+        final SpanTree spanTree = new SpanTree();
+        final Map idToSpanNode = new HashMap<>();
+        for (final FinishedSpan span : spans) {
+            final SpanNode spanNode = new SpanNode(span.getName());
+            for (final Map.Entry tag : span.getTags().entrySet()) {
+                // handle special case of session id (needs to be parsed into a BsonBinary)
+                // this is needed because the SimpleTracer reports all the collected tags as strings
+                if (tag.getKey().equals(SESSION_ID.asString())) {
+                    spanNode.tags.append(tag.getKey(), new BsonDocument().append("id", new BsonBinary(UUID.fromString(tag.getValue()))));
+
+                } else if (tag.getKey().equals(CURSOR_ID.asString())
+                        || tag.getKey().equals(SERVER_PORT.asString())
+                        || tag.getKey().equals(TRANSACTION_NUMBER.asString())
+                        || tag.getKey().equals(CLIENT_CONNECTION_ID.asString())
+                        || tag.getKey().equals(SERVER_CONNECTION_ID.asString())) {
+                    spanNode.tags.append(tag.getKey(), new BsonInt64(Long.parseLong(tag.getValue())));
+                } else {
+                    spanNode.tags.append(tag.getKey(), new BsonString(tag.getValue()));
+                }
+            }
+            idToSpanNode.put(span.getSpanId(), spanNode);
+        }
+
+        for (final FinishedSpan span : spans) {
+            final String parentId = span.getParentId();
+            final SpanNode node = idToSpanNode.get(span.getSpanId());
+
+            if (parentId != null && !parentId.isEmpty() && idToSpanNode.containsKey(parentId)) {
+                idToSpanNode.get(parentId).children.add(node);
+            } else { // doesn't have a parent, so it is a root node
+                spanTree.roots.add(node);
+            }
+        }
+        return spanTree;
+    }
+
     /**
      * Adds nested spans to the parent node based on the provided BsonDocument.
      * This method recursively adds child spans to the parent span node.
@@ -134,8 +185,8 @@ private static void addNestedSpans(final SpanNode parentNode, final BsonDocument
         final String name = nestedSpan.getString("name").getValue();
         final SpanNode childNode = new SpanNode(name, parentNode);
 
-        if (nestedSpan.containsKey("tags")) {
-            childNode.tags = nestedSpan.getDocument("tags");
+        if (nestedSpan.containsKey("attributes")) {
+            childNode.tags = nestedSpan.getDocument("attributes");
         }
 
         if (nestedSpan.containsKey("nested")) {
@@ -159,8 +210,9 @@ public static void assertValid(final SpanTree reportedSpans, final SpanTree expe
             final boolean ignoreExtraSpans) {
         if (ignoreExtraSpans) {
             // remove from the reported spans all the nodes that are not expected
-            reportedSpans.roots.removeIf(node -> !expectedSpans.roots.contains(node));
-
+            reportedSpans.roots.removeIf(node ->
+                    expectedSpans.roots.stream().noneMatch(expectedNode -> expectedNode.getName().equalsIgnoreCase(node.getName()))
+            );
         }
 
         // check that we have the same root spans
diff --git a/driver-sync/src/test/functional/com/mongodb/client/tracing/ZipkinTracer.java b/driver-sync/src/test/functional/com/mongodb/client/tracing/ZipkinTracer.java
deleted file mode 100644
index 186835c6ca2..00000000000
--- a/driver-sync/src/test/functional/com/mongodb/client/tracing/ZipkinTracer.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright 2008-present MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.client.tracing;
-
-import io.micrometer.tracing.Tracer;
-import io.micrometer.tracing.otel.bridge.OtelCurrentTraceContext;
-import io.micrometer.tracing.otel.bridge.OtelTracer;
-import io.opentelemetry.api.OpenTelemetry;
-import io.opentelemetry.api.common.Attributes;
-import io.opentelemetry.context.propagation.ContextPropagators;
-import io.opentelemetry.exporter.zipkin.ZipkinSpanExporter;
-import io.opentelemetry.extension.trace.propagation.B3Propagator;
-import io.opentelemetry.sdk.OpenTelemetrySdk;
-import io.opentelemetry.sdk.resources.Resource;
-import io.opentelemetry.sdk.trace.SdkTracerProvider;
-import io.opentelemetry.sdk.trace.SpanProcessor;
-import io.opentelemetry.sdk.trace.export.SimpleSpanProcessor;
-import io.opentelemetry.semconv.ResourceAttributes;
-
-/**
- * A utility class to create a Zipkin tracer using OpenTelemetry protocol, useful for visualizing spans in Zipkin UI
- * This tracer can be used to send spans to a Zipkin server.
- * 

- * Spans are visible in the Zipkin UI at http://localhost:9411.
- * 

- * To Start Zipkin server, you can use the following command:
- * 
{@code
- * docker run -d -p 9411:9411 openzipkin/zipkin
- * }

- */
-public final class ZipkinTracer {
-    private static final String ENDPOINT = "http://localhost:9411/api/v2/spans";
-
-    private ZipkinTracer() {
-    }
-
-    /**
-     * Creates a Zipkin tracer with the specified service name.
-     *
-     * @param serviceName the name of the service to be used in the tracer
-     * @return a Tracer instance configured to send spans to Zipkin
-     */
-    public static Tracer getTracer(final String serviceName) {
-        ZipkinSpanExporter zipkinExporter = ZipkinSpanExporter.builder()
-                .setEndpoint(ENDPOINT)
-                .build();
-
-        Resource resource = Resource.getDefault()
-                .merge(Resource.create(
-                        Attributes.of(
-                                ResourceAttributes.SERVICE_NAME, serviceName,
-                                ResourceAttributes.SERVICE_VERSION, "1.0.0"
-                        )
-                ));
-
-        SpanProcessor spanProcessor = SimpleSpanProcessor.create(zipkinExporter);
-
-        SdkTracerProvider tracerProvider = SdkTracerProvider.builder()
-                .addSpanProcessor(spanProcessor)
-                .setResource(resource)
-                .build();
-
-        OpenTelemetry openTelemetry = OpenTelemetrySdk.builder()
-                .setTracerProvider(tracerProvider)
-                .setPropagators(ContextPropagators.create(
-                        B3Propagator.injectingSingleHeader()
-                ))
-                .build();
-
-        io.opentelemetry.api.trace.Tracer otelTracer = openTelemetry.getTracer("my-java-service", "1.0.0");
-
-        OtelCurrentTraceContext otelCurrentTraceContext = new OtelCurrentTraceContext();
-
-        return new OtelTracer(
-                otelTracer,
-                otelCurrentTraceContext,
-                null // EventPublisher can be null for basic usage
-        );
-    }
-
-}
diff --git a/driver-sync/src/test/functional/com/mongodb/client/unified/Entities.java b/driver-sync/src/test/functional/com/mongodb/client/unified/Entities.java
index c0d33b06d91..bff1951c16b 100644
--- a/driver-sync/src/test/functional/com/mongodb/client/unified/Entities.java
+++ b/driver-sync/src/test/functional/com/mongodb/client/unified/Entities.java
@@ -67,8 +67,8 @@
 import com.mongodb.lang.Nullable;
 import com.mongodb.logging.TestLoggingInterceptor;
 import com.mongodb.tracing.MicrometerTracer;
-import io.micrometer.tracing.Tracer;
-import io.micrometer.tracing.test.simple.SimpleTracer;
+import io.micrometer.observation.ObservationRegistry;
+import io.micrometer.tracing.test.reporter.inmemory.InMemoryOtelSetup;
 import org.bson.BsonArray;
 import org.bson.BsonBoolean;
 import org.bson.BsonDocument;
@@ -129,7 +129,8 @@ public final class Entities {
     private final Map clientEncryptions = new HashMap<>();
     private final Map clientCommandListeners = new HashMap<>();
     private final Map clientLoggingInterceptors = new HashMap<>();
-    private final Map clientTracing = new HashMap<>();
+    private final Map clientTracing = new HashMap<>();
+    private final Set inMemoryOTelInstances = new HashSet<>();
     private final Map clientConnectionPoolListeners = new HashMap<>();
     private final Map clientServerListeners = new HashMap<>();
     private final Map clientClusterListeners = new HashMap<>();
@@ -298,7 +299,7 @@ public TestLoggingInterceptor getClientLoggingInterceptor(final String id) {
         return getEntity(id + "-logging-interceptor", clientLoggingInterceptors, "logging interceptor");
     }
 
-    public Tracer getClientTracer(final String id) {
+    public InMemoryOtelSetup.Builder.OtelBuildingBlocks getClientTracer(final String id) {
         return getEntity(id + "-tracing", clientTracing, "micrometer tracing");
     }
 
@@ -615,17 +616,13 @@ private void initClient(final BsonDocument entity, final String id,
 
         if (entity.containsKey("observeTracingMessages")) {
             boolean enableCommandPayload = entity.getDocument("observeTracingMessages").get("enableCommandPayload", BsonBoolean.FALSE).asBoolean().getValue();
-            /* To enable Zipkin backend, uncomment the following lines and ensure you have the server started
-            (docker run -d -p 9411:9411 openzipkin/zipkin). The tests will fail but the captured spans will be
-             visible in the Zipkin UI at http://localhost:9411 for debugging purpose.
-             *
-             * Tracer tracer = ZipkinTracer.getTracer("UTR");
-             * putEntity(id + "-tracing", new SimpleTracer(), clientTracing);
-             */
-            Tracer tracer = new SimpleTracer();
-            putEntity(id + "-tracing", tracer, clientTracing);
+            ObservationRegistry observationRegistry = ObservationRegistry.create();
+            InMemoryOtelSetup inMemoryOtel = InMemoryOtelSetup.builder().register(observationRegistry);
+            InMemoryOtelSetup.Builder.OtelBuildingBlocks tracer = inMemoryOtel.getBuildingBlocks();
 
-            clientSettingsBuilder.tracer(new MicrometerTracer(tracer, enableCommandPayload));
+            putEntity(id + "-tracing", tracer, clientTracing);
+            inMemoryOTelInstances.add(inMemoryOtel);
+            clientSettingsBuilder.tracer(new MicrometerTracer(observationRegistry, enableCommandPayload));
         }
 
         MongoClientSettings clientSettings = clientSettingsBuilder.build();
@@ -818,6 +815,7 @@ public void close() {
         clients.values().forEach(MongoClient::close);
         clientLoggingInterceptors.values().forEach(TestLoggingInterceptor::close);
         threads.values().forEach(ExecutorService::shutdownNow);
+        inMemoryOTelInstances.forEach(InMemoryOtelSetup::close);
     }
 
     private static class EntityCommandListener implements CommandListener {
diff --git a/driver-sync/src/test/functional/com/mongodb/client/unified/UnifiedTest.java b/driver-sync/src/test/functional/com/mongodb/client/unified/UnifiedTest.java
index 8e91e85205b..9effc2a2e72 100644
--- a/driver-sync/src/test/functional/com/mongodb/client/unified/UnifiedTest.java
+++ b/driver-sync/src/test/functional/com/mongodb/client/unified/UnifiedTest.java
@@ -45,8 +45,7 @@
 import com.mongodb.lang.Nullable;
 import com.mongodb.logging.TestLoggingInterceptor;
 import com.mongodb.test.AfterBeforeParameterResolver;
-import io.micrometer.tracing.Tracer;
-import io.micrometer.tracing.test.simple.SimpleTracer;
+import io.micrometer.tracing.test.reporter.inmemory.InMemoryOtelSetup;
 import org.bson.BsonArray;
 import org.bson.BsonBoolean;
 import org.bson.BsonDocument;
@@ -114,7 +113,7 @@ public abstract class UnifiedTest {
     private static final Set PRESTART_POOL_ASYNC_WORK_MANAGER_FILE_DESCRIPTIONS = Collections.singleton(
             "wait queue timeout errors include details about checked out connections");
 
-    private static final String MAX_SUPPORTED_SCHEMA_VERSION = "1.26";
+    private static final String MAX_SUPPORTED_SCHEMA_VERSION = "1.27";
     private static final List MAX_SUPPORTED_SCHEMA_VERSION_COMPONENTS = Arrays.stream(MAX_SUPPORTED_SCHEMA_VERSION.split("\\."))
             .map(Integer::parseInt)
             .collect(Collectors.toList());
@@ -496,17 +495,19 @@ private void compareLogMessages(final UnifiedTestContext rootContext, final Bson
     }
 
     private void compareTracingSpans(final BsonDocument definition) {
-        BsonDocument curTracingSpansForClient = definition.getDocument("expectTracingMessages");
-        String clientId = curTracingSpansForClient.getString("client").getValue();
-
-        // Get the tracer for the client
-        Tracer micrometerTracer = entities.getClientTracer(clientId);
-        SimpleTracer simpleTracer = (SimpleTracer) micrometerTracer;
-
-        SpanTree expectedSpans = SpanTree.from(curTracingSpansForClient.getArray("spans"));
-        SpanTree reportedSpans = SpanTree.from(simpleTracer.getSpans());
-        boolean ignoreExtraSpans = curTracingSpansForClient.getBoolean("ignoreExtraSpans", BsonBoolean.TRUE).getValue();
-        SpanTree.assertValid(reportedSpans, expectedSpans, rootContext.valueMatcher::assertValuesMatch, ignoreExtraSpans);
+        BsonArray curTracingSpansForClients = definition.getArray("expectTracingMessages");
+        for (BsonValue tracingSpan : curTracingSpansForClients) {
+            BsonDocument curTracingSpansForClient = tracingSpan.asDocument();
+            String clientId = curTracingSpansForClient.getString("client").getValue();
+
+            // Get the tracer for the client
+            InMemoryOtelSetup.Builder.OtelBuildingBlocks micrometerTracer = entities.getClientTracer(clientId);
+
+            SpanTree expectedSpans = SpanTree.from(curTracingSpansForClient.getArray("spans"));
+            SpanTree reportedSpans = SpanTree.from(micrometerTracer.getFinishedSpans());
+            boolean ignoreExtraSpans = curTracingSpansForClient.getBoolean("ignoreExtraSpans", BsonBoolean.TRUE).getValue();
+            SpanTree.assertValid(reportedSpans, expectedSpans, rootContext.valueMatcher::assertValuesMatch, ignoreExtraSpans);
+        }
     }
 
     private void assertOutcome(final UnifiedTestContext context) {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 38805b02353..057e3bc5430 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -24,9 +24,8 @@ reactive-streams = "1.0.4"
 snappy = "1.1.10.3"
 zstd = "1.5.5-3"
 jetbrains-annotations = "26.0.2"
-micrometer = "1.4.5"
-zipkin-reporter = "2.16.3"
-opentelemetry-exporter-zipkin = "1.30.0"
+micrometer = "1.6.0-M3" # This version has a fix for https://github.com/micrometer-metrics/tracing/issues/1092
+micrometer-observation = "1.15.4"
 
 kotlin = "1.8.10"
 kotlinx-coroutines-bom = "1.6.4"
@@ -96,7 +95,7 @@ reactive-streams = { module = " org.reactivestreams:reactive-streams", version.r
 slf4j = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
 snappy-java = { module = "org.xerial.snappy:snappy-java", version.ref = "snappy" }
 zstd-jni = { module = "com.github.luben:zstd-jni", version.ref = "zstd" }
-micrometer = { module = "io.micrometer:micrometer-tracing", version.ref = "micrometer" }
+micrometer-observation = { module = "io.micrometer:micrometer-observation", version.ref = "micrometer-observation" }
 
 graal-sdk = { module = "org.graalvm.sdk:graal-sdk", version.ref = "graal-sdk" }
 graal-sdk-nativeimage = { module = "org.graalvm.sdk:nativeimage", version.ref = "graal-sdk" }
@@ -175,13 +174,7 @@ objenesis = { module = "org.objenesis:objenesis", version.ref = "objenesis" }
 project-reactor-test = { module = "io.projectreactor:reactor-test" }
 reactive-streams-tck = { module = " org.reactivestreams:reactive-streams-tck", version.ref = "reactive-streams" }
 reflections = { module = "org.reflections:reflections", version.ref = "reflections" }
-
-micrometer-tracing-test = { module = " io.micrometer:micrometer-tracing-test", version.ref = "micrometer" }
-micrometer-tracing-bridge-brave = { module = " io.micrometer:micrometer-tracing-bridge-brave", version.ref = "micrometer" }
-micrometer-tracing = { module = " io.micrometer:micrometer-tracing", version.ref = "micrometer" }
-micrometer-tracing-bridge-otel = { module = " io.micrometer:micrometer-tracing-bridge-otel", version.ref = "micrometer" }
-zipkin-reporter = { module = " io.zipkin.reporter2:zipkin-reporter", version.ref = "zipkin-reporter" }
-opentelemetry-exporter-zipkin = { module = " io.opentelemetry:opentelemetry-exporter-zipkin", version.ref = "opentelemetry-exporter-zipkin" }
+micrometer-tracing-integration-test = { module = " io.micrometer:micrometer-tracing-integration-test", version.ref = "micrometer" }
 
 [bundles]
 aws-java-sdk-v1 = ["aws-java-sdk-v1-core", "aws-java-sdk-v1-sts"]
@@ -208,9 +201,6 @@ scala-test-v2-v12 = ["scala-test-flatspec-v2-v12", "scala-test-shouldmatchers-v2
 scala-test-v2-v11 = ["scala-test-flatspec-v2-v11", "scala-test-shouldmatchers-v2-v11", "scala-test-mockito-v2-v11",
     "scala-test-junit-runner-v2-v11", "reflections"]
 
-micrometer-test = ["micrometer-tracing-test", "micrometer-tracing-bridge-brave", "micrometer-tracing-bridge-otel",
-    "micrometer-tracing", "zipkin-reporter", "opentelemetry-exporter-zipkin"]
-
 [plugins]
 kotlin-gradle = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 bnd = { id = "biz.aQute.bnd.builder", version.ref = "plugin-bnd" }

From fecb8b595d284e8cfae42eda5dc821e768d87a22 Mon Sep 17 00:00:00 2001
From: Nabil Hachicha 
Date: Wed, 15 Oct 2025 21:31:38 +0100
Subject: [PATCH 36/36] wip

---
 .../connection/InternalStreamConnection.java    | 11 +++++------
 .../client/internal/MongoClusterImpl.java       | 17 ++++++++---------
 .../com/mongodb/client/unified/Entities.java    |  3 ++-
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/driver-core/src/main/com/mongodb/internal/connection/InternalStreamConnection.java b/driver-core/src/main/com/mongodb/internal/connection/InternalStreamConnection.java
index aca3537348c..e15f0b19a30 100644
--- a/driver-core/src/main/com/mongodb/internal/connection/InternalStreamConnection.java
+++ b/driver-core/src/main/com/mongodb/internal/connection/InternalStreamConnection.java
@@ -1084,9 +1084,10 @@ private Span createTracingSpan(final CommandMessage message, final OperationCont
         return span;
     }
 
+    @SuppressWarnings("deprecation")
     private void tagNamespace(final Span span, @Nullable final Span parentSpan, final CommandMessage message, final String commandName) {
-        String namespace;
-        String collection;
+        String namespace = "ns";
+        String collection = "col";
         if (parentSpan != null) {
             MongoNamespace parentNamespace = parentSpan.getNamespace();
             if (parentNamespace != null) {
@@ -1095,12 +1096,10 @@ private void tagNamespace(final Span span, @Nullable final Span parentSpan, fina
                         MongoNamespace.COMMAND_COLLECTION_NAME.equalsIgnoreCase(parentNamespace.getCollectionName()) ? ""
                                 : parentNamespace.getCollectionName();
             } else {
-                namespace = message.getNamespace().getDatabaseName();
-                collection = message.getCollectionName().contains("$cmd") ? "" : message.getCollectionName();
+                namespace = message.getDatabase();
             }
         } else {
-            namespace = message.getNamespace().getDatabaseName();
-            collection = message.getCollectionName().contains("$cmd") ? "" : message.getCollectionName();
+            namespace = message.getDatabase();
         }
         String summary = commandName + " " + namespace + (collection.isEmpty() ? "" : "." + collection);
 
diff --git a/driver-sync/src/main/com/mongodb/client/internal/MongoClusterImpl.java b/driver-sync/src/main/com/mongodb/client/internal/MongoClusterImpl.java
index 32cb5afb5db..f0902eb4c2d 100644
--- a/driver-sync/src/main/com/mongodb/client/internal/MongoClusterImpl.java
+++ b/driver-sync/src/main/com/mongodb/client/internal/MongoClusterImpl.java
@@ -44,7 +44,6 @@
 import com.mongodb.client.model.bulk.ClientNamespacedWriteModel;
 import com.mongodb.internal.IgnorableRequestContext;
 import com.mongodb.internal.TimeoutSettings;
-import com.mongodb.internal.binding.BindingContext;
 import com.mongodb.internal.binding.ClusterAwareReadWriteBinding;
 import com.mongodb.internal.binding.ClusterBinding;
 import com.mongodb.internal.binding.ReadBinding;
@@ -437,7 +436,7 @@ public  T execute(final ReadOperation operation, final ReadPreference r
                     .withSessionContext(new ClientSessionBinding.SyncClientSessionContext(actualClientSession, readConcern, implicitSession));
             ReadBinding binding = getReadBinding(readPreference, actualClientSession, implicitSession);
 
-            Span span = createOperationSpan(actualClientSession, binding, operation.getCommandName(), operation.getNamespace());
+            Span span = createOperationSpan(actualClientSession, operationContext, operation.getCommandName(), operation.getNamespace());
 
             try {
                 if (actualClientSession.hasActiveTransaction() && !binding.getReadPreference().equals(primary())) {
@@ -472,7 +471,7 @@ public  T execute(final WriteOperation operation, final ReadConcern readCo
                     .withSessionContext(new ClientSessionBinding.SyncClientSessionContext(actualClientSession, readConcern, isImplicitSession(session)));
             WriteBinding binding = getWriteBinding(actualClientSession, isImplicitSession(session));
 
-            Span span = createOperationSpan(actualClientSession, binding, operation.getCommandName(), operation.getNamespace());
+            Span span = createOperationSpan(actualClientSession, operationContext, operation.getCommandName(), operation.getNamespace());
             try {
                 return operation.execute(binding, operationContext);
             } catch (MongoException e) {
@@ -592,14 +591,15 @@ ClientSession getClientSession(@Nullable final ClientSession clientSessionFromOp
          * Create a tracing span for the given operation, and set it on operation context.
          *
          * @param actualClientSession the session that the operation is part of
-         * @param binding             the binding for the operation
+         * @param operationContext    the operation context
          * @param commandName         the name of the command
          * @param namespace           the namespace of the command
          * @return the created span, or null if tracing is not enabled
          */
         @Nullable
-        private Span createOperationSpan(final ClientSession actualClientSession, final BindingContext binding, final String commandName, final MongoNamespace namespace) {
-            TracingManager tracingManager = binding.getOperationContext().getTracingManager();
+        private Span createOperationSpan(final ClientSession actualClientSession, final OperationContext operationContext, final String commandName,
+                final MongoNamespace namespace) {
+            TracingManager tracingManager = operationContext.getTracingManager();
             if (tracingManager.isEnabled()) {
                 TraceContext parentContext = null;
                 TransactionSpan transactionSpan = actualClientSession.getTransactionSpan();
@@ -619,14 +619,13 @@ private Span createOperationSpan(final ClientSession actualClientSession, final
                 keyValues = keyValues.and(OPERATION_NAME.withValue(commandName),
                         OPERATION_SUMMARY.withValue(name));
 
-                Span span = binding
-                        .getOperationContext()
+                Span span = operationContext
                         .getTracingManager()
                         .addSpan(name, parentContext, namespace);
 
                 span.tagLowCardinality(keyValues);
 
-                binding.getOperationContext().setTracingSpan(span);
+                operationContext.setTracingSpan(span);
                 return span;
 
             } else {
diff --git a/driver-sync/src/test/functional/com/mongodb/client/unified/Entities.java b/driver-sync/src/test/functional/com/mongodb/client/unified/Entities.java
index d8497a97143..2e81711c3f7 100644
--- a/driver-sync/src/test/functional/com/mongodb/client/unified/Entities.java
+++ b/driver-sync/src/test/functional/com/mongodb/client/unified/Entities.java
@@ -93,7 +93,8 @@ public final class Entities {
     private static final Set SUPPORTED_CLIENT_ENTITY_OPTIONS = new HashSet<>(
             asList(
                     "id", "autoEncryptOpts", "uriOptions", "serverApi", "useMultipleMongoses", "storeEventsAsEntities",
-                    "observeEvents", "observeLogMessages", "observeSensitiveCommands", "ignoreCommandMonitoringEvents", "observeTracingMessages"));
+                    "observeEvents", "observeLogMessages", "observeSensitiveCommands", "ignoreCommandMonitoringEvents",
+                    "observeTracingMessages", "awaitMinPoolSizeMS"));
     private final Set entityNames = new HashSet<>();
     private final Map threads = new HashMap<>();
     private final Map>> tasks = new HashMap<>();