Perf + Resource Utilization: Ensure proper dispose of disposable members

libraries/Microsoft.Bot.Builder/BotFrameworkAdapter.cs

@@ -370,10 +370,17 @@ public override async Task ContinueConversationAsync(ClaimsIdentity claimsIdenti
                     }
                 }
 
-                var connectorClient = await CreateConnectorClientAsync(reference.ServiceUrl, claimsIdentity, audience).ConfigureAwait(false);
-                context.TurnState.Add(connectorClient);
-
-                await RunPipelineAsync(context, callback, cancellationToken).ConfigureAwait(false);
+                using (var connectorClient = await CreateConnectorClientAsync(reference.ServiceUrl, claimsIdentity, audience).ConfigureAwait(false))
+                {
+                    // Make the connector client available in turn state
+                    context.TurnState.Add(connectorClient);
+
+                    // Run bot pipeline
+                    await RunPipelineAsync(context, callback, cancellationToken).ConfigureAwait(false);
+
+                    // Cleanup disposable resources in case other code kept a reference to it.
+                    context.TurnState.Set<IConnectorClient>(null);
+                }
             }
         }
 
@@ -448,12 +455,16 @@ public override async Task<InvokeResponse> ProcessActivityAsync(ClaimsIdentity c
                 // The OAuthScope is also stored on the TurnState to get the correct AppCredentials if fetching a token is required.
                 var scope = SkillValidation.IsSkillClaim(claimsIdentity.Claims) ? JwtTokenValidation.GetAppIdFromClaims(claimsIdentity.Claims) : GetBotFrameworkOAuthScope();
                 context.TurnState.Add(OAuthScopeKey, scope);
-                var connectorClient = await CreateConnectorClientAsync(activity.ServiceUrl, claimsIdentity, scope).ConfigureAwait(false);
-                context.TurnState.Add(connectorClient);
+                using (var connectorClient = await CreateConnectorClientAsync(activity.ServiceUrl, claimsIdentity, scope).ConfigureAwait(false))
+                {
+                    context.TurnState.Add(connectorClient);
+                    context.TurnState.Add(callback);
 
-                context.TurnState.Add(callback);
+                    await RunPipelineAsync(context, callback, cancellationToken).ConfigureAwait(false);
 
-                await RunPipelineAsync(context, callback, cancellationToken).ConfigureAwait(false);
+                    // Cleanup disposable resources in case other code kept a reference to it.
+                    context.TurnState.Set<IConnectorClient>(null);
+                }
 
                 // Handle ExpectedReplies scenarios where the all the activities have been buffered and sent back at once 
                 // in an invoke response.
@@ -1274,30 +1285,35 @@ public virtual Task CreateConversationAsync(string channelId, string serviceUrl,
         /// </remarks>
         public virtual async Task CreateConversationAsync(string channelId, string serviceUrl, AppCredentials credentials, ConversationParameters conversationParameters, BotCallbackHandler callback, CancellationToken cancellationToken)
         {
-            var connectorClient = CreateConnectorClient(serviceUrl, credentials);
+            using (var connectorClient = CreateConnectorClient(serviceUrl, credentials))
+            {
+                var result = await connectorClient.Conversations.CreateConversationAsync(conversationParameters, cancellationToken).ConfigureAwait(false);
 
-            var result = await connectorClient.Conversations.CreateConversationAsync(conversationParameters, cancellationToken).ConfigureAwait(false);
+                // Create a conversation update activity to represent the result.
+                var eventActivity = Activity.CreateEventActivity();
+                eventActivity.Name = ActivityEventNames.CreateConversation;
+                eventActivity.ChannelId = channelId;
+                eventActivity.ServiceUrl = serviceUrl;
+                eventActivity.Id = result.ActivityId ?? Guid.NewGuid().ToString("n");
+                eventActivity.Conversation = new ConversationAccount(id: result.Id, tenantId: conversationParameters.TenantId);
+                eventActivity.ChannelData = conversationParameters.ChannelData;
+                eventActivity.Recipient = conversationParameters.Bot;
 
-            // Create a conversation update activity to represent the result.
-            var eventActivity = Activity.CreateEventActivity();
-            eventActivity.Name = ActivityEventNames.CreateConversation;
-            eventActivity.ChannelId = channelId;
-            eventActivity.ServiceUrl = serviceUrl;
-            eventActivity.Id = result.ActivityId ?? Guid.NewGuid().ToString("n");
-            eventActivity.Conversation = new ConversationAccount(id: result.Id, tenantId: conversationParameters.TenantId);
-            eventActivity.ChannelData = conversationParameters.ChannelData;
-            eventActivity.Recipient = conversationParameters.Bot;
+                using (var context = new TurnContext(this, (Activity)eventActivity))
+                {
+                    var claimsIdentity = new ClaimsIdentity();
+                    claimsIdentity.AddClaim(new Claim(AuthenticationConstants.AudienceClaim, credentials.MicrosoftAppId));
+                    claimsIdentity.AddClaim(new Claim(AuthenticationConstants.AppIdClaim, credentials.MicrosoftAppId));
+                    claimsIdentity.AddClaim(new Claim(AuthenticationConstants.ServiceUrlClaim, serviceUrl));
 
-            using (var context = new TurnContext(this, (Activity)eventActivity))
-            {
-                var claimsIdentity = new ClaimsIdentity();
-                claimsIdentity.AddClaim(new Claim(AuthenticationConstants.AudienceClaim, credentials.MicrosoftAppId));
-                claimsIdentity.AddClaim(new Claim(AuthenticationConstants.AppIdClaim, credentials.MicrosoftAppId));
-                claimsIdentity.AddClaim(new Claim(AuthenticationConstants.ServiceUrlClaim, serviceUrl));
+                    context.TurnState.Add<IIdentity>(BotIdentityKey, claimsIdentity);
+                    context.TurnState.Add(connectorClient);
 
-                context.TurnState.Add<IIdentity>(BotIdentityKey, claimsIdentity);
-                context.TurnState.Add(connectorClient);
-                await RunPipelineAsync(context, callback, cancellationToken).ConfigureAwait(false);
+                    await RunPipelineAsync(context, callback, cancellationToken).ConfigureAwait(false);
+
+                    // Cleanup disposable resources in case other code kept a reference to it.
+                    context.TurnState.Set<IConnectorClient>(null);
+                }
             }
         }
 

libraries/Microsoft.Bot.Builder/Inspection/InspectionSession.cs

@@ -18,6 +18,9 @@ internal class InspectionSession : IDisposable
         private readonly ConversationReference _conversationReference;
         private readonly ILogger _logger;
 
+        // To detect redundant calls to Dispose()
+        private bool _disposed = false;
+
         public InspectionSession(ConversationReference conversationReference, MicrosoftAppCredentials credentials, HttpClient httpClient, ILogger logger)
         {
             _conversationReference = conversationReference;
@@ -44,9 +47,22 @@ public async Task<bool> SendAsync(Activity activity, CancellationToken cancellat
             return true;
         }
 
-        public void Dispose()
+        public void Dispose() => Dispose(true);
+
+        protected virtual void Dispose(bool disposing)
         {
-            _connectorClient?.Dispose();
+            if (_disposed)
+            {
+                return;
+            }
+
+            if (disposing)
+            {
+                // Dispose managed state (managed objects).
+                _connectorClient?.Dispose();
+            }
+
+            _disposed = true;
         }
     }
 }