Merge pull request #291 from Particular/critical-time-3.1

Critical time calculated using DeliverAt header - Release 3.1

Author: cquirosj

src/NServiceBus.Metrics.Tests/NServiceBus.Metrics.Tests.csproj

@@ -14,7 +14,7 @@
   <ItemGroup>
     <PackageReference Include="GitHubActionsTestLogger" Version="1.2.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
-    <PackageReference Include="NServiceBus" Version="7.2.3" />
+    <PackageReference Include="NServiceBus" Version="7.7.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
     <PackageReference Include="Particular.Approvals" Version="0.2.0" />

src/NServiceBus.Metrics/Extensions.cs

@@ -17,6 +17,18 @@ public static bool TryGetTimeSent(this ReceivePipelineCompleted completed, out D
         return false;
     }
 
+    public static bool TryGetDeliverAt(this ReceivePipelineCompleted completed, out DateTime deliverAt)
+    {
+        var headers = completed.ProcessedMessage.Headers;
+        if (headers.TryGetValue(Headers.DeliverAt, out var deliverAtString))
+        {
+            deliverAt = DateTimeExtensions.ToUtcDateTime(deliverAtString);
+            return true;
+        }
+        deliverAt = DateTime.MinValue;
+        return false;
+    }
+
     public static bool TryGetMessageType(this ReceivePipelineCompleted completed, out string processedMessageType)
     {
         return completed.ProcessedMessage.Headers.TryGetMessageType(out processedMessageType);

src/NServiceBus.Metrics/NServiceBus.Metrics.csproj

@@ -11,8 +11,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NServiceBus" Version="[7.0.0, 8.0.0)" />
+    <PackageReference Include="NServiceBus" Version="[7.7.0, 8.0.0)" />
     <PackageReference Include="Particular.Packaging" Version="1.2.1" PrivateAssets="All" />
   </ItemGroup>
 
-</Project>
+</Project>

src/NServiceBus.Metrics/ProbeBuilders/CriticalTimeProbeBuilder.cs

@@ -1,3 +1,4 @@
+using System;
 using NServiceBus;
 using NServiceBus.Features;
 using NServiceBus.Metrics;
@@ -16,9 +17,9 @@ protected override void WireUp(DurationProbe probe)
     {
         context.Pipeline.OnReceivePipelineCompleted(e =>
         {
-            if (e.TryGetTimeSent(out var timeSent))
+            if (e.TryGetDeliverAt(out var startTime) || e.TryGetTimeSent(out startTime))
             {
-                var endToEndTime = e.CompletedAt - timeSent;
+                var endToEndTime = e.CompletedAt - startTime;
                 e.TryGetMessageType(out var messageType);
 
                 var @event = new DurationEvent(endToEndTime, messageType);
@@ -30,4 +31,4 @@ protected override void WireUp(DurationProbe probe)
     }
 
     readonly FeatureConfigurationContext context;
-}
+}

src/NServiceBus.Metrics/ProbeBuilders/RetriesProbeBuilder.cs

@@ -16,8 +16,10 @@ public RetriesProbeBuilder(FeatureConfigurationContext context)
         protected override void WireUp(SignalProbe probe)
         {
             var errors = notifications.Errors;
+#pragma warning disable CS0618 // Type or member is obsolete
             errors.MessageHasFailedAnImmediateRetryAttempt += (sender, message) => Signal(message.Headers, probe);
             errors.MessageHasBeenSentToDelayedRetries += (sender, message) => Signal(message.Headers, probe);
+#pragma warning restore CS0618 // Type or member is obsolete
         }
 
         static void Signal(Dictionary<string, string> messageHeaders, SignalProbe probe)