Merge pull request #5142 from Particular/feature/content-type-6

Missing Content-Type results in handling the message as text/xml

Author: abparticular

src/Directory.Packages.props

@@ -42,7 +42,7 @@
     <PackageVersion Include="NServiceBus.Metrics" Version="5.0.1" />
     <PackageVersion Include="NServiceBus.Metrics.ServiceControl" Version="5.0.0" />
     <PackageVersion Include="NServiceBus.Persistence.NonDurable" Version="2.0.1" />
-    <PackageVersion Include="NServiceBus.RabbitMQ" Version="10.1.3" />
+    <PackageVersion Include="NServiceBus.RabbitMQ" Version="10.1.4" />
     <PackageVersion Include="NServiceBus.SagaAudit" Version="5.0.2" />
     <PackageVersion Include="NServiceBus.Testing" Version="9.0.1" />
     <PackageVersion Include="NServiceBus.Transport.AzureServiceBus" Version="5.0.2" />

src/ServiceControl.Audit.Persistence.RavenDB/UnitOfWork/RavenAuditIngestionUnitOfWork.cs

@@ -35,7 +35,7 @@ public async Task RecordProcessedMessage(ProcessedMessage processedMessage, Read
             if (!body.IsEmpty)
             {
                 await using var stream = new ReadOnlyStream(body);
-                var contentType = processedMessage.Headers.GetValueOrDefault(Headers.ContentType, "text/xml");
+                var contentType = processedMessage.Headers.GetValueOrDefault(Headers.ContentType, "text/plain");
 
                 await bodyStorage.Store(processedMessage.Id, contentType, body.Length, stream, cancellationToken);
             }

src/ServiceControl.Audit.Persistence.Tests/AuditTests.cs

@@ -80,7 +80,7 @@ await IngestProcessedMessagesAudits(
         [Test]
         public async Task Can_roundtrip_message_body()
         {
-            string expectedContentType = "text/xml";
+            string expectedContentType = "text/plain";
             var unitOfWork = await StartAuditUnitOfWork(1);
 
             var body = new byte[100];

src/ServiceControl.Audit.Persistence/BodyStorageEnricher.cs

@@ -21,7 +21,7 @@ public async ValueTask StoreAuditMessageBody(ReadOnlyMemory<byte> body, Processe
                 return;
             }
 
-            var contentType = GetContentType(processedMessage.Headers, "text/xml");
+            var contentType = GetContentType(processedMessage.Headers, "text/plain");
             processedMessage.MessageMetadata.Add("ContentType", contentType);
 
             var stored = await TryStoreBody(body, processedMessage, bodySize, contentType, cancellationToken);

src/ServiceControl.Audit.UnitTests/BodyStorage/BodyStorageEnricherTests.cs

@@ -92,7 +92,7 @@ public async Task Should_store_body_in_metadata_when_below_large_object_heap_and
                 [Headers.MessageId] = "someid",
                 ["ServiceControl.Retry.UniqueMessageId"] = "someid",
                 [Headers.ProcessingEndpoint] = "someendpoint",
-                [Headers.ContentType] = "text/xml"
+                [Headers.ContentType] = "text/plain"
             };
 
             var message = new ProcessedMessage(headers, metadata);

src/ServiceControl.Persistence.RavenDB/UnitOfWork/RavenRecoverabilityIngestionUnitOfWork.cs

@@ -33,7 +33,7 @@ public Task RecordFailedProcessingAttempt(
             List<FailedMessage.FailureGroup> groups)
         {
             var uniqueMessageId = context.Headers.UniqueId();
-            var contentType = GetContentType(context.Headers, "text/xml");
+            var contentType = GetContentType(context.Headers, "text/plain");
             var bodySize = context.Body.Length;
 
             processingAttempt.MessageMetadata.Add("ContentType", contentType);