Fixed success metric fault

Author: Ian Shimmings

BtmsGateway/Services/Health/QueueHealthCheck.cs

@@ -1,6 +1,7 @@
 using System.Text.RegularExpressions;
 using Amazon.SimpleNotificationService;
 using Amazon.SimpleNotificationService.Model;
+using BtmsGateway.Utils;
 using Microsoft.Extensions.Diagnostics.HealthChecks;
 using ILogger = Serilog.ILogger;
 
@@ -35,7 +36,7 @@ public class QueueHealthCheck(string name, string topicArn, IAmazonSimpleNotific
         var data = new Dictionary<string, object> { { "topic-arn", topicArn } };
         if (attributes != null)
         {
-            if ((int)attributes.HttpStatusCode < 200 || (int)attributes.HttpStatusCode > 299) healthStatus = HealthStatus.Degraded;
+            if (attributes.HttpStatusCode.IsSuccessStatusCode()) healthStatus = HealthStatus.Degraded;
 
             data.Add("content-length", attributes.ContentLength);
             data.Add("http-status-code", attributes.HttpStatusCode);

BtmsGateway/Services/Metrics/Metric.cs

@@ -20,12 +20,7 @@ public class Metric(MetricsHost metricsHost) : IMetrics
         return new KeyValuePair<string, object?>[]
         {
             new("routing-successful", routingResult.RoutingSuccessful),
-            new("path", messageData.Path),
-            new("originating-url", messageData.Url),
-            new("route-name", routingResult.RouteName),
-            new("route-link", routingResult.FullRouteLink),
-            new("fork-link", routingResult.FullForkLink),
-            new("country-code", messageData.ContentMap.CountryCode)
+            new("path", messageData.Path)
         };
     }
 

BtmsGateway/Services/Routing/MessageRouter.cs

@@ -22,12 +22,14 @@ public async Task<RoutingResult> Route(MessageData messageData, IMetrics metrics
         {
             metrics.StartRoutedRequest();
 
-            return routingResult.RouteLinkType switch
+            routingResult = routingResult.RouteLinkType switch
             {
                 LinkType.Queue => await queueSender.Send(routingResult, messageData, routingResult.FullRouteLink),
                 LinkType.Url => await apiSender.Send(routingResult, messageData, fork: false),
                 _ => routingResult
             };
+
+            return routingResult;
         }
         catch (Exception ex)
         {
@@ -49,12 +51,14 @@ public async Task<RoutingResult> Fork(MessageData messageData, IMetrics metrics)
         {
             metrics.StartForkedRequest();
 
-            return routingResult.ForkLinkType switch
+            routingResult = routingResult.ForkLinkType switch
             {
                 LinkType.Queue => await queueSender.Send(routingResult, messageData, routingResult.FullForkLink),
                 LinkType.Url => await apiSender.Send(routingResult, messageData, fork: true),
                 _ => routingResult
             };
+
+            return routingResult;
         }
         catch (Exception ex)
         {

BtmsGateway/Services/Routing/QueueSender.cs

@@ -1,6 +1,7 @@
 using System.Net;
 using Amazon.SimpleNotificationService;
 using BtmsGateway.Middleware;
+using BtmsGateway.Utils;
 
 namespace BtmsGateway.Services.Routing;
 
@@ -19,7 +20,7 @@ public async Task<RoutingResult> Send(RoutingResult routingResult, MessageData m
 
         return routingResult with
         {
-            RoutingSuccessful = response.HttpStatusCode == HttpStatusCode.OK,
+            RoutingSuccessful = response.HttpStatusCode.IsSuccessStatusCode(),
             ResponseContent = $"Successfully published MessageId: {response.MessageId}",
             StatusCode = response.HttpStatusCode
         };

BtmsGateway/Utils/Extensions.cs

@@ -1,3 +1,4 @@
+using System.Net;
 using System.Xml.Linq;
 using Microsoft.Extensions.Options;
 
@@ -17,4 +18,6 @@ public static class Extensions
     public static string ToTitleCase(this string text) => char.ToUpper(text[0]) + text[1..];
 
     public static string ToStringWithDeclaration(this XDocument xDocument) => $"{xDocument.Declaration}{Environment.NewLine}{xDocument}";
+
+    public static bool IsSuccessStatusCode(this HttpStatusCode statusCode) => (int)statusCode < 200 || (int)statusCode > 299;
 }