Merge pull request #811 from brucezlata/fixcosmosclientleak

fix cosmos client leak

Author: danielgerlag

src/providers/WorkflowCore.Providers.Azure/Interface/ICosmosClientFactory.cs

@@ -0,0 +1,9 @@
+using Microsoft.Azure.Cosmos;
+
+namespace WorkflowCore.Providers.Azure.Interface
+{
+    public interface ICosmosClientFactory
+    {
+        CosmosClient GetCosmosClient();
+    }
+}

src/providers/WorkflowCore.Providers.Azure/ServiceCollectionExtensions.cs

@@ -28,8 +28,9 @@ public static WorkflowOptions UseAzureServiceBusEventHub(
 
         public static WorkflowOptions UseCosmosDbPersistence(this WorkflowOptions options, string connectionString, string databaseId)
         {
-            options.Services.AddTransient<ICosmosDbProvisioner>(sp => new CosmosDbProvisioner(connectionString, sp.GetService<ILoggerFactory>()));
-            options.UsePersistence(sp => new CosmosDbPersistenceProvider(connectionString, databaseId, sp.GetService<ICosmosDbProvisioner>()));
+            options.Services.AddSingleton<ICosmosClientFactory>(sp => new CosmosClientFactory(connectionString));
+            options.Services.AddTransient<ICosmosDbProvisioner>(sp => new CosmosDbProvisioner(sp.GetService<ICosmosClientFactory>(), sp.GetService<ILoggerFactory>()));
+            options.UsePersistence(sp => new CosmosDbPersistenceProvider(sp.GetService<ICosmosClientFactory>(), databaseId, sp.GetService<ICosmosDbProvisioner>()));
             return options;
         }
     }

src/providers/WorkflowCore.Providers.Azure/Services/CosmosClientFactory.cs

@@ -0,0 +1,48 @@
+using System;
+using Microsoft.Azure.Cosmos;
+using WorkflowCore.Providers.Azure.Interface;
+
+namespace WorkflowCore.Providers.Azure.Services
+{
+    public class CosmosClientFactory : ICosmosClientFactory, IDisposable
+    {
+        private bool isDisposed = false;
+
+        private CosmosClient _client;
+
+        public CosmosClientFactory(string connectionString)
+        {
+            _client = new CosmosClient(connectionString);
+        }
+
+        public CosmosClient GetCosmosClient()
+        {
+            return this._client;
+        }
+
+        /// <summary>
+        /// Dispose of cosmos client
+        /// </summary>
+        public void Dispose()
+        {
+            this.Dispose(true);
+        }
+
+        /// <summary>
+        /// Dispose of cosmos client
+        /// </summary>
+        /// <param name="disposing">True if disposing</param>
+        protected virtual void Dispose(bool disposing)
+        {
+            if (!this.isDisposed)
+            {
+                if (disposing)
+                {
+                    this._client.Dispose();
+                }
+
+                this.isDisposed = true;
+            }
+        }
+    }
+}

src/providers/WorkflowCore.Providers.Azure/Services/CosmosDbPersistenceProvider.cs

@@ -19,19 +19,19 @@ public class CosmosDbPersistenceProvider : IPersistenceProvider
 
         private ICosmosDbProvisioner _provisioner;
         private string _dbId;
-        private CosmosClient _client;
+        private ICosmosClientFactory _clientFactory;
         private Lazy<Container> _workflowContainer;
         private Lazy<Container> _eventContainer;
         private Lazy<Container> _subscriptionContainer;
 
