PR

Author: Oleksandr Poliakov

src/MongoDB.Driver/MongoClient.cs

@@ -41,6 +41,7 @@ public sealed class MongoClient : IMongoClient
         private readonly IClusterInternal _cluster;
 #pragma warning restore CA2213 // Disposable fields should be disposed
         private readonly IAutoEncryptionLibMongoCryptController _libMongoCryptController;
+        private readonly Func<IMongoClient, IOperationExecutor> _operationExecutorFactory;
         private readonly IOperationExecutor _operationExecutor;
         private readonly MongoClientSettings _settings;
         private readonly ILogger<LogCategories.Client> _logger;
@@ -61,26 +62,9 @@ public MongoClient()
         /// </summary>
         /// <param name="settings">The settings.</param>
         public MongoClient(MongoClientSettings settings)
+            : this(client => new OperationExecutor(client), settings)
         {
-            _settings = Ensure.IsNotNull(settings, nameof(settings)).FrozenCopy();
-            _logger = _settings.LoggingSettings?.CreateLogger<LogCategories.Client>();
 
-            _cluster = _settings.ClusterSource.Get(_settings.ToClusterKey());
-            _operationExecutor = new OperationExecutor(this);
-            _readOperationOptions = new(DefaultReadPreference: _settings.ReadPreference);
-            _writeOperationOptions = new();
-
-            if (settings.AutoEncryptionOptions != null)
-            {
-                _libMongoCryptController =
-                    MongoClientSettings.Extensions.AutoEncryptionProvider.CreateAutoCryptClientController(this, settings.AutoEncryptionOptions);
-
-                _settings.LoggingSettings?.CreateLogger<LogCategories.Client>()?.LogTrace(
-                    StructuredLogTemplateProviders.TopologyId_Message_SharedLibraryVersion,
-                    _cluster.ClusterId,
-                    "CryptClient created. Configured shared library version: ",
-                    _libMongoCryptController.CryptSharedLibraryVersion() ?? "None");
-            }
         }
 
         /// <summary>
@@ -101,10 +85,27 @@ public MongoClient(string connectionString)
         {
         }
 
-        internal MongoClient(IOperationExecutor operationExecutor, MongoClientSettings settings)
-            : this(settings)
+        internal MongoClient(Func<IMongoClient, IOperationExecutor> operationExecutorFactory, MongoClientSettings settings)
         {
-            _operationExecutor = new OperationExecutorWrapper(operationExecutor);
+            _operationExecutorFactory = Ensure.IsNotNull(operationExecutorFactory, nameof(operationExecutorFactory));
+            _settings = Ensure.IsNotNull(settings, nameof(settings)).FrozenCopy();
+            _logger = _settings.LoggingSettings?.CreateLogger<LogCategories.Client>();
+            _cluster = _settings.ClusterSource.Get(_settings.ToClusterKey());
+            _operationExecutor = _operationExecutorFactory(this);
+            _readOperationOptions = new(DefaultReadPreference: _settings.ReadPreference);
+            _writeOperationOptions = new();
+
+            if (settings.AutoEncryptionOptions != null)
+            {
+                _libMongoCryptController =
+                    MongoClientSettings.Extensions.AutoEncryptionProvider.CreateAutoCryptClientController(this, settings.AutoEncryptionOptions);
+
+                _settings.LoggingSettings?.CreateLogger<LogCategories.Client>()?.LogTrace(
+                    StructuredLogTemplateProviders.TopologyId_Message_SharedLibraryVersion,
+                    _cluster.ClusterId,
+                    "CryptClient created. Configured shared library version: ",
+                    _libMongoCryptController.CryptSharedLibraryVersion() ?? "None");
+            }
         }
 
         // public properties
@@ -442,7 +443,7 @@ public IMongoClient WithReadConcern(ReadConcern readConcern)
 
             var newSettings = Settings.Clone();
             newSettings.ReadConcern = readConcern;
-            return new MongoClient(_operationExecutor, newSettings);
+            return new MongoClient(_operationExecutorFactory, newSettings);
         }
 
         /// <inheritdoc/>
@@ -454,7 +455,7 @@ public IMongoClient WithReadPreference(ReadPreference readPreference)
 
             var newSettings = Settings.Clone();
             newSettings.ReadPreference = readPreference;
-            return new MongoClient(_operationExecutor, newSettings);
+            return new MongoClient(_operationExecutorFactory, newSettings);
         }
 
         /// <inheritdoc/>
@@ -466,7 +467,7 @@ public IMongoClient WithWriteConcern(WriteConcern writeConcern)
 
             var newSettings = Settings.Clone();
             newSettings.WriteConcern = writeConcern;
-            return new MongoClient(_operationExecutor, newSettings);
+            return new MongoClient(_operationExecutorFactory, newSettings);
         }
 
         // private methods

src/MongoDB.Driver/MongoDatabase.cs

@@ -39,7 +39,6 @@ internal sealed class MongoDatabase : IMongoDatabase
         private readonly DatabaseNamespace _databaseNamespace;
         private readonly IOperationExecutor _operationExecutor;
         private readonly MongoDatabaseSettings _settings;
-
         private readonly ReadOperationOptions _readOperationOptions;
         private readonly WriteOperationOptions _writeOperationOptions;
 
@@ -52,8 +51,8 @@ public MongoDatabase(IMongoClient client, DatabaseNamespace databaseNamespace, M
             _cluster = Ensure.IsNotNull(cluster, nameof(cluster));
             _operationExecutor = Ensure.IsNotNull(operationExecutor, nameof(operationExecutor));
 
-            _readOperationOptions = new ReadOperationOptions(DefaultReadPreference: _settings.ReadPreference);
-            _writeOperationOptions = new WriteOperationOptions();
+            _readOperationOptions = new(DefaultReadPreference: _settings.ReadPreference);
+            _writeOperationOptions = new();
         }
 
         // public properties

src/MongoDB.Driver/OperationExecutorWrapper.cs

@@ -15,7 +15,7 @@
 
 namespace MongoDB.Driver
 {
-    internal record class ReadOperationOptions(ReadPreference ExplicitReadPreference = null, ReadPreference DefaultReadPreference = null);
+    internal record ReadOperationOptions(ReadPreference ExplicitReadPreference = null, ReadPreference DefaultReadPreference = null);
 
     internal static class ReadOperationOptionsExtensions
     {

src/MongoDB.Driver/ReadOperationOptions.cs

@@ -15,6 +15,6 @@
 
 namespace MongoDB.Driver
 {
-    internal record class WriteOperationOptions();
+    internal record WriteOperationOptions();
 }
 

src/MongoDB.Driver/WriteOperationOptions.cs

@@ -29,7 +29,7 @@ public class OperationExecutorTests
     {
         [Theory]
         [ParameterAttributeData]
-        public async Task StartImplicitSession_should_call_cluster([Values(true, false)]bool isAsync)
+        public async Task StartImplicitSession_should_call_cluster_StartSession([Values(true, false)]bool isAsync)
         {
             var subject = CreateSubject(out var clusterMock, out _);
             if (isAsync)