Merge pull request #5 from Particular/release-2.0

Release 2.0

Author: tmasternak

packaging/nuget/nservicebus.metrics.servicecontrol.msmq.nuspec

@@ -13,8 +13,8 @@
     <copyright>$copyright$</copyright>
     <tags>$tags$</tags>
     <dependencies>
-      <dependency id="NServiceBus.Metrics.ServiceControl" version="[1.3.0-rc0002,2.0.0)" />
-      <dependency id="NServiceBus" version="[5.2,6)" />
+      <dependency id="NServiceBus.Metrics.ServiceControl" version="[2.1.0-rc0002,3.0.0)" />
+      <dependency id="NServiceBus" version="[6.2,7)" />
     </dependencies>
   </metadata>
   <files>

src/NServiceBus.Metrics.ServiceControl.Msmq/MsmqNativeQueueLengthReporter.cs

@@ -1,28 +1,37 @@
-using System.Messaging;
-using NServiceBus;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Messaging;
 using NServiceBus.Metrics.ServiceControl;
 
 class MsmqNativeQueueLengthReporter
 {
     IReportNativeQueueLength nativeQueueLengthReporter;
-    readonly Configure configure;
-    string localAddress;
-    MessageQueue messageQueue;
+    List<Tuple<string, MessageQueue>> monitoredQueues = new List<Tuple<string, MessageQueue>>();
 
-    public MsmqNativeQueueLengthReporter(IReportNativeQueueLength nativeQueueLengthReporter, Configure configure)
+    public MsmqNativeQueueLengthReporter(IReportNativeQueueLength nativeQueueLengthReporter)
     {
         this.nativeQueueLengthReporter = nativeQueueLengthReporter;
-        this.configure = configure;
     }
 
     public void Warmup()
     {
-        localAddress = configure.LocalAddress.ToString();
-        messageQueue = new MessageQueue($@".\private$\{configure.LocalAddress.Queue}", QueueAccessMode.Peek);
+        foreach (var monitoredQueue in nativeQueueLengthReporter.MonitoredQueues)
+        {
+            var queueName = monitoredQueue.Split('@').FirstOrDefault();
+
+            var messageQueue = new MessageQueue($@".\private$\{queueName}", QueueAccessMode.Peek);
+
+            monitoredQueues.Add(Tuple.Create(monitoredQueue, messageQueue));
+        }
     }
 
     public void ReportNativeQueueLength()
     {
-        nativeQueueLengthReporter.ReportQueueLength(localAddress, messageQueue.GetCount());
+        foreach (var monitoredQueue in monitoredQueues)
+        {
+            var count = monitoredQueue.Item2.GetCount();
+            nativeQueueLengthReporter.ReportQueueLength(monitoredQueue.Item1, count);
+        }
     }
 }

src/NServiceBus.Metrics.ServiceControl.Msmq/NServiceBus.Metrics.ServiceControl.Msmq.csproj

@@ -10,8 +10,8 @@
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="NServiceBus.Metrics.ServiceControl" Version="1.3.0-rc0002" />
-    <PackageReference Include="NServiceBus" Version="5.0.0" />
+    <PackageReference Include="NServiceBus.Metrics.ServiceControl" Version="2.1.0-rc0002" />
+    <PackageReference Include="NServiceBus" Version="6.2.0" />
     <PackageReference Include="GitVersionTask" Version="3.6.5" />
     <PackageReference Include="NuGetPackager" Version="0.6.5" />
   </ItemGroup>

src/NServiceBus.Metrics.ServiceControl.Msmq/ReportMsmqNativeQueueLength.cs

@@ -4,14 +4,14 @@
 using NServiceBus;
 using NServiceBus.Features;
 using NServiceBus.Logging;
-using NServiceBus.Transports;
+using NServiceBus.Transport;
 
 class ReportMsmqNativeQueueLength : Feature
 {
     public ReportMsmqNativeQueueLength()
     {
         EnableByDefault();
-        DependsOn("ServiceControlMonitoring");
+        DependsOn("NServiceBus.Metrics.ServiceControl.ReportingFeature");
         Prerequisite(ctx => ctx.Settings.Get<TransportDefinition>() is MsmqTransport, "MSMQ Transport not configured");
     }
 
@@ -20,7 +20,7 @@ protected override void Setup(FeatureConfigurationContext context)
         context.Container.ConfigureComponent<MsmqNativeQueueLengthReporter>(DependencyLifecycle.SingleInstance);
         context.Container.ConfigureComponent<PeriodicallyReportQueueLength>(DependencyLifecycle.SingleInstance);
 
-        RegisterStartupTask<PeriodicallyReportQueueLength>();
+        context.RegisterStartupTask(b => new PeriodicallyReportQueueLength(b.Build<MsmqNativeQueueLengthReporter>()));
     }
 
     class PeriodicallyReportQueueLength : FeatureStartupTask