-        public CosmosDbPersistenceProvider(string connectionString, string dbId, ICosmosDbProvisioner provisioner)
+        public CosmosDbPersistenceProvider(ICosmosClientFactory clientFactory, string dbId, ICosmosDbProvisioner provisioner)
         {
             _provisioner = provisioner;
             _dbId = dbId;
-            _client = new CosmosClient(connectionString);
-            _workflowContainer = new Lazy<Container>(() => _client.GetDatabase(_dbId).GetContainer(WorkflowContainerName));
-            _eventContainer = new Lazy<Container>(() => _client.GetDatabase(_dbId).GetContainer(EventContainerName));
-            _subscriptionContainer = new Lazy<Container>(() => _client.GetDatabase(_dbId).GetContainer(SubscriptionContainerName));
+            _clientFactory = clientFactory;
+            _workflowContainer = new Lazy<Container>(() => _clientFactory.GetCosmosClient().GetDatabase(_dbId).GetContainer(WorkflowContainerName));
+            _eventContainer = new Lazy<Container>(() => _clientFactory.GetCosmosClient().GetDatabase(_dbId).GetContainer(EventContainerName));
+            _subscriptionContainer = new Lazy<Container>(() => _clientFactory.GetCosmosClient().GetDatabase(_dbId).GetContainer(SubscriptionContainerName));
         }
 
         public async Task ClearSubscriptionToken(string eventSubscriptionId, string token)
@@ -70,7 +70,7 @@ public async Task<string> CreateNewWorkflow(WorkflowInstance workflow)
 
         public void EnsureStoreExists()
         {
-            _provisioner.Provision(_dbId).Wait();
+            _provisioner.Provision(_dbId).ConfigureAwait(false).GetAwaiter().GetResult();
         }
 
         public async Task<Event> GetEvent(string id)

src/providers/WorkflowCore.Providers.Azure/Services/CosmosDbProvisioner.cs

@@ -9,16 +9,16 @@ namespace WorkflowCore.Providers.Azure.Services
     public class CosmosDbProvisioner : ICosmosDbProvisioner
     {
 
-        private CosmosClient _client;
+        private ICosmosClientFactory _clientFactory;
 
-        public CosmosDbProvisioner(string connectionString, ILoggerFactory loggerFactory)
+        public CosmosDbProvisioner(ICosmosClientFactory clientFactory, ILoggerFactory loggerFactory)
         {
-            _client = new CosmosClient(connectionString);
+            _clientFactory = clientFactory;
         }
 
         public async Task Provision(string dbId)
         {
-            var dbResp = await _client.CreateDatabaseIfNotExistsAsync(dbId);
+            var dbResp = await _clientFactory.GetCosmosClient().CreateDatabaseIfNotExistsAsync(dbId);
             var wfIndexPolicy = new IndexingPolicy();
             wfIndexPolicy.IncludedPaths.Add(new IncludedPath { Path = @"/*" });
             wfIndexPolicy.ExcludedPaths.Add(new ExcludedPath { Path = @"/ExecutionPointers/?" });
@@ -32,6 +32,5 @@ public async Task Provision(string dbId)
                 dbResp.Database.CreateContainerIfNotExistsAsync(new ContainerProperties(CosmosDbPersistenceProvider.SubscriptionContainerName, @"/id"))
             );
         }
-
     }
-}
+}

src/providers/WorkflowCore.Providers.Azure/WorkflowCore.Providers.Azure.csproj

@@ -7,15 +7,15 @@
 - Provides distributed lock management  on Workflow Core
 - Provides Queueing support  on Workflow Core</Description>
     <PackageTags>workflow workflowcore dlm</PackageTags>
-    <Version>3.1.0</Version>
+    <Version>3.2.0</Version>
     <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.3' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
     <PackageProjectUrl>https://github.com/danielgerlag/workflow-core</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/danielgerlag/workflow-core/blob/master/LICENSE.md</PackageLicenseUrl>
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>https://github.com/danielgerlag/workflow-core.git</RepositoryUrl>
     <Authors>Daniel Gerlag</Authors>
-    <AssemblyVersion>3.1.0.0</AssemblyVersion>
-    <FileVersion>3.1.0.0</FileVersion>
+    <AssemblyVersion>3.2.0.0</AssemblyVersion>
+    <FileVersion>3.2.0.0</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>