Revert "Add IClusterConnectionStatusObserver support" until InProcess…

…TestCluster is merged (#9157)

Revert "Add IClusterConnectionStatusObserver support (#9145)"

This reverts commit 546b739.

src/Orleans.Core/Core/ClientBuilderExtensions.cs

@@ -104,35 +104,6 @@ public static IClientBuilder AddGatewayCountChangedHandler(this IClientBuilder b
             return builder;
         }
 
-        /// <summary>
-        /// Registers a <see cref="GatewayCountChangedHandler"/> event handler.
-        /// </summary>
-        public static IClientBuilder AddGatewayCountChangedHandler(this IClientBuilder builder, Func<IServiceProvider, GatewayCountChangedHandler> handlerFactory)
-        {
-            builder.ConfigureServices(services => services.AddSingleton(handlerFactory));
-            return builder;
-        }
-
-        /// <summary>
-        /// Registers a cluster connection status observer.
-        /// </summary>
-        public static IClientBuilder AddClusterConnectionStatusObserver<TObserver>(this IClientBuilder builder, TObserver observer)
-            where TObserver : IClusterConnectionStatusObserver
-        {
-            builder.Services.AddSingleton<IClusterConnectionStatusObserver>(observer);
-            return builder;
-        }
-
-        /// <summary>
-        /// Registers a cluster connection status observer.
-        /// </summary>
-        public static IClientBuilder AddClusterConnectionStatusObserver<TObserver>(this IClientBuilder builder)
-            where TObserver : class, IClusterConnectionStatusObserver
-        {
-            builder.Services.AddSingleton<IClusterConnectionStatusObserver, TObserver>();
-            return builder;
-        }
-
         /// <summary>
         /// Registers a <see cref="ConnectionToClusterLostHandler"/> event handler.
         /// </summary>
@@ -145,18 +116,6 @@ public static IClientBuilder AddClusterConnectionLostHandler(this IClientBuilder
             return builder;
         }
 
-        /// <summary>
-        /// Registers a <see cref="ConnectionToClusterLostHandler"/> event handler.
-        /// </summary>
-        /// <param name="builder">The builder.</param>
-        /// <param name="handlerFactory">The handler factory.</param>
-        /// <returns>The builder.</returns>
-        public static IClientBuilder AddClusterConnectionLostHandler(this IClientBuilder builder, Func<IServiceProvider, ConnectionToClusterLostHandler> handlerFactory)
-        {
-            builder.ConfigureServices(services => services.AddSingleton(handlerFactory));
-            return builder;
-        }
-
         /// <summary>
         /// Add <see cref="Activity.Current"/> propagation through grain calls.
         /// Note: according to <see cref="ActivitySource.StartActivity(string, ActivityKind)"/> activity will be created only when any listener for activity exists <see cref="ActivitySource.HasListeners()"/> and <see cref="ActivityListener.Sample"/> returns <see cref="ActivitySamplingResult.PropagationData"/>.

src/Orleans.Core/Core/DefaultClientServices.cs

@@ -75,7 +75,6 @@ public static void AddDefaultServices(IClientBuilder builder)
             services.TryAddSingleton<OutsideRuntimeClient>();
             services.TryAddSingleton<InterfaceToImplementationMappingCache>();
             services.TryAddSingleton<ClientGrainContext>();
-            services.AddSingleton<IClusterConnectionStatusObserver, ClusterConnectionStatusObserverAdaptor>();
             services.AddFromExisting<IGrainContextAccessor, ClientGrainContext>();
             services.TryAddFromExisting<IRuntimeClient, OutsideRuntimeClient>();
             services.TryAddFromExisting<IClusterConnectionStatusListener, OutsideRuntimeClient>();

src/Orleans.Core/Runtime/OutsideRuntimeClient.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections;
 using System.Collections.Concurrent;
 using System.Linq;
 using System.Threading;
@@ -14,11 +13,11 @@
 using Orleans.Runtime;
 using Orleans.Serialization;
 using Orleans.Serialization.Invocation;
+using Orleans.Serialization.Serializers;
 using static Orleans.Internal.StandardExtensions;
 
 namespace Orleans
 {
-
     internal class OutsideRuntimeClient : IRuntimeClient, IDisposable, IClusterConnectionStatusListener
     {
         internal static bool TestOnlyThrowExceptionDuringInit { get; set; }
@@ -33,7 +32,6 @@ internal class OutsideRuntimeClient : IRuntimeClient, IDisposable, IClusterConne
 
         private readonly MessagingTrace messagingTrace;
         private readonly InterfaceToImplementationMappingCache _interfaceToImplementationMapping;
-        private IClusterConnectionStatusObserver[] _statusObservers;
 
         public IInternalGrainFactory InternalGrainFactory { get; private set; }
 
@@ -97,7 +95,17 @@ internal void ConsumeServices()
         {
             try
             {
-                _statusObservers = this.ServiceProvider.GetServices<IClusterConnectionStatusObserver>().ToArray();
+                var connectionLostHandlers = this.ServiceProvider.GetServices<ConnectionToClusterLostHandler>();
+                foreach (var handler in connectionLostHandlers)
+                {
+                    this.ClusterConnectionLost += handler;
+                }
+
+                var gatewayCountChangedHandlers = this.ServiceProvider.GetServices<GatewayCountChangedHandler>();
+                foreach (var handler in gatewayCountChangedHandlers)
+                {
+                    this.GatewayCountChanged += handler;
+                }
 
                 this.InternalGrainFactory = this.ServiceProvider.GetRequiredService<IInternalGrainFactory>();
                 this.messageFactory = this.ServiceProvider.GetService<MessageFactory>();
@@ -264,7 +272,7 @@ public void SendRequest(GrainReference target, IInvokable request, IResponseComp
             {
                 // don't set expiration for system target messages.
                 var ttl = request.GetDefaultResponseTimeout() ?? this.clientMessagingOptions.ResponseTimeout;
-                message.TimeToLive = ttl;
+                message.TimeToLive = ttl; 
             }
 
             if (!oneWay)
@@ -393,6 +401,9 @@ public void Dispose()
 
             Utils.SafeExecute(() => MessageCenter?.Dispose());
 
+            this.ClusterConnectionLost = null;
+            this.GatewayCountChanged = null;
+
             GC.SuppressFinalize(this);
             disposed = true;
         }
@@ -411,38 +422,35 @@ public void BreakOutstandingMessagesToDeadSilo(SiloAddress deadSilo)
         public int GetRunningRequestsCount(GrainInterfaceType grainInterfaceType)
             => this.callbacks.Count(c => c.Value.Message.InterfaceType == grainInterfaceType);
 
+        /// <inheritdoc />
+        public event ConnectionToClusterLostHandler ClusterConnectionLost;
+
+        /// <inheritdoc />
+        public event GatewayCountChangedHandler GatewayCountChanged;
+
         /// <inheritdoc />
         public void NotifyClusterConnectionLost()
         {
-            foreach (var observer in _statusObservers)
+            try
             {
-                try
-                {
-                    observer.NotifyClusterConnectionLost();
-                }
-                catch (Exception ex)
-                {
-                    this.logger.LogError((int)ErrorCode.ClientError, ex, "Error sending cluster disconnection notification.");
-                }
+                this.ClusterConnectionLost?.Invoke(this, EventArgs.Empty);
+            }
+            catch (Exception ex)
+            {
+                this.logger.LogError((int)ErrorCode.ClientError, ex, "Error when sending cluster disconnection notification");
             }
         }
 
         /// <inheritdoc />
         public void NotifyGatewayCountChanged(int currentNumberOfGateways, int previousNumberOfGateways)
         {
-            foreach (var observer in _statusObservers)
+            try
             {
-                try
-                {
-                    observer.NotifyGatewayCountChanged(
-                        currentNumberOfGateways,
-                        previousNumberOfGateways,
-                        currentNumberOfGateways > 0 && previousNumberOfGateways <= 0);
-                }
-                catch (Exception ex)
-                {
-                    this.logger.LogError((int)ErrorCode.ClientError, ex, "Error sending gateway count changed notification.");
-                }
+                this.GatewayCountChanged?.Invoke(this, new GatewayCountChangedEventArgs(currentNumberOfGateways, previousNumberOfGateways));
+            }
+            catch (Exception ex)
+            {
+                this.logger.LogError((int)ErrorCode.ClientError, ex, "Error when sending gateway count changed notification");
             }
         }
 

src/Orleans.TestingHost/InMemoryTransport/InMemoryTransportConnection.cs

@@ -87,6 +87,4 @@ public override async ValueTask DisposeAsync()
 
         _connectionClosedTokenSource.Dispose();
     }
-
-    public override string ToString() => $"InMem({LocalEndPoint}<->{RemoteEndPoint})";
 }