@@ -35,7 +35,7 @@ public PeriodicallyReportQueueLength(MsmqNativeQueueLengthReporter reporter)
             this.reporter = reporter;
         }
 
-        protected override void OnStart()
+        protected override Task OnStart(IMessageSession messageSession)
         {
             cancellationTokenSource = new CancellationTokenSource();
             task = Task.Run(async () =>
@@ -58,12 +58,15 @@ protected override void OnStart()
                     }
                 }
             });
+
+            return Task.FromResult(0);
         }
 
-        protected override void OnStop()
+        protected override Task OnStop(IMessageSession messageSession)
         {
             cancellationTokenSource.Cancel();
-            task.GetAwaiter().GetResult();
+
+            return task;
         }
 
         static ILog Log = LogManager.GetLogger<PeriodicallyReportQueueLength>();

src/SampleEndpoint/Program.cs

@@ -1,33 +1,36 @@
-using System;
-
-namespace SampleEndpoint
+namespace SampleEndpoint
 {
-    using System.Threading;
+    using System;
+    using System.Threading.Tasks;
     using NServiceBus;
-    using NServiceBus.Config;
-    using NServiceBus.Config.ConfigurationSource;
-    using NServiceBus.Metrics.ServiceControl;
+    //using NServiceBus.Logging;
 
     class Program
     {
-        static void Main(string[] args)
+        static async Task Main(string[] args)
         {
-            var config = new BusConfiguration();
-            config.EndpointName("SomeName");
-            config.SendMetricDataToServiceControl("Particular.Monitoring");
-            config.UsePersistence<InMemoryPersistence>();
+            //LogManager.Use<DefaultFactory>().Level(LogLevel.Debug);
 
-            using (var bus = Bus.Create(config).Start())
-            {
-                Console.WriteLine("Bus Started");
+            var endpointConfig = new EndpointConfiguration("SomeName");
+            endpointConfig.UseTransport<MsmqTransport>();
+            endpointConfig.EnableMetrics()
+                .SendMetricDataToServiceControl("Particular.Monitoring", TimeSpan.FromMilliseconds(500));
+            endpointConfig.UsePersistence<InMemoryPersistence>();
+            endpointConfig.AuditProcessedMessagesTo("audit");
+            endpointConfig.SendFailedMessagesTo("error");
 
-                while (Console.ReadKey(true).Key != ConsoleKey.Escape)
-                {
-                    bus.SendLocal(new SomeMessage());
-                }
+            var endpoint = await Endpoint.Start(endpointConfig).ConfigureAwait(false);
 
-                Console.WriteLine("Bus Stopped");
+            Console.WriteLine("Endpoint Started");
+
+            while (Console.ReadKey(true).Key != ConsoleKey.Escape)
+            {
+                await endpoint.SendLocal(new SomeMessage()).ConfigureAwait(false);
             }
+
+            await endpoint.Stop().ConfigureAwait(false);
+
+            Console.WriteLine("Bus Stopped");
         }
     }
 
@@ -38,27 +41,9 @@ class SomeMessage : ICommand
 
     class SomeMessageHandler : IHandleMessages<SomeMessage>
     {
-        public void Handle(SomeMessage message)
+        public Task Handle(SomeMessage message, IMessageHandlerContext context)
         {
-            Thread.Sleep(TimeSpan.FromMilliseconds(500));
+            return Task.Delay(500);
         }
     }
-
-
-    class AuditConfigProvider : IProvideConfiguration<AuditConfig>
-    {
-
-        public AuditConfig GetConfiguration() => new AuditConfig
-        {
-            QueueName = "audit"
-        };
-    }
-
-    class ErrorConfigProvider : IProvideConfiguration<MessageForwardingInCaseOfFaultConfig>
-    {
-        public MessageForwardingInCaseOfFaultConfig GetConfiguration() => new MessageForwardingInCaseOfFaultConfig
-        {
-            ErrorQueue = "error"
-        };
-    }
 }

src/SampleEndpoint/SampleEndpoint.csproj

@@ -3,6 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net452</TargetFramework>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>