Simplifies Azure Blob Storage persistence configuration.

Refactors the Azure Blob Storage persistence to streamline its configuration.
It removes the direct instantiation of BlobContainerClient within the base class and
instead, registers the AzureBlobBodyStoragePersistence class for dependency injection,
allowing the constructor to handle the BlobContainerClient creation.

Additionally, it ensures that the ContentType metadata stored in Azure Blob Storage is properly encoded and decoded
to handle special characters.

Also, it adds MessageBodyStorageConnectionStringKey to the configuration keys for both PostgreSQL and SQL Server.

Author: johnsimons

src/ServiceControl.Audit.Persistence.Sql.Core/Abstractions/BaseAuditPersistence.cs

@@ -19,9 +19,7 @@ protected static void RegisterDataStores(IServiceCollection services, AuditSqlPe
         }
         else
         {
-            var blobClient = new BlobServiceClient(settings.MessageBodyStorageConnectionString);
-            var blobContainerClient = blobClient.GetBlobContainerClient("audit-bodies");
-            services.AddSingleton<IBodyStoragePersistence>(new AzureBlobBodyStoragePersistence(blobContainerClient, settings));
+            services.AddSingleton<IBodyStoragePersistence, AzureBlobBodyStoragePersistence>();
         }
         services.AddSingleton<IBodyStorage, BodyStorageFetcher>();
         services.AddSingleton<IAuditDataStore, EFAuditDataStore>();

src/ServiceControl.Audit.Persistence.Sql.Core/Implementation/AzureBlobBodyStoragePersistence.cs

@@ -7,9 +7,19 @@ namespace ServiceControl.Audit.Persistence.Sql.Core.Infrastructure;
 using Azure.Storage.Blobs.Models;
 using ServiceControl.Audit.Persistence.Sql.Core.Abstractions;
 
