prevent memory leak

See #21
TechnoBerry · Dec 3, 2020 · f3bde9e · f3bde9e
1 parent 0ec845b
commit f3bde9e
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 28 deletions.
diff --git a/src/Camunda.Worker/Client/ExternalTaskClient.cs b/src/Camunda.Worker/Client/ExternalTaskClient.cs
@@ -14,11 +14,6 @@ public ExternalTaskClient(HttpClient httpClient)
             _httpClient = Guard.NotNull(httpClient, nameof(httpClient));
         }
 
-        public void Dispose()
-        {
-            _httpClient?.Dispose();
-        }
-
         public async Task<List<ExternalTask>> FetchAndLockAsync(
             FetchAndLockRequest request,
             CancellationToken cancellationToken = default

diff --git a/src/Camunda.Worker/Client/IExternalTaskClient.cs b/src/Camunda.Worker/Client/IExternalTaskClient.cs
@@ -1,11 +1,10 @@
-using System;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 
 namespace Camunda.Worker.Client
 {
-    public interface IExternalTaskClient : IDisposable
+    public interface IExternalTaskClient
     {
         Task<List<ExternalTask>> FetchAndLockAsync(
             FetchAndLockRequest request,

diff --git a/src/Camunda.Worker/Execution/ExternalTaskContext.cs b/src/Camunda.Worker/Execution/ExternalTaskContext.cs
@@ -28,7 +28,7 @@ public async Task ExtendLockAsync(int newDuration)
             ThrowIfDisposed();
             ThrowIfCompleted();
 
-            using var client = ServiceProvider.GetRequiredService<IExternalTaskClient>();
+            var client = ServiceProvider.GetRequiredService<IExternalTaskClient>();
             var request = new ExtendLockRequest(Task.WorkerId, newDuration);
             await client.ExtendLockAsync(Task.Id, request);
         }
@@ -39,7 +39,7 @@ public async Task CompleteAsync(IDictionary<string, Variable>? variables = null,
             ThrowIfDisposed();
             ThrowIfCompleted();
 
-            using var client = ServiceProvider.GetRequiredService<IExternalTaskClient>();
+            var client = ServiceProvider.GetRequiredService<IExternalTaskClient>();
             var request = new CompleteRequest(Task.WorkerId)
             {
                 Variables = variables,
@@ -57,7 +57,7 @@ public async Task ReportFailureAsync(string? errorMessage, string? errorDetails,
             ThrowIfDisposed();
             ThrowIfCompleted();
 
-            using var client = ServiceProvider.GetRequiredService<IExternalTaskClient>();
+            var client = ServiceProvider.GetRequiredService<IExternalTaskClient>();
             var request = new ReportFailureRequest(Task.WorkerId)
             {
                 ErrorMessage = errorMessage,
@@ -76,7 +76,7 @@ public async Task ReportBpmnErrorAsync(string errorCode, string errorMessage,
             ThrowIfDisposed();
             ThrowIfCompleted();
 
-            using var client = ServiceProvider.GetRequiredService<IExternalTaskClient>();
+            var client = ServiceProvider.GetRequiredService<IExternalTaskClient>();
             var request = new BpmnErrorRequest(Task.WorkerId, errorCode, errorMessage)
             {
                 Variables = variables

diff --git a/src/Camunda.Worker/Execution/ExternalTaskSelector.cs b/src/Camunda.Worker/Execution/ExternalTaskSelector.cs
@@ -4,7 +4,6 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Camunda.Worker.Client;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Options;
@@ -13,17 +12,17 @@ namespace Camunda.Worker.Execution
 {
     public sealed class ExternalTaskSelector : IExternalTaskSelector
     {
-        private readonly IServiceProvider _provider;
+        private readonly IExternalTaskClient _client;
         private readonly CamundaWorkerOptions _options;
         private readonly ILogger<ExternalTaskSelector> _logger;
 
         public ExternalTaskSelector(
-            IServiceProvider provider,
+            IExternalTaskClient client,
             IOptions<CamundaWorkerOptions> options,
             ILogger<ExternalTaskSelector>? logger = null
         )
         {
-            _provider = Guard.NotNull(provider, nameof(provider));
+            _client = Guard.NotNull(client, nameof(client));
             _options = Guard.NotNull(options, nameof(options)).Value;
             _logger = logger ?? NullLogger<ExternalTaskSelector>.Instance;
         }
@@ -33,13 +32,11 @@ public async Task<IEnumerable<ExternalTask>> SelectAsync(
             CancellationToken cancellationToken = default
         )
         {
-            var client = _provider.GetRequiredService<IExternalTaskClient>();
-
             try
             {
                 _logger.LogDebug("Waiting for external task");
                 var fetchAndLockRequest = MakeRequestBody(topics);
-                var externalTasks = await PerformSelection(client, fetchAndLockRequest, cancellationToken);
+                var externalTasks = await PerformSelection(fetchAndLockRequest, cancellationToken);
                 _logger.LogDebug("Locked {Count} external tasks", externalTasks.Count);
                 return externalTasks;
             }
@@ -49,10 +46,6 @@ public async Task<IEnumerable<ExternalTask>> SelectAsync(
                 await DelayOnFailure(cancellationToken);
                 return Enumerable.Empty<ExternalTask>();
             }
-            finally
-            {
-                client?.Dispose();
-            }
         }
 
         private FetchAndLockRequest MakeRequestBody(IEnumerable<FetchAndLockRequest.Topic> topics)
@@ -68,12 +61,11 @@ private FetchAndLockRequest MakeRequestBody(IEnumerable<FetchAndLockRequest.Topi
         }
 
         private async Task<List<ExternalTask>> PerformSelection(
-            IExternalTaskClient client,
             FetchAndLockRequest request,
             CancellationToken cancellationToken
         )
         {
-            var externalTasks = await client.FetchAndLockAsync(request, cancellationToken);
+            var externalTasks = await _client.FetchAndLockAsync(request, cancellationToken);
             return externalTasks;
         }
 

diff --git a/test/Camunda.Worker.Tests/Client/ExternalTaskCamundaTest.cs b/test/Camunda.Worker.Tests/Client/ExternalTaskCamundaTest.cs
@@ -28,7 +28,6 @@ public ExternalTaskCamundaTest()
         public void Dispose()
         {
             _handlerMock?.Dispose();
-            _client?.Dispose();
         }
 
         [Fact]

diff --git a/test/Camunda.Worker.Tests/Execution/ExternalTaskSelectorTest.cs b/test/Camunda.Worker.Tests/Execution/ExternalTaskSelectorTest.cs
@@ -3,7 +3,6 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Camunda.Worker.Client;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using Moq;
 using Xunit;
@@ -25,9 +24,8 @@ public class ExternalTaskSelectorTest
 
         public ExternalTaskSelectorTest()
         {
-            var provider = new ServiceCollection().AddSingleton(_clientMock.Object).BuildServiceProvider();
             _selector = new ExternalTaskSelector(
-                provider,
+                _clientMock.Object,
                 _options
             );
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -28,7 +28,6 @@ public ExternalTaskCamundaTest() @@
             public void Dispose()
             {
                 _handlerMock?.Dispose();
-                _client?.Dispose();
             }
             [Fact]
@@ Expand Down @@