Cleanup redundant scope handling

Author: danielmarbach

src/NServiceBus.Core.Tests/Pipeline/MainPipelineExecutorTests.cs

@@ -131,7 +131,6 @@ static MainPipelineExecutor CreateMainPipelineExecutor(ServiceProvider servicePr
             new TestableMessageOperations(),
             new Notification<ReceivePipelineCompleted>(),
             receivePipeline,
-            new EndpointLogSlot("MainPipelineExecutorTests", endpointIdentifier: null),
             new ActivityFactory(),
             incomingPipelineMetrics,
             new EnvelopeUnwrapper([], incomingPipelineMetrics));

src/NServiceBus.Core/Pipeline/MainPipelineExecutor.cs

@@ -5,7 +5,6 @@ namespace NServiceBus;
 using System;
 using System.Threading;
 using System.Threading.Tasks;
-using Logging;
 using Microsoft.Extensions.DependencyInjection;
 using Pipeline;
 using Transport;
@@ -16,16 +15,13 @@ class MainPipelineExecutor(
     MessageOperations messageOperations,
     INotificationSubscriptions<ReceivePipelineCompleted> receivePipelineNotification,
     IPipeline<ITransportReceiveContext> receivePipeline,
-    object endpointLogSlot,
     IActivityFactory activityFactory,
     IncomingPipelineMetrics incomingPipelineMetrics,
     EnvelopeUnwrapper envelopeUnwrapper)
     : IPipelineExecutor
 {
     public async Task Invoke(MessageContext messageContext, CancellationToken cancellationToken = default)
     {
-        using var _ = LogManager.BeginSlotScope(endpointLogSlot);
-
         var pipelineStartedAt = DateTimeOffset.UtcNow;
         using var activity = activityFactory.StartIncomingPipelineActivity(messageContext);
 

src/NServiceBus.Core/Pipeline/SatellitePipelineExecutor.cs

@@ -5,15 +5,12 @@ namespace NServiceBus;
 using System;
 using System.Threading;
 using System.Threading.Tasks;
-using Logging;
 using Transport;
 
-class SatellitePipelineExecutor(IServiceProvider builder, SatelliteDefinition definition, object processingLogSlot) : IPipelineExecutor
+class SatellitePipelineExecutor(IServiceProvider builder, SatelliteDefinition definition) : IPipelineExecutor
 {
     public Task Invoke(MessageContext messageContext, CancellationToken cancellationToken = default)
     {
-        using var _ = LogManager.BeginSlotScope(processingLogSlot);
-
         messageContext.Extensions.Set(messageContext.TransportTransaction);
 
         return definition.OnMessage(builder, messageContext, cancellationToken);

src/NServiceBus.Core/Receiving/ReceiveComponent.cs

@@ -156,7 +156,7 @@ public async Task Initialize(
 
         var pipelineMetrics = builder.GetRequiredService<IncomingPipelineMetrics>();
         var envelopeUnwrapper = envelopeComponent.CreateUnwrapper(builder);
-        var mainPipelineExecutor = new MainPipelineExecutor(builder, pipelineCache, messageOperations, configuration.PipelineCompletedSubscribers, receivePipeline, mainProcessingLogSlot, activityFactory, pipelineMetrics, envelopeUnwrapper);
+        var mainPipelineExecutor = new MainPipelineExecutor(builder, pipelineCache, messageOperations, configuration.PipelineCompletedSubscribers, receivePipeline, activityFactory, pipelineMetrics, envelopeUnwrapper);
 
         var recoverabilityPipelineExecutor = recoverabilityComponent.CreateRecoverabilityPipelineExecutor(
             builder,
@@ -176,7 +176,7 @@ await mainPump.Initialize(
         {
             var instanceProcessingLogSlot = CreateReceiverProcessingLogSlot(endpointLogSlot, InstanceSpecificReceiverId);
             var instancePump = CreateReceiver(consecutiveFailuresConfiguration, instanceSpecificPump, instanceProcessingLogSlot);
-            var instancePipelineExecutor = new MainPipelineExecutor(builder, pipelineCache, messageOperations, configuration.PipelineCompletedSubscribers, receivePipeline, instanceProcessingLogSlot, activityFactory, pipelineMetrics, envelopeUnwrapper);
+            var instancePipelineExecutor = new MainPipelineExecutor(builder, pipelineCache, messageOperations, configuration.PipelineCompletedSubscribers, receivePipeline, activityFactory, pipelineMetrics, envelopeUnwrapper);
 
             await instancePump.Initialize(
                 configuration.PushRuntimeSettings,
@@ -194,7 +194,7 @@ await instancePump.Initialize(
                 var satelliteLogSlot = CreateSatelliteProcessingLogSlot(endpointLogSlot, satellite.Name);
                 var satellitePump = CreateReceiver(consecutiveFailuresConfiguration, transportInfrastructure.Receivers[satellite.Name], satelliteLogSlot);
 
-                var satellitePipeline = new SatellitePipelineExecutor(builder, satellite, satelliteLogSlot);
+                var satellitePipeline = new SatellitePipelineExecutor(builder, satellite);
                 var satelliteRecoverabilityExecutor = recoverabilityComponent.CreateSatelliteRecoverabilityExecutor(builder, satellite.RecoverabilityPolicy);
 
                 await satellitePump.Initialize(