Merge pull request #5659 from Particular/john/remove_signalr

Remove SignalR

Author: johnsimons

README.md

@@ -1,6 +1,6 @@
 # ServiceControl ![Current Version](https://img.shields.io/github/release/particular/servicecontrol.svg?style=flat&label=current%20version)
 
-ServiceControl is the monitoring brain in the [Particular Service Platform](https://particular.net/service-platform), which includes [NServiceBus](https://particular.net/nservicebus) and tools to build, monitor, and debug distributed systems. ServiceControl collects data on every single message flowing through the system (Audit Queue), errors (Error Queue), as well as additional information regarding sagas, endpoints heartbeats, and custom checks (Control Queue). The information is then exposed to [ServicePulse](https://particular.net/servicepulse) and [ServiceInsight](https://particular.net/serviceinsight) via an HTTP API and SignalR notifications.
+ServiceControl is the monitoring brain in the [Particular Service Platform](https://particular.net/service-platform), which includes [NServiceBus](https://particular.net/nservicebus) and tools to build, monitor, and debug distributed systems. ServiceControl collects data on every single message flowing through the system (Audit Queue), errors (Error Queue), as well as additional information regarding sagas, endpoints heartbeats, and custom checks (Control Queue). The information is then exposed to [ServicePulse](https://particular.net/servicepulse) and [ServiceInsight](https://particular.net/serviceinsight) via an HTTP API.
 
 See the [ServiceControl documentation](https://docs.particular.net/servicecontrol/) for more information.
 

docs/reverseproxy-testing.md

@@ -6,7 +6,6 @@ This guide provides scenario-based tests for ServiceControl instances behind an
 - Forwarded headers handling (`X-Forwarded-For`, `X-Forwarded-Proto`, `X-Forwarded-Host`)
 - HTTP to HTTPS redirection
 - HSTS (HTTP Strict Transport Security)
-- WebSocket support (SignalR)
 
 ## Instance Reference
 

src/Directory.Packages.props

@@ -22,7 +22,6 @@
     <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(RuntimeFrameworkVersion)" />
     <PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="$(RuntimeFrameworkVersion)" />
     <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(RuntimeFrameworkVersion)" />
-    <PackageVersion Include="Microsoft.AspNetCore.SignalR.Client" Version="$(RuntimeFrameworkVersion)" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="$(RuntimeFrameworkVersion)" />
     <PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="$(RuntimeFrameworkVersion)" />
     <PackageVersion Include="Microsoft.Extensions.Hosting" Version="$(RuntimeFrameworkVersion)" />

src/ServiceControl.AcceptanceTests.RavenDB/ServiceControl.AcceptanceTests.RavenDB.csproj

@@ -15,7 +15,6 @@
   <ItemGroup>
     <PackageReference Include="GitHubActionsTestLogger" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="NServiceBus.Heartbeat" />
     <PackageReference Include="NServiceBus.SagaAudit" />

src/ServiceControl.AcceptanceTests/Monitoring/CustomChecks/When_a_periodic_custom_check_fails.cs

@@ -2,20 +2,15 @@
 {
     using System;
     using System.Linq;
-    using System.Net.Http;
-    using System.Text.Json;
     using System.Threading;
     using System.Threading.Tasks;
     using AcceptanceTesting;
     using AcceptanceTesting.EndpointTemplates;
     using Contracts.CustomChecks;
     using EventLog;
-    using Microsoft.AspNetCore.SignalR.Client;
-    using Microsoft.Extensions.DependencyInjection;
     using NServiceBus;
     using NServiceBus.AcceptanceTesting;
     using NServiceBus.CustomChecks;
-    using NServiceBus.Features;
     using NUnit.Framework;
     using ServiceBus.Management.Infrastructure.Settings;
     using Conventions = NServiceBus.AcceptanceTesting.Customization.Conventions;
@@ -28,7 +23,7 @@ public async Task Should_result_in_a_custom_check_failed_event()
         {
             EventLogItem entry = null;
 
-            await Define<MyContext>(ctx => { ctx.SignalrStarted = true; })
+            await Define<MyContext>()
                 .WithEndpoint<WithCustomCheck>()
                 .Done(async c =>
                 {
@@ -46,92 +41,18 @@ public async Task Should_result_in_a_custom_check_failed_event()
             }
         }
 
-        [Test]
-        public async Task Should_raise_a_signalr_event()
-        {
-            var context = await Define<MyContext>(
-                    ctx =>
-                    {
-                        ctx.HttpMessageHandlerFactory = () => HttpMessageHandlerFactory();
-                    })
-                .WithEndpoint<WithCustomCheck>()
-                .WithEndpoint<EndpointThatUsesSignalR>()
-                .Done(c => c.SignalrEventReceived)
-                .Run();
-
-            Assert.That(context.SignalrData, Is.Not.Null);
-        }
-
-        public class MyContext : ScenarioContext
-        {
-            public bool SignalrEventReceived { get; set; }
-            public string SignalrData { get; set; }
-            public Func<HttpMessageHandler> HttpMessageHandlerFactory { get; set; }
-            public bool SignalrStarted { get; set; }
-        }
-
-        public class EndpointThatUsesSignalR : EndpointConfigurationBuilder
-        {
-            public EndpointThatUsesSignalR() => EndpointSetup<DefaultServerWithoutAudit>(c => c.EnableFeature<EnableSignalR>());
-
-            class EnableSignalR : Feature
-            {
-                protected override void Setup(FeatureConfigurationContext context)
-                {
-                    context.Services.AddSingleton<SignalrStarter>();
-                    context.RegisterStartupTask(provider => provider.GetRequiredService<SignalrStarter>());
-                }
-
-                class SignalrStarter : FeatureStartupTask
-                {
-                    public SignalrStarter(MyContext context)
-                    {
-                        this.context = context;
-                        connection = new HubConnectionBuilder()
-                            .WithUrl("http://localhost/api/messagestream", o => o.HttpMessageHandlerFactory = _ => context.HttpMessageHandlerFactory())
-                            .Build();
-                    }
-
-                    void EnvelopeReceived(JsonElement jElement)
-                    {
-                        var s = jElement.ToString();
-                        if (s.IndexOf("\"CustomCheckFailed\"", StringComparison.Ordinal) <= 0)
-                        {
-                            return;
-                        }
-
-                        context.SignalrData = s;
-                        context.SignalrEventReceived = true;
-                    }
-
-                    protected override async Task OnStart(IMessageSession session, CancellationToken cancellationToken = default)
-                    {
-                        // We might also be able to strongly type this to match instead of just getting a string?
-                        connection.On<JsonElement>("PushEnvelope", EnvelopeReceived);
-
-                        await connection.StartAsync(cancellationToken);
-
-                        context.SignalrStarted = connection.State == HubConnectionState.Connected;
-                    }
-
-                    protected override Task OnStop(IMessageSession session, CancellationToken cancellationToken = default) => connection.StopAsync(cancellationToken);
-
-                    readonly MyContext context;
-                    readonly HubConnection connection;
-                }
-            }
-        }
+        public class MyContext : ScenarioContext;
 
         public class WithCustomCheck : EndpointConfigurationBuilder
         {
             public WithCustomCheck() => EndpointSetup<DefaultServerWithoutAudit>(c => { c.ReportCustomChecksTo(Settings.DEFAULT_INSTANCE_NAME, TimeSpan.FromSeconds(1)); });
 
-            class FailingCustomCheck(MyContext context)
+            class FailingCustomCheck()
                 : NServiceBus.CustomChecks.CustomCheck("MyCustomCheckId", "MyCategory", TimeSpan.FromSeconds(5))
             {
                 public override Task<CheckResult> PerformCheck(CancellationToken cancellationToken = default)
                 {
-                    if (executed && context.SignalrStarted)
+                    if (executed)
                     {
                         return Task.FromResult(CheckResult.Failed("Some reason"));
                     }
@@ -145,4 +66,4 @@ public override Task<CheckResult> PerformCheck(CancellationToken cancellationTok
             }
         }
     }
-}
+}