Skip to content

Convert SC primary instance loggers to ILogger #5019

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PhilBastian merged 5 commits into from
Jun 18, 2025
Merged

Convert SC primary instance loggers to ILogger #5019

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d7415fd
Convert SC primary instance loggers to ILogger
abparticular Jun 16, 2025
89ee38f
Register EmailSender in DI container since dependents now expect it t…
abparticular Jun 16, 2025
7840fac
Use CreateStaticLogger for command loggers
abparticular Jun 17, 2025
baa1585
Logging parameters converted to Pascal case
abparticular Jun 17, 2025
5ace667
Remove unnecessary fields
abparticular Jun 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/ServiceControl.AcceptanceTests.RavenDB/StartupModeTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
using System.Threading.Tasks;
using Hosting.Commands;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging.Abstractions;
using NServiceBus;
using NUnit.Framework;
using Particular.ServiceControl.Hosting;
Expand Down Expand Up @@ -57,7 +58,7 @@ public async Task CanRunMaintenanceMode()
public async Task CanRunImportFailedMessagesMode()
=> await new TestableImportFailedErrorsCommand().Execute(new HostArguments(Array.Empty<string>()), settings);

class TestableImportFailedErrorsCommand : ImportFailedErrorsCommand
class TestableImportFailedErrorsCommand() : ImportFailedErrorsCommand(NullLogger<ImportFailedErrorsCommand>.Instance)
{
protected override EndpointConfiguration CreateEndpointConfiguration(Settings settings)
{
Expand Down
3 changes: 2 additions & 1 deletion ...ceControl.AcceptanceTests/Recoverability/MessageFailures/When_a_retry_fails_to_be_sent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
using AcceptanceTesting.EndpointTemplates;
using Infrastructure;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging.Abstractions;
using NServiceBus;
using NServiceBus.AcceptanceTesting;
using NServiceBus.Routing;
Expand Down Expand Up @@ -146,7 +147,7 @@ public class MyContext : ScenarioContext
public class MessageThatWillFail : ICommand;

public class FakeReturnToSender(IErrorMessageDataStore errorMessageStore, MyContext myContext)
: ReturnToSender(errorMessageStore)
: ReturnToSender(errorMessageStore, NullLogger<ReturnToSender>.Instance)
{
public override Task HandleMessage(MessageContext message, IMessageDispatcher sender, string errorQueueTransportAddress, CancellationToken cancellationToken = default)
{
Expand Down
3 changes: 2 additions & 1 deletion src/ServiceControl.AcceptanceTests/TestSupport/ServiceControlComponentRunner.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
using Microsoft.AspNetCore.TestHost;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging.Abstractions;
using NLog;
using NServiceBus;
using NServiceBus.AcceptanceTesting;
Expand Down Expand Up @@ -102,7 +103,7 @@ async Task InitializeServiceControl(ScenarioContext context)

using (new DiagnosticTimer($"Creating infrastructure for {instanceName}"))
{
var setupCommand = new SetupCommand();
var setupCommand = new SetupCommand(NullLogger<SetupCommand>.Instance);
await setupCommand.Execute(new HostArguments([]), settings);
}

Expand Down
19 changes: 10 additions & 9 deletions src/ServiceControl.Persistence.Tests/MonitoringDataStoreTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using System;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.Extensions.Logging.Abstractions;
using NUnit.Framework;
using ServiceControl.Monitoring;
using ServiceControl.Operations;
Expand All @@ -13,7 +14,7 @@ class MonitoringDataStoreTests : PersistenceTestBase
[Test]
public async Task Endpoints_load_from_dataStore_into_monitor()
{
var endpointInstanceMonitoring = new EndpointInstanceMonitoring(new FakeDomainEvents());
var endpointInstanceMonitoring = new EndpointInstanceMonitoring(new FakeDomainEvents(), NullLogger<EndpointInstanceMonitor>.Instance);
var endpoint1 = new EndpointDetails() { HostId = Guid.NewGuid(), Host = "Host1", Name = "Name1" };
await MonitoringDataStore.CreateIfNotExists(endpoint1);

Expand All @@ -26,7 +27,7 @@ public async Task Endpoints_load_from_dataStore_into_monitor()
[Test]
public async Task Endpoints_added_more_than_once_are_treated_as_same_endpoint()
{
var endpointInstanceMonitoring = new EndpointInstanceMonitoring(new FakeDomainEvents());
var endpointInstanceMonitoring = new EndpointInstanceMonitoring(new FakeDomainEvents(), NullLogger<EndpointInstanceMonitor>.Instance);
var endpoint1 = new EndpointDetails() { HostId = Guid.NewGuid(), Host = "Host1", Name = "Name1" };
await MonitoringDataStore.CreateIfNotExists(endpoint1);
await MonitoringDataStore.CreateIfNotExists(endpoint1);
Expand All @@ -40,7 +41,7 @@ public async Task Endpoints_added_more_than_once_are_treated_as_same_endpoint()
[Test]
public async Task Updating_existing_endpoint_does_not_create_new_ones()
{
var endpointInstanceMonitoring = new EndpointInstanceMonitoring(new FakeDomainEvents());
var endpointInstanceMonitoring = new EndpointInstanceMonitoring(new FakeDomainEvents(), NullLogger<EndpointInstanceMonitor>.Instance);
var endpoint1 = new EndpointDetails() { HostId = Guid.NewGuid(), Host = "Host1", Name = "Name1" };
await MonitoringDataStore.CreateIfNotExists(endpoint1);
await MonitoringDataStore.CreateOrUpdate(endpoint1, endpointInstanceMonitoring);
Expand All @@ -54,7 +55,7 @@ public async Task Updating_existing_endpoint_does_not_create_new_ones()
[Test]
public async Task Endpoint_is_created_if_doesnt_exist()
{
var endpointInstanceMonitoring = new EndpointInstanceMonitoring(new FakeDomainEvents());
var endpointInstanceMonitoring = new EndpointInstanceMonitoring(new FakeDomainEvents(), NullLogger<EndpointInstanceMonitor>.Instance);
var endpoint1 = new EndpointDetails() { HostId = Guid.NewGuid(), Host = "Host1", Name = "Name1" };
var endpoint2 = new EndpointDetails() { HostId = Guid.NewGuid(), Host = "Host2", Name = "Name2" };
await MonitoringDataStore.CreateIfNotExists(endpoint1);
Expand All @@ -69,7 +70,7 @@ public async Task Endpoint_is_created_if_doesnt_exist()
[Test]
public async Task Endpoint_is_created_if_doesnt_exist_on_update()
{
var endpointInstanceMonitoring = new EndpointInstanceMonitoring(new FakeDomainEvents());
var endpointInstanceMonitoring = new EndpointInstanceMonitoring(new FakeDomainEvents(), NullLogger<EndpointInstanceMonitor>.Instance);
var endpoint1 = new EndpointDetails() { HostId = Guid.NewGuid(), Host = "Host1", Name = "Name1" };
var endpoint2 = new EndpointDetails() { HostId = Guid.NewGuid(), Host = "Host2", Name = "Name2" };
await MonitoringDataStore.CreateIfNotExists(endpoint1);
Expand All @@ -84,7 +85,7 @@ public async Task Endpoint_is_created_if_doesnt_exist_on_update()
[Test]
public async Task Endpoint_is_updated()
{
var endpointInstanceMonitoring = new EndpointInstanceMonitoring(new FakeDomainEvents());
var endpointInstanceMonitoring = new EndpointInstanceMonitoring(new FakeDomainEvents(), NullLogger<EndpointInstanceMonitor>.Instance);
var endpoint1 = new EndpointDetails() { HostId = Guid.NewGuid(), Host = "Host1", Name = "Name1" };
await MonitoringDataStore.CreateIfNotExists(endpoint1);

Expand All @@ -93,7 +94,7 @@ public async Task Endpoint_is_updated()
Assert.That(endpointInstanceMonitoring.IsMonitored(endpointInstanceMonitoring.GetEndpoints()[0].Id), Is.False);

await MonitoringDataStore.UpdateEndpointMonitoring(endpoint1, true);
endpointInstanceMonitoring = new EndpointInstanceMonitoring(new FakeDomainEvents());
endpointInstanceMonitoring = new EndpointInstanceMonitoring(new FakeDomainEvents(), NullLogger<EndpointInstanceMonitor>.Instance);

CompleteDatabaseOperation();
await MonitoringDataStore.WarmupMonitoringFromPersistence(endpointInstanceMonitoring);
Expand All @@ -104,7 +105,7 @@ public async Task Endpoint_is_updated()
[Test]
public async Task Endpoint_is_deleted()
{
var endpointInstanceMonitoring = new EndpointInstanceMonitoring(new FakeDomainEvents());
var endpointInstanceMonitoring = new EndpointInstanceMonitoring(new FakeDomainEvents(), NullLogger<EndpointInstanceMonitor>.Instance);
var endpoint1 = new EndpointDetails() { HostId = Guid.NewGuid(), Host = "Host1", Name = "Name1" };
await MonitoringDataStore.CreateIfNotExists(endpoint1);

Expand All @@ -114,7 +115,7 @@ public async Task Endpoint_is_deleted()

await MonitoringDataStore.Delete(endpointInstanceMonitoring.GetEndpoints()[0].Id);

endpointInstanceMonitoring = new EndpointInstanceMonitoring(new FakeDomainEvents());
endpointInstanceMonitoring = new EndpointInstanceMonitoring(new FakeDomainEvents(), NullLogger<EndpointInstanceMonitor>.Instance);

CompleteDatabaseOperation();
await MonitoringDataStore.WarmupMonitoringFromPersistence(endpointInstanceMonitoring);
Expand Down
11 changes: 6 additions & 5 deletions src/ServiceControl.Persistence.Tests/Recoverability/ReturnToSenderDequeuerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
using MessageFailures;
using MessageFailures.Api;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging.Abstractions;
using NServiceBus.Extensibility;
using NServiceBus.Transport;
using NUnit.Framework;
Expand Down Expand Up @@ -47,7 +48,7 @@ public async Task It_removes_staging_id_header()
};
var message = CreateMessage(Guid.NewGuid().ToString(), headers);

await new ReturnToSender(null).HandleMessage(message, sender, "error");
await new ReturnToSender(null, NullLogger<ReturnToSender>.Instance).HandleMessage(message, sender, "error");

Assert.That(sender.Message.Headers.ContainsKey("ServiceControl.Retry.StagingId"), Is.False);
}
Expand All @@ -66,7 +67,7 @@ public async Task It_fetches_the_body_from_storage_if_provided()
};
var message = CreateMessage(Guid.NewGuid().ToString(), headers);

await new ReturnToSender(new FakeErrorMessageDataStore()).HandleMessage(message, sender, "error");
await new ReturnToSender(new FakeErrorMessageDataStore(), NullLogger<ReturnToSender>.Instance).HandleMessage(message, sender, "error");

Assert.That(Encoding.UTF8.GetString(sender.Message.Body.ToArray()), Is.EqualTo("MessageBodyId"));
}
Expand All @@ -84,7 +85,7 @@ public async Task It_uses_retry_to_if_provided()
};
var message = CreateMessage(Guid.NewGuid().ToString(), headers);

await new ReturnToSender(null).HandleMessage(message, sender, "error");
await new ReturnToSender(null, NullLogger<ReturnToSender>.Instance).HandleMessage(message, sender, "error");

Assert.Multiple(() =>
{
Expand All @@ -105,7 +106,7 @@ public async Task It_sends_directly_to_target_if_retry_to_is_not_provided()
};
var message = CreateMessage(Guid.NewGuid().ToString(), headers);

await new ReturnToSender(null).HandleMessage(message, sender, "error");
await new ReturnToSender(null, NullLogger<ReturnToSender>.Instance).HandleMessage(message, sender, "error");

Assert.Multiple(() =>
{
Expand All @@ -129,7 +130,7 @@ public async Task It_restores_body_id_and_target_addres_after_failure()

try
{
await new ReturnToSender(null).HandleMessage(message, sender, "error");
await new ReturnToSender(null, NullLogger<ReturnToSender>.Instance).HandleMessage(message, sender, "error");
}
catch (Exception)
{
Expand Down
Loading
Loading