Merge pull request #5104 from Particular/john/better_instructions

Author: johnsimons

src/Particular.LicensingComponent/Shared/ServiceControlSettings.cs

@@ -10,15 +10,12 @@ public static class ServiceControlSettings
         public static string ServiceControlThroughputDataQueueSetting = "ServiceControlThroughputDataQueue";
         public static string ServiceControlThroughputDataQueue = SettingsReader.Read(ThroughputSettings.SettingsNamespace, ServiceControlThroughputDataQueueSetting, "ServiceControl.ThroughputData");
 
-        static string SCQueue = $"{ThroughputSettings.SettingsNamespace.Root}/{ServiceControlThroughputDataQueueSetting}";
-        static string SCQueueDescription = $"Service Control throughput processing queue. This setting must match the equivalent `Monitoring/{ServiceControlThroughputDataQueueSetting}` setting for the Monitoring instance.";
-
         static string MonitoringQueue = $"Monitoring/{ServiceControlThroughputDataQueueSetting}";
-        static string MonitoringQueueDescription = $"Queue to send monitoring throughput data to for processing by ServiceControl. This setting must match the equivalent `{ThroughputSettings.SettingsNamespace.Root}/{ServiceControlThroughputDataQueueSetting}` setting for the ServiceControl instance.";
+        static string MonitoringQueueDescription = $"Queue to send monitoring throughput data to for processing by ServiceControl. This setting only needs to be specified if the Monitoring instance is not hosted in the same machine as the Error instance is running on.";
 
         public static List<ThroughputConnectionSetting> GetServiceControlConnectionSettings()
         {
-            return [new ThroughputConnectionSetting(SCQueue, SCQueueDescription)];
+            return [];
         }
 
         public static List<ThroughputConnectionSetting> GetMonitoringConnectionSettings()

src/Particular.LicensingComponent/ThroughputCollector.cs

@@ -20,7 +20,7 @@ public async Task<ThroughputConnectionSettings> GetThroughputConnectionSettingsI
         var throughputConnectionSettings = new ThroughputConnectionSettings
         {
             ServiceControlSettings = ServiceControlSettings.GetServiceControlConnectionSettings(),
-            MonitoringSettings = ServiceControlSettings.GetMonitoringConnectionSettings(),
+            MonitoringSettings = throughputSettings.TransportType == "MSMQ" ? ServiceControlSettings.GetMonitoringConnectionSettings() : [],
             BrokerSettings = throughputQuery?.Settings.Select(pair => new ThroughputConnectionSetting($"{ThroughputSettings.SettingsNamespace.Root}/{pair.Key}", pair.Description)).ToList() ?? []
         };
         return await Task.FromResult(throughputConnectionSettings);