Misc Monitoring and ExposeApi cleanups (#4002)

* Use ROM directly * Expose duration * Remove ExposeApi from Monitoring * Remove ExposeApi from Audit * Remove ExposeApi from Primary
Particular · Mar 15, 2024 · efb2c2b · efb2c2b
1 parent 31d5abc
commit efb2c2b
Show file tree

Hide file tree

Showing 13 changed files with 11 additions and 27 deletions.
diff --git a/src/ServiceControl.AcceptanceTests/TestSupport/ServiceControlComponentRunner.cs b/src/ServiceControl.AcceptanceTests/TestSupport/ServiceControlComponentRunner.cs
@@ -57,7 +57,6 @@ async Task InitializeServiceControl(ScenarioContext context)
                 MaximumConcurrencyLevel = 2,
                 HttpDefaultConnectionLimit = int.MaxValue,
                 DisableHealthChecks = true,
-                ExposeApi = true,
                 MessageFilter = messageContext =>
                 {
                     var headers = messageContext.Headers;

diff --git a/src/ServiceControl.Audit.AcceptanceTests/TestSupport/ServiceControlComponentRunner.cs b/src/ServiceControl.Audit.AcceptanceTests/TestSupport/ServiceControlComponentRunner.cs
@@ -48,7 +48,6 @@ async Task InitializeServiceControl(ScenarioContext context)
                 TransportConnectionString = transportToUse.ConnectionString,
                 MaximumConcurrencyLevel = 2,
                 HttpDefaultConnectionLimit = int.MaxValue,
-                ExposeApi = false,
                 ServiceControlQueueAddress = "SHOULDNOTBEUSED",
                 MessageFilter = messageContext =>
                 {

diff --git a/...iceControl.Audit.UnitTests/ApprovalFiles/APIApprovals.PlatformSampleSettings.approved.txt b/...iceControl.Audit.UnitTests/ApprovalFiles/APIApprovals.PlatformSampleSettings.approved.txt
@@ -24,6 +24,5 @@
   "DataSpaceRemainingThreshold": 20,
   "ServiceControlQueueAddress": "Particular.ServiceControl",
   "TimeToRestartAuditIngestionAfterFailure": "00:01:00",
-  "EnableFullTextSearchOnBodies": true,
-  "ExposeApi": true
+  "EnableFullTextSearchOnBodies": true
 }
diff --git a/src/ServiceControl.Audit/Infrastructure/Settings/Settings.cs b/src/ServiceControl.Audit/Infrastructure/Settings/Settings.cs
@@ -141,7 +141,6 @@ public int MaxBodySizeToStore
         public TimeSpan TimeToRestartAuditIngestionAfterFailure { get; set; }
 
         public bool EnableFullTextSearchOnBodies { get; set; }
-        public bool ExposeApi { get; set; } = true;
 
         public ITransportCustomization LoadTransportCustomization()
         {

diff --git a/src/ServiceControl.Audit/WebApplicationBuilderExtension.cs b/src/ServiceControl.Audit/WebApplicationBuilderExtension.cs
@@ -68,9 +68,7 @@ static class WebApplicationBuilderExtension
 
         services.AddHttpLogging(options =>
         {
-            // TODO Do we need to expose the host?
-            // we could also include the time it took to process the request
-            options.LoggingFields = HttpLoggingFields.RequestPath | HttpLoggingFields.RequestMethod | HttpLoggingFields.ResponseStatusCode;
+            options.LoggingFields = HttpLoggingFields.RequestPath | HttpLoggingFields.RequestMethod | HttpLoggingFields.ResponseStatusCode | HttpLoggingFields.Duration;
         });
 
         // Core registers the message dispatcher to be resolved from the transport seam. The dispatcher

diff --git a/src/ServiceControl.Monitoring.AcceptanceTests/TestSupport/ServiceControlComponentRunner.cs b/src/ServiceControl.Monitoring.AcceptanceTests/TestSupport/ServiceControlComponentRunner.cs
@@ -40,7 +40,6 @@ async Task InitializeServiceControl(ScenarioContext context)
                 TransportType = transportToUse.TypeName,
                 ConnectionString = transportToUse.ConnectionString,
                 HttpHostName = "localhost",
-                ExposeApi = true,
                 OnMessage = (id, headers, body, @continue) =>
                 {
                     var log = LogManager.GetLogger<ServiceControlComponentRunner>();

diff --git a/...trol.Monitoring.UnitTests/ApprovalFiles/SettingsTests.PlatformSampleSettings.approved.txt b/...trol.Monitoring.UnitTests/ApprovalFiles/SettingsTests.PlatformSampleSettings.approved.txt
@@ -18,6 +18,5 @@
   "SkipQueueCreation": false,
   "RootUrl": "http://localhost:9999/",
   "MaximumConcurrencyLevel": 32,
-  "LicenseFileText": null,
-  "ExposeApi": true
+  "LicenseFileText": null
 }
diff --git a/...erviceControl.Monitoring/Messaging/TaggedLongValueWriterOccurrenceSerializerDefinition.cs b/...erviceControl.Monitoring/Messaging/TaggedLongValueWriterOccurrenceSerializerDefinition.cs
@@ -7,6 +7,7 @@
     using NServiceBus.MessageInterfaces;
     using NServiceBus.Serialization;
     using NServiceBus.Settings;
+    using ServiceControl.Infrastructure;
 
     class TaggedLongValueWriterOccurrenceSerializerDefinition : SerializationDefinition
     {
@@ -36,8 +37,7 @@ public void Serialize(object message, Stream stream)
         //+-------+---------------+-------+---------------+-------+-------+
         public object[] Deserialize(ReadOnlyMemory<byte> body, IList<Type> messageTypes = null)
         {
-            //TODO clean up ReadOnlyMemory conversion
-            var reader = new BinaryReader(new MemoryStream(body.ToArray(), 0, body.Length));
+            var reader = new BinaryReader(new ReadOnlyStream(body));
 
             var version = reader.ReadInt64();
 
@@ -53,10 +53,10 @@ public object[] Deserialize(ReadOnlyMemory<byte> body, IList<Type> messageTypes
 
                 if (count == 0)
                 {
-                    return NoMessages;
+                    return Array.Empty<object>();
                 }
 
-                var tagKeyToMessage = new Dictionary<int, TaggedLongValueOccurrence>();
+                var tagKeyToMessage = new Dictionary<int, TaggedLongValueOccurrence>(tagsCount);
 
                 foreach (var keyToValue in tagKeyToValue)
                 {
@@ -125,8 +125,6 @@ static TaggedLongValueOccurrence CreateMessageForTag(string keyValue)
             return tagKeyToValue;
         }
 
-        static readonly object[] NoMessages = new object[0];
-
-        static UTF8Encoding TagDecoder = new UTF8Encoding(false);
+        static UTF8Encoding TagDecoder = new(false);
     }
 }
diff --git a/src/ServiceControl.Monitoring/ServiceControl.Monitoring.csproj b/src/ServiceControl.Monitoring/ServiceControl.Monitoring.csproj
@@ -15,6 +15,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\ServiceControl.Configuration\ServiceControl.Configuration.csproj" />
+    <ProjectReference Include="..\ServiceControl.Infrastructure\ServiceControl.Infrastructure.csproj" />
     <ProjectReference Include="..\ServiceControl.LicenseManagement\ServiceControl.LicenseManagement.csproj" />
     <ProjectReference Include="..\ServiceControl.Transports\ServiceControl.Transports.csproj" />
   </ItemGroup>

diff --git a/src/ServiceControl.Monitoring/Settings.cs b/src/ServiceControl.Monitoring/Settings.cs
@@ -51,7 +51,6 @@ public string EndpointName
         public string RootUrl => $"http://{HttpHostName}:{HttpPort}/";
         public int MaximumConcurrencyLevel { get; set; }
         public string LicenseFileText { get; set; }
-        public bool ExposeApi { get; set; } = true;
 
         // SC installer always populates LogPath in app.config on installation/change/upgrade so this will only be used when
         // debugging or if the entry is removed manually. In those circumstances default to the folder containing the exe

diff --git a/src/ServiceControl.Monitoring/WebApplicationBuilderExtensions.cs b/src/ServiceControl.Monitoring/WebApplicationBuilderExtensions.cs
@@ -56,9 +56,7 @@ public static class WebApplicationBuilderExtensions
 
         services.AddHttpLogging(options =>
         {
-            // TODO Do we need to expose the host?
-            // we could also include the time it took to process the request
-            options.LoggingFields = HttpLoggingFields.RequestPath | HttpLoggingFields.RequestMethod | HttpLoggingFields.ResponseStatusCode;
+            options.LoggingFields = HttpLoggingFields.RequestPath | HttpLoggingFields.RequestMethod | HttpLoggingFields.ResponseStatusCode | HttpLoggingFields.Duration;
         });
 
         // Core registers the message dispatcher to be resolved from the transport seam. The dispatcher
@@ -70,7 +68,6 @@ public static class WebApplicationBuilderExtensions
         ConfigureEndpoint(endpointConfiguration, onCriticalError, transportCustomization, settings);
         hostBuilder.UseNServiceBus(endpointConfiguration);
 
-        // TODO Verify if that we need to check the expose API flag
         // We also don't do this in the primary instance
         hostBuilder.WebHost.UseUrls(settings.RootUrl);
         var controllers = hostBuilder.Services.AddControllers(options =>

diff --git a/src/ServiceControl.UnitTests/ApprovalFiles/APIApprovals.PlatformSampleSettings.approved.txt b/src/ServiceControl.UnitTests/ApprovalFiles/APIApprovals.PlatformSampleSettings.approved.txt
@@ -38,6 +38,5 @@
   "RetryHistoryDepth": 10,
   "RemoteInstances": [],
   "DataSpaceRemainingThreshold": 20,
-  "DisableHealthChecks": false,
-  "ExposeApi": true
+  "DisableHealthChecks": false
 }
diff --git a/src/ServiceControl/Infrastructure/Settings/Settings.cs b/src/ServiceControl/Infrastructure/Settings/Settings.cs
@@ -170,8 +170,6 @@ public TimeSpan HeartbeatGracePeriod
 
         public bool DisableHealthChecks { get; set; }
 
-        public bool ExposeApi { get; set; } = true;
-
         public ITransportCustomization LoadTransportCustomization()
         {
             try