Add MCP server for managing failed messages

.github/renovate.json5

@@ -1,5 +1,37 @@
 {
+  $schema: "https://docs.renovatebot.com/renovate-schema.json",
   packageRules: [
+    {
+      description:"Packages that ship as part of .NET",
+      matchDatasources: ["nuget"],
+      matchPackageNames: [
+        "/^Microsoft.AspNetCore./",
+        "/^Microsoft.Extensions./",
+        "/^System./",
+        "!/^System.IdentityModel./",
+        "!/^System.Management.Automation/",
+        "!/^System.Reactive/"
+      ],
+      groupName: ".NET Packages",
+      groupSlug: "dotnet-packages"
+    },
+    {
+      description:"IdentityModel packages that release separately from .NET",
+      matchDatasources: ["nuget"],
+      matchPackageNames: [
+        "/^Microsoft.IdentityModel./",
+        "/^System.IdentityModel./"
+      ],
+      groupName: "IdentityModel",
+      groupSlug: "identity-model"
+    },
+    {
+      description:"OpenTelemetry packages",
+      matchDatasources: ["nuget"],
+      matchPackageNames: ["/^OpenTelemetry./"],
+      groupName: "OpenTelemetry",
+      groupSlug: "open-telemetry"
+    },
     {
       description: "Keep ServiceControl.Management.PowerShell on 8.x",
       matchFileNames: ["**/ServiceControl.Management.PowerShell.csproj"],

.github/workflows/build-containers.yml

@@ -47,7 +47,7 @@ jobs:
         with:
           version: ${{ env.MinVerVersion }}
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.12.0
+        uses: docker/setup-buildx-action@v4.0.0
       - name: Log in to GitHub container registry
         uses: docker/login-action@v3.7.0
         with:
@@ -58,7 +58,7 @@ jobs:
         id: date
         run: echo "date=$(date '+%FT%TZ')" >> $GITHUB_OUTPUT
       - name: Build and push image to GitHub container registry
-        uses: docker/build-push-action@v6.19.2
+        uses: docker/build-push-action@v7.0.0
         with:
           context: .
           push: true

.github/workflows/build-db-container.yml

@@ -31,7 +31,7 @@ jobs:
         with:
           version: ${{ env.MinVerVersion }}
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.12.0
+        uses: docker/setup-buildx-action@v4.0.0
       - name: Log in to GitHub container registry
         uses: docker/login-action@v3.7.0
         with:

.github/workflows/ci.yml

@@ -63,7 +63,7 @@ jobs:
         if: matrix.os-name == 'Windows'
         run: Import-Module ./deploy/PowerShellModules/Particular.ServiceControl.Management
       - name: Azure login
-        uses: azure/login@v2.3.0
+        uses: azure/login@v3.0.0
         if: matrix.test-category == 'AzureServiceBus' || matrix.test-category == 'AzureStorageQueues' || matrix.test-category == 'RabbitMQ' || matrix.test-category == 'PostgreSQL'
         with:
           creds: ${{ secrets.AZURE_ACI_CREDENTIALS }}
@@ -90,7 +90,7 @@ jobs:
           registry-username: ${{ secrets.DOCKERHUB_USERNAME }}
           registry-password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Setup Azure Service Bus
-        uses: Particular/setup-azureservicebus-action@v2.0.0
+        uses: Particular/setup-azureservicebus-action@v2.1.0
         if: matrix.test-category == 'AzureServiceBus'
         with:
           connection-string-name: ServiceControl_TransportTests_ASBS_ConnectionString

.github/workflows/container-integration-test.yml

@@ -72,12 +72,12 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Azure Login
         if: ${{ matrix.name == 'asb' || matrix.name == 'asq' }}
-        uses: azure/login@v2.3.0
+        uses: azure/login@v3.0.0
         with:
           creds: ${{ secrets.AZURE_ACI_CREDENTIALS }}
       - name: Setup Azure Service Bus
         if: ${{ matrix.name == 'asb' }}
-        uses: Particular/setup-azureservicebus-action@v2.0.0
+        uses: Particular/setup-azureservicebus-action@v2.1.0
         with:
           connection-string-name: CONNECTIONSTRING
           azure-credentials: ${{ secrets.AZURE_ACI_CREDENTIALS }}

.github/workflows/push-container-images.yml

@@ -33,7 +33,7 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.12.0
+        uses: docker/setup-buildx-action@v4.0.0
       - name: Publish to Docker Hub
         run: |
           $containers = @('servicecontrol', 'servicecontrol-audit', 'servicecontrol-monitoring', 'servicecontrol-ravendb')

README.md

@@ -102,3 +102,9 @@ Steps:
      -ErrorRetentionPeriod 10:00:00:00 `
      -Acknowledgements RabbitMQBrokerVersion310
   ```
+
+## Integrated ServicePulse
+
+Since version 6.13, ServiceControl ships with a copy of ServicePulse and [can host it from an Error instance](https://docs.particular.net/servicecontrol/servicecontrol-instances/integrated-servicepulse).
+
+ServiceControl Error instances have a reference to the Particular.ServicePulse.Core package; this contains the ServicePulse assets, along with the code required to serve them out of an ASP.NET web host.

nuget.config

@@ -15,4 +15,4 @@
       <package pattern="*" />
     </packageSource>
   </packageSourceMapping>
-</configuration>
+</configuration>

src/Directory.Build.props

@@ -10,7 +10,7 @@
     <NuGetAuditLevel>low</NuGetAuditLevel>
     <NuGetAuditMode Condition="'$(NuGetAuditMode)' == ''">all</NuGetAuditMode>
     <!-- To lock the version of Particular.Analyzers, for example, in a release branch, set this property in Custom.Build.props -->
-    <ParticularAnalyzersVersion Condition="'$(ParticularAnalyzersVersion)' == ''">2.1.3</ParticularAnalyzersVersion>
+    <ParticularAnalyzersVersion Condition="'$(ParticularAnalyzersVersion)' == ''">2.1.4</ParticularAnalyzersVersion>
     <NServiceBusKey>0024000004800000940000000602000000240000525341310004000001000100dde965e6172e019ac82c2639ffe494dd2e7dd16347c34762a05732b492e110f2e4e2e1b5ef2d85c848ccfb671ee20a47c8d1376276708dc30a90ff1121b647ba3b7259a6bc383b2034938ef0e275b58b920375ac605076178123693c6c4f1331661a62eba28c249386855637780e3ff5f23a6d854700eaa6803ef48907513b92</NServiceBusKey>
     <NServiceBusTestsKey>00240000048000009400000006020000002400005253413100040000010001007f16e21368ff041183fab592d9e8ed37e7be355e93323147a1d29983d6e591b04282e4da0c9e18bd901e112c0033925eb7d7872c2f1706655891c5c9d57297994f707d16ee9a8f40d978f064ee1ffc73c0db3f4712691b23bf596f75130f4ec978cf78757ec034625a5f27e6bb50c618931ea49f6f628fd74271c32959efb1c5</NServiceBusTestsKey>
   </PropertyGroup>

src/Directory.Packages.props

@@ -6,7 +6,7 @@
   <ItemGroup Label="Versions for direct package references">
     <PackageVersion Include="Autofac" Version="9.0.0" />
     <PackageVersion Include="AWSSDK.CloudWatch" Version="4.0.7" />
-    <PackageVersion Include="Azure.Identity" Version="1.17.1" />
+    <PackageVersion Include="Azure.Identity" Version="1.19.0" />
     <PackageVersion Include="Azure.Monitor.Query.Metrics" Version="1.0.0" />
     <PackageVersion Include="Azure.ResourceManager.ServiceBus" Version="1.1.0" />
     <PackageVersion Include="ByteSize" Version="2.1.2" />
@@ -16,24 +16,24 @@
     <PackageVersion Include="Fody" Version="6.9.3" />
     <PackageVersion Include="GitHubActionsTestLogger" Version="3.0.1" />
     <PackageVersion Include="HdrHistogram" Version="2.5.0" />
-    <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.3" />
-    <PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="10.0.3" />
-    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.3" />
-    <PackageVersion Include="Microsoft.AspNetCore.SignalR.Client" Version="10.0.3" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.3" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="10.0.3" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.3" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.3" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="10.0.3" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.3" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="10.0.3" />
-    <PackageVersion Include="Microsoft.Extensions.TimeProvider.Testing" Version="10.3.0" />
+    <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.5" />
+    <PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="10.0.5" />
+    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.5" />
+    <PackageVersion Include="Microsoft.AspNetCore.SignalR.Client" Version="10.0.5" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.5" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="10.0.5" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.5" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.5" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="10.0.5" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.5" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="10.0.5" />
+    <PackageVersion Include="Microsoft.Extensions.TimeProvider.Testing" Version="10.4.0" />
     <PackageVersion Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="8.16.0" />
     <PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="8.16.0" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
     <PackageVersion Include="Microsoft-WindowsAPICodePack-Shell" Version="1.1.5" />
     <PackageVersion Include="Mindscape.Raygun4Net.NetCore" Version="11.2.5" />
-    <PackageVersion Include="NLog.Extensions.Logging" Version="6.1.1" />
+    <PackageVersion Include="NLog.Extensions.Logging" Version="6.1.2" />
     <PackageVersion Include="NServiceBus" Version="10.1.0" />
     <PackageVersion Include="NServiceBus.AcceptanceTesting" Version="10.1.0" />
     <PackageVersion Include="NServiceBus.AmazonSQS" Version="9.0.0" />
@@ -44,17 +44,17 @@
     <PackageVersion Include="NServiceBus.Metrics" Version="6.0.0" />
     <PackageVersion Include="NServiceBus.Metrics.ServiceControl" Version="6.0.0" />
     <PackageVersion Include="NServiceBus.Persistence.NonDurable" Version="3.0.0" />
-    <PackageVersion Include="NServiceBus.RabbitMQ" Version="11.0.0" />
+    <PackageVersion Include="NServiceBus.RabbitMQ" Version="11.1.0" />
     <PackageVersion Include="NServiceBus.SagaAudit" Version="6.0.0" />
     <PackageVersion Include="NServiceBus.Testing" Version="10.0.1" />
-    <PackageVersion Include="NServiceBus.Transport.AzureServiceBus" Version="6.1.0" />
+    <PackageVersion Include="NServiceBus.Transport.AzureServiceBus" Version="6.2.0" />
     <PackageVersion Include="NServiceBus.Transport.AzureStorageQueues" Version="14.0.0" />
     <PackageVersion Include="NServiceBus.Transport.Msmq.Sources" Version="4.0.0" />
     <PackageVersion Include="NServiceBus.Transport.PostgreSql" Version="9.0.0" />
     <PackageVersion Include="NServiceBus.Transport.SqlServer" Version="9.0.0" />
     <PackageVersion Include="NuGet.Versioning" Version="7.3.0" />
     <PackageVersion Include="NUnit" Version="4.5.1" />
-    <PackageVersion Include="NUnit.Analyzers" Version="4.11.2" />
+    <PackageVersion Include="NUnit.Analyzers" Version="4.12.0" />
     <PackageVersion Include="NUnit3TestAdapter" Version="6.1.0" />
     <PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.15.0" />
     <PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.15.0" />
@@ -64,34 +64,34 @@
     <PackageVersion Include="Particular.Licensing.Sources" Version="6.1.0" />
     <PackageVersion Include="Particular.Obsoletes" Version="1.0.0" />
     <PackageVersion Include="Particular.ServicePulse.Core" Version="2.6.0" />
-    <PackageVersion Include="Polly.Core" Version="8.6.5" />
+    <PackageVersion Include="Polly.Core" Version="8.6.6" />
     <PackageVersion Include="PropertyChanged.Fody" Version="4.1.0" />
     <PackageVersion Include="PropertyChanging.Fody" Version="1.31.0" />
     <PackageVersion Include="PublicApiGenerator" Version="11.5.4" />
     <PackageVersion Include="RavenDB.Embedded" Version="6.2.13" />
     <PackageVersion Include="ReactiveUI.WPF" Version="22.3.1" />
     <PackageVersion Include="Seq.Extensions.Logging" Version="9.0.0" />
     <PackageVersion Include="ServiceControl.Contracts" Version="5.1.0" />
-    <PackageVersion Include="System.Configuration.ConfigurationManager" Version="10.0.3" />
-    <PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="10.0.3" />
-    <PackageVersion Include="System.DirectoryServices.AccountManagement" Version="10.0.3" />
+    <PackageVersion Include="System.Configuration.ConfigurationManager" Version="10.0.5" />
+    <PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="10.0.5" />
+    <PackageVersion Include="System.DirectoryServices.AccountManagement" Version="10.0.5" />
     <PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="8.16.0" />
-    <PackageVersion Include="System.Management" Version="10.0.3" />
-    <PackageVersion Include="System.Management.Automation" Version="7.4.13" />
+    <PackageVersion Include="System.Management" Version="10.0.5" />
+    <PackageVersion Include="System.Management.Automation" Version="7.4.14" />
     <PackageVersion Include="System.Reactive" Version="6.1.0" />
-    <PackageVersion Include="System.Reflection.MetadataLoadContext" Version="10.0.3" />
-    <PackageVersion Include="System.ServiceProcess.ServiceController" Version="10.0.3" />
-    <PackageVersion Include="ServicePulse.Core" Version="2.5.0-alpha.0.58" />
+    <PackageVersion Include="System.Reflection.MetadataLoadContext" Version="10.0.5" />
+    <PackageVersion Include="System.ServiceProcess.ServiceController" Version="10.0.5" />
     <PackageVersion Include="Validar.Fody" Version="1.9.0" />
+    <PackageVersion Include="ModelContextProtocol.AspNetCore" Version="1.1.0" />
     <PackageVersion Include="Yarp.ReverseProxy" Version="2.3.0" />
   </ItemGroup>
   <ItemGroup Label="Versions to pin transitive references">
     <PackageVersion Include="Microsoft.IdentityModel.Abstractions" Version="8.16.0" />
-    <PackageVersion Include="System.IO.Hashing" Version="10.0.3" />
+    <PackageVersion Include="System.IO.Hashing" Version="10.0.5" />
   </ItemGroup>
   <ItemGroup>
     <GlobalPackageReference Include="Microsoft.Build.Artifacts" Version="6.1.63" />
     <GlobalPackageReference Include="Microsoft.Build.CopyOnWrite" Version="1.0.334" />
     <GlobalPackageReference Include="Particular.Packaging" Version="4.5.0" />
   </ItemGroup>
-</Project>
+</Project>

src/ServiceControl.AcceptanceTests/TestSupport/ServiceControlComponentRunner.cs

@@ -125,7 +125,7 @@ async Task InitializeServiceControl(ScenarioContext context)
                 hostBuilder.AddServiceControlAuthentication(settings.OpenIdConnectSettings);
                 hostBuilder.AddServiceControl(settings, configuration);
                 hostBuilder.AddServiceControlHttps(settings.HttpsSettings);
-                hostBuilder.AddServiceControlApi(settings.CorsSettings);
+                hostBuilder.AddServiceControlApi(settings);
 
                 hostBuilder.AddServiceControlTesting(settings);
 
@@ -135,7 +135,7 @@ async Task InitializeServiceControl(ScenarioContext context)
 
                 host.UseTestRemoteIp();
                 host.UseServiceControlAuthentication(settings.OpenIdConnectSettings.Enabled);
-                host.UseServiceControl(settings.ForwardedHeadersSettings, settings.HttpsSettings);
+                host.UseServiceControl(settings.ForwardedHeadersSettings, settings.HttpsSettings, settings.EnableMcpServer);
                 await host.StartAsync();
                 DomainEvents = host.Services.GetRequiredService<IDomainEvents>();
                 // Bring this back and look into the base address of the client

src/ServiceControl.Audit.AcceptanceTests/TestSupport/ServiceControlComponentRunner.cs

@@ -133,7 +133,7 @@ async Task InitializeServiceControl(ScenarioContext context)
                     return criticalErrorContext.Stop(cancellationToken);
                 }, settings, configuration);
 
-                hostBuilder.AddServiceControlAuditApi(settings.CorsSettings);
+                hostBuilder.AddServiceControlAuditApi(settings);
                 hostBuilder.AddServiceControlHttps(settings.HttpsSettings);
 
                 hostBuilder.AddServiceControlAuditTesting(settings);
@@ -144,7 +144,7 @@ async Task InitializeServiceControl(ScenarioContext context)
 
                 host.UseTestRemoteIp();
                 host.UseServiceControlAuthentication(settings.OpenIdConnectSettings.Enabled);
-                host.UseServiceControlAudit(settings.ForwardedHeadersSettings, settings.HttpsSettings);
+                host.UseServiceControlAudit(settings.ForwardedHeadersSettings, settings.HttpsSettings, settings.EnableMcpServer);
                 await host.StartAsync();
                 ServiceProvider = host.Services;
                 InstanceTestServer = host.GetTestServer();

src/ServiceControl.Audit.Persistence.InMemory/InMemoryAttachmentsBodyStorage.cs

@@ -1,5 +1,6 @@
 namespace ServiceControl.Audit.Persistence.InMemory
 {
+    using System;
     using System.Collections.Generic;
     using System.IO;
     using System.Linq;
@@ -60,7 +61,7 @@ public async Task<StreamResult> TryFetch(string bodyId, CancellationToken cancel
                     Stream = new MemoryStream(messageBody.Content),
                     ContentType = messageBody.ContentType,
                     BodySize = messageBody.BodySize,
-                    Etag = string.Empty
+                    Etag = Guid.NewGuid().ToString()
                 });
         }
 

src/ServiceControl.Audit.Persistence.Tests/AuditTests.cs

@@ -101,7 +101,7 @@ public async Task Can_roundtrip_message_body()
                 Assert.That(retrievedMessage.Found, Is.True);
                 Assert.That(retrievedMessage.HasContent, Is.True);
                 Assert.That(retrievedMessage.ContentLength, Is.EqualTo(body.Length));
-                Assert.That(retrievedMessage.ETag, Is.Not.Null.Or.Empty);
+                Assert.That(retrievedMessage.ETag, Is.Not.Null.And.Not.Empty);
                 Assert.That(retrievedMessage.StreamContent, Is.Not.Null);
                 Assert.That(retrievedMessage.ContentType, Is.EqualTo(expectedContentType));
             });

src/ServiceControl.Audit/App.config

@@ -8,6 +8,8 @@ These settings are only here so that we can debug ServiceControl while developin
     <add key="ServiceControl.Audit/ServiceControlQueueAddress" value="Particular.ServiceControl" />
     <add key="ServiceControl.Audit/HostName" value="localhost" />
     <add key="ServiceControl.Audit/DatabaseMaintenancePort" value="44445" />
+    <add key="ServiceControl.Audit/EnableMcpServer" value="false"/>
+
     <!-- DEVS - Pick a transport to run Auditing instance on -->
     <add key="ServiceControl.Audit/TransportType" value="LearningTransport" />
     <!--<add key="ServiceControl.Audit/TransportType" value="AmazonSQS" />-->

src/ServiceControl.Audit/Infrastructure/Hosting/Commands/RunCommand.cs

@@ -25,10 +25,10 @@ public override async Task Execute(HostArguments args, Settings settings)
                 //Do nothing. The transports in NSB 8 are designed to handle broker outages. Audit ingestion will be paused when broker is unavailable.
                 return Task.CompletedTask;
             }, settings, endpointConfiguration);
-            hostBuilder.AddServiceControlAuditApi(settings.CorsSettings);
+            hostBuilder.AddServiceControlAuditApi(settings);
 
             var app = hostBuilder.Build();
-            app.UseServiceControlAudit(settings.ForwardedHeadersSettings, settings.HttpsSettings);
+            app.UseServiceControlAudit(settings.ForwardedHeadersSettings, settings.HttpsSettings, settings.EnableMcpServer);
             app.UseServiceControlAuthentication(settings.OpenIdConnectSettings.Enabled);
 
             await app.RunAsync(settings.RootUrl);