Update RabbitMQQuery with managementApiUrl for throughput

Author: Travis Nickels

src/ServiceControl.Transports.RabbitMQ/ConnectionConfiguration.cs

@@ -179,7 +179,7 @@ static Dictionary<string, string> ParseAmqpConnectionString(string connectionStr
             return dictionary;
         }
 
-        static Dictionary<string, string> ParseNServiceBusConnectionString(string connectionString, StringBuilder invalidOptionsMessage)
+        internal static Dictionary<string, string> ParseNServiceBusConnectionString(string connectionString, StringBuilder invalidOptionsMessage)
         {
             var dictionary = new DbConnectionStringBuilder { ConnectionString = connectionString }
                 .OfType<KeyValuePair<string, object>>()

src/ServiceControl.Transports.RabbitMQ/RabbitMQQuery.cs

@@ -9,6 +9,7 @@ namespace ServiceControl.Transports.RabbitMQ;
 using System.Net.Http;
 using System.Net.Http.Json;
 using System.Runtime.CompilerServices;
+using System.Text;
 using System.Text.Json;
 using System.Text.Json.Nodes;
 using System.Threading;
@@ -29,71 +30,118 @@ public class RabbitMQQuery : BrokerThroughputQuery
     readonly ILogger<RabbitMQQuery> logger;
     readonly TimeProvider timeProvider;
     readonly ConnectionConfiguration connectionConfiguration;
+    readonly string connectionString;
 
     public RabbitMQQuery(ILogger<RabbitMQQuery> logger,
         TimeProvider timeProvider,
         TransportSettings transportSettings) : base(logger, "RabbitMQ")
     {
         this.logger = logger;
         this.timeProvider = timeProvider;
+        connectionString = transportSettings.ConnectionString;
 
-        connectionConfiguration = ConnectionConfiguration.Create(transportSettings.ConnectionString, string.Empty);
+        connectionConfiguration = ConnectionConfiguration.Create(connectionString, string.Empty);
     }
 
     protected override void InitializeCore(ReadOnlyDictionary<string, string> settings)
     {
-        if (!settings.TryGetValue(RabbitMQSettings.UserName, out string? username) ||
-            string.IsNullOrEmpty(username))
+        var mangementApiUrl = GetManagementApiUrl();
+
+        var userName = GetSettingsValue(settings, RabbitMQSettings.UserName, mangementApiUrl.UserName);
+        var password = GetSettingsValue(settings, RabbitMQSettings.Password, mangementApiUrl.Password);
+        var apiUrl = GetSettingsValue(settings, RabbitMQSettings.API, mangementApiUrl.Uri.AbsoluteUri);
+
+        if (userName != mangementApiUrl.UserName)
         {
-            logger.LogInformation("Using username from connectionstring");
-            username = connectionConfiguration.UserName;
-            Diagnostics.AppendLine(
-                $"Username not set, defaulted to using \"{username}\" username from the ConnectionString used by instance");
+            _ = Diagnostics.AppendLine($"UserName in settings is different from Management API URL: {userName} != {managementUserName}");
         }
-        else
+
+        if (password != mangementApiUrl.Password)
         {
-            Diagnostics.AppendLine($"Username set to \"{username}\"");
+            _ = Diagnostics.AppendLine($"Password in settings is different from Management API URL.");
         }
 
-        if (!settings.TryGetValue(RabbitMQSettings.Password, out string? password) ||
-            string.IsNullOrEmpty(password))
+        if (apiUrl != mangementApiUrl.Uri.AbsoluteUri)
         {
-            logger.LogInformation("Using password from connectionstring");
-            password = connectionConfiguration.Password;
-            Diagnostics.AppendLine(
-                "Password not set, defaulted to using password from the ConnectionString used by instance");
+            _ = Diagnostics.AppendLine($"API URL in settings is different from Management API URL: {apiUrl} != {mangementApiUrl.Uri.AbsoluteUri}");
         }
-        else
+
+        if (!Uri.TryCreate(apiUrl, UriKind.Absolute, out _))
         {
-            Diagnostics.AppendLine("Password set");
+            InitialiseErrors.Add("API url configured is invalid");
         }
 
-        var defaultCredential = new NetworkCredential(username, password);
+        var defaultCredential = new NetworkCredential(userName, password);
+
+        if (InitialiseErrors.Count == 0)
+        {
+            // ideally we would use the HttpClientFactory, but it would be a bit more involved to set that up
+            // so for now we are using a virtual method that can be overriden in tests
+            // https://github.com/Particular/ServiceControl/issues/4493
+            httpClient = CreateHttpClient(defaultCredential, apiUrl);
+        }
+    }
 
-        if (!settings.TryGetValue(RabbitMQSettings.API, out string? apiUrl) ||
-            string.IsNullOrEmpty(apiUrl))
+    string GetSettingsValue(ReadOnlyDictionary<string, string> settings, string key, string defaultValue)
+    {
+        if (!settings.TryGetValue(key, out string? value) ||
+            string.IsNullOrEmpty(value))
         {
-            apiUrl =
-                $"{(connectionConfiguration.UseTls ? $"https://{connectionConfiguration.Host}:15671" : $"http://{connectionConfiguration.Host}:15672")}";
-            Diagnostics.AppendLine(
-                $"RabbitMQ API Url not set, defaulted to using \"{apiUrl}\" from the ConnectionString used by instance");
+            logger.LogInformation($"Using {key} from connection string");
+            value = defaultValue;
+            _ = Diagnostics.AppendLine(
+                $"{key} not set, defaulted to using {key} from the ConnectionString used by instance");
         }
         else
         {
-            Diagnostics.AppendLine($"RabbitMQ API Url set to \"{apiUrl}\"");
-            if (!Uri.TryCreate(apiUrl, UriKind.Absolute, out _))
+            if (key == RabbitMQSettings.Password)
             {
-                InitialiseErrors.Add("API url configured is invalid");
+                _ = Diagnostics.AppendLine($"{key} set.");
             }
+
+            _ = Diagnostics.AppendLine($"{key} set to {value}.");
         }
 
-        if (InitialiseErrors.Count == 0)
+        return value;
+    }
+
+    UriBuilder GetManagementApiUrl()
+    {
+        var dictionary = ConnectionConfiguration.ParseNServiceBusConnectionString(connectionString, new StringBuilder());
+        UriBuilder uriBuilder;
+
+        var managementApiUrl = GetValue(dictionary, "ManagementApiUrl", "");
+
+        if (string.IsNullOrEmpty(managementApiUrl))
         {
-            // ideally we would use the HttpClientFactory, but it would be a bit more involved to set that up
-            // so for now we are using a virtual method that can be overriden in tests
-            // https://github.com/Particular/ServiceControl/issues/4493
-            httpClient = CreateHttpClient(defaultCredential, apiUrl);
+            _ = Diagnostics.AppendLine("ManagementApiUrl is empty.  Setting credentials from the connectionString used by the instance.");
+            uriBuilder = new UriBuilder()
+            {
+                Scheme = connectionConfiguration.UseTls ? "https" : "http",
+                Host = connectionConfiguration.Host,
+            };
         }
+        else
+        {
+            uriBuilder = new UriBuilder(managementApiUrl);
+        }
+
+        uriBuilder.UserName = string.IsNullOrEmpty(uriBuilder.UserName) ? connectionConfiguration.UserName : uriBuilder.UserName;
+        uriBuilder.Password = string.IsNullOrEmpty(uriBuilder.Password) ? connectionConfiguration.Password : uriBuilder.Password;
+
+        // Check if port was defined in the connection string or if it's the default value from UriBuilder
+        var isPortProvided = uriBuilder.Port != -1
+            && (!((uriBuilder.Port == 80 || uriBuilder.Port == 443)
+            && !managementApiUrl.Contains($":{uriBuilder.Port}")));
+
+        uriBuilder.Port = isPortProvided ? uriBuilder.Port : uriBuilder.Scheme == "https" ? 15671 : 15672;
+
+        return uriBuilder;
+    }
+
+    static string GetValue(Dictionary<string, string> dictionary, string key, string defaultValue)
+    {
+        return dictionary.TryGetValue(key, out var value) ? value : defaultValue;
     }
 
     protected virtual HttpClient CreateHttpClient(NetworkCredential defaultCredential, string apiUrl) =>