-public class AzureBlobBodyStoragePersistence(BlobContainerClient blobContainerClient, AuditSqlPersisterSettings settings) : IBodyStoragePersistence
+public class AzureBlobBodyStoragePersistence : IBodyStoragePersistence
 {
     const string FormatVersion = "1";
+    readonly AuditSqlPersisterSettings settings;
+    readonly BlobContainerClient blobContainerClient;
+
+    public AzureBlobBodyStoragePersistence(AuditSqlPersisterSettings settings)
+    {
+        this.settings = settings;
+
+        var blobClient = new BlobServiceClient(settings.MessageBodyStorageConnectionString);
+        blobContainerClient = blobClient.GetBlobContainerClient("audit-bodies");
+    }
 
     // Blob deletion is handled by Azure Blob Storage lifecycle management policies.
     // See: https://learn.microsoft.com/en-us/azure/storage/blobs/lifecycle-management-policy-delete
@@ -31,7 +41,7 @@ public class AzureBlobBodyStoragePersistence(BlobContainerClient blobContainerCl
                 throw new InvalidOperationException($"Unsupported blob format version: {version}");
             }
 
-            var contentType = metadata.TryGetValue("ContentType", out var ct) ? ct : "application/octet-stream";
+            var contentType = metadata.TryGetValue("ContentType", out var ct) ? Uri.UnescapeDataString(ct) : "application/octet-stream";
             var bodySize = metadata.TryGetValue("BodySize", out var sizeStr) && int.TryParse(sizeStr, out var size) ? size : 0;
             var isCompressed = metadata.TryGetValue("IsCompressed", out var compressedStr) && bool.TryParse(compressedStr, out var compressed) && compressed;
             var etag = properties.Details.ETag.ToString();
@@ -101,15 +111,14 @@ public async Task WriteBodyAsync(string bodyId, ReadOnlyMemory<byte> body, strin
 
             var options = new BlobUploadOptions
             {
-                AccessTier = AccessTier.Cool,
                 TransferValidation = new UploadTransferValidationOptions
                 {
                     ChecksumAlgorithm = StorageChecksumAlgorithm.Auto
                 },
                 Metadata = new Dictionary<string, string>
                 {
                     { "FormatVersion", FormatVersion },
-                    { "ContentType", contentType },
+                    { "ContentType", Uri.EscapeDataString(contentType) },
                     { "BodySize", body.Length.ToString() },
                     { "IsCompressed", shouldCompress.ToString() }
                 }

src/ServiceControl.Audit.Persistence.Sql.PostgreSQL/PostgreSqlAuditPersistenceConfiguration.cs

@@ -1,14 +1,13 @@
 namespace ServiceControl.Audit.Persistence.Sql.PostgreSQL;
 
-using Configuration;
-
 public class PostgreSqlAuditPersistenceConfiguration : IPersistenceConfiguration
 {
     const string DatabaseConnectionStringKey = "Database/ConnectionString";
     const string CommandTimeoutKey = "Database/CommandTimeout";
     const string MessageBodyStoragePathKey = "MessageBody/StoragePath";
     const string MinBodySizeForCompressionKey = "MessageBody/MinCompressionSize";
     const string StoreMessageBodiesOnDiskKey = "MessageBody/StoreOnDisk";
+    const string MessageBodyStorageConnectionStringKey = "MessageBody/StorageConnectionString";
 
     public string Name => "PostgreSQL";
 
@@ -18,7 +17,8 @@ public class PostgreSqlAuditPersistenceConfiguration : IPersistenceConfiguration
         CommandTimeoutKey,
         MessageBodyStoragePathKey,
         MinBodySizeForCompressionKey,
-        StoreMessageBodiesOnDiskKey
+        StoreMessageBodiesOnDiskKey,
+        MessageBodyStorageConnectionStringKey
     ];
 
     public IPersistence Create(PersistenceSettings settings)
@@ -27,7 +27,7 @@ public IPersistence Create(PersistenceSettings settings)
 
         // Initialize message body storage path
         var messageBodyStoragePath = GetSetting(settings, MessageBodyStoragePathKey, string.Empty);
-        var messageBodyStorageConnectionString = GetSetting(settings, "MessageBody/StorageConnectionString", string.Empty);
+        var messageBodyStorageConnectionString = GetSetting(settings, MessageBodyStorageConnectionStringKey, string.Empty);
 
         var specificSettings = new PostgreSqlAuditPersisterSettings(
             settings.AuditRetentionPeriod,

src/ServiceControl.Audit.Persistence.Sql.SqlServer/SqlServerAuditPersistenceConfiguration.cs

@@ -7,7 +7,7 @@ public class SqlServerAuditPersistenceConfiguration : IPersistenceConfiguration
     const string MessageBodyStoragePathKey = "MessageBody/StoragePath";
     const string MinBodySizeForCompressionKey = "MessageBody/MinCompressionSize";
     const string StoreMessageBodiesOnDiskKey = "MessageBody/StoreOnDisk";
-
+    const string MessageBodyStorageConnectionStringKey = "MessageBody/StorageConnectionString";
     public string Name => "SqlServer";
 
     public IEnumerable<string> ConfigurationKeys =>
@@ -16,7 +16,8 @@ public class SqlServerAuditPersistenceConfiguration : IPersistenceConfiguration
         CommandTimeoutKey,
         MessageBodyStoragePathKey,
         MinBodySizeForCompressionKey,
-        StoreMessageBodiesOnDiskKey
+        StoreMessageBodiesOnDiskKey,
+        MessageBodyStorageConnectionStringKey
     ];
 
     public IPersistence Create(PersistenceSettings settings)
@@ -25,7 +26,7 @@ public IPersistence Create(PersistenceSettings settings)
 
         // Initialize message body storage path
         var messageBodyStoragePath = GetSetting(settings, MessageBodyStoragePathKey, string.Empty);
-        var messageBodyStorageConnectionString = GetSetting(settings, "MessageBody/StorageConnectionString", string.Empty);
+        var messageBodyStorageConnectionString = GetSetting(settings, MessageBodyStorageConnectionStringKey, string.Empty);
 
         var specificSettings = new SqlServerAuditPersisterSettings(
             settings.AuditRetentionPeriod,