add reserved bytes to connection string

Author: lailabougria

src/ServiceControl.Transports.SQS/SQSTransportConnectionString.cs

@@ -1,5 +1,6 @@
 namespace ServiceControl.Transports.SQS;
 
+using System;
 using System.Data.Common;
 
 public class SQSTransportConnectionString
@@ -50,6 +51,12 @@ public SQSTransportConnectionString(string connectionString)
         {
             DoNotWrapOutgoingMessages = doNotWrapOutgoingMessagesAsBool;
         }
+
+
+        if (builder.TryGetValue("ReservedBytes", out object reservedBytes))
+        {
+            ReservedBytesInMessageSize = Convert.ToInt32(reservedBytes);
+        }
     }
 
     public string AccessKey { get; }
@@ -60,4 +67,5 @@ public SQSTransportConnectionString(string connectionString)
     public string S3BucketForLargeMessages { get; }
     public string S3KeyPrefix { get; }
     public bool DoNotWrapOutgoingMessages { get; }
+    public int ReservedBytesInMessageSize { get; }
 }

src/ServiceControl.Transports.SQS/SQSTransportCustomization.cs

@@ -72,7 +72,7 @@ protected override SqsTransport CreateTransport(TransportSettings transportSetti
             }
 
 #pragma warning disable NSBSQSEXP0001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
-            var transport = new SqsTransport(sqsClient, snsClient, enableDelayedDelivery: false);
+            var transport = new SqsTransport(sqsClient, snsClient, disableUnrestrictedDelayedDelivery: true);
 #pragma warning restore NSBSQSEXP0001
 
             if (!string.IsNullOrEmpty(builder.QueueNamePrefix))
@@ -109,6 +109,7 @@ protected override SqsTransport CreateTransport(TransportSettings transportSetti
             }
 
             transport.DoNotWrapOutgoingMessages = builder.DoNotWrapOutgoingMessages;
+            transport.ReserveBytesInMessageSizeCalculation = builder.ReservedBytesInMessageSize;
 
             transport.TransportTransactionMode = transport.GetSupportedTransactionModes().Contains(preferredTransactionMode) ? preferredTransactionMode : TransportTransactionMode.ReceiveOnly;
 

src/ServiceControl.Transports.SQS/transport.manifest

@@ -7,7 +7,7 @@
       "TypeName": "ServiceControl.Transports.SQS.SQSTransportCustomization, ServiceControl.Transports.SQS",
       "SampleConnectionString": "Region=<REGION>;QueueNamePrefix=<prefix>;TopicNamePrefix=<prefix>;AccessKeyId=<ACCESSKEYID>;SecretAccessKey=<SECRETACCESSKEY>;S3BucketForLargeMessages=<BUCKETNAME>;S3KeyPrefix=<KEYPREFIX>",
       "AvailableInSCMU": true,
-      "Help": "'Region' is mandatory. Specify 'AccessKeyId' and 'SecretAccessKey' values to set the AWS_ACCESS_KEY_ID/AWS_SECRET_ACCESS_KEY environment variables if not using IAM roles or EC2 metadata. Specify 'S3BucketForLargeMessages' and optionally 'S3KeyPrefix' if large message bodies are used.",
+      "Help": "'Region' is mandatory. Specify 'AccessKeyId' and 'SecretAccessKey' values to set the AWS_ACCESS_KEY_ID/AWS_SECRET_ACCESS_KEY environment variables if not using IAM roles or EC2 metadata. Specify 'S3BucketForLargeMessages' and optionally 'S3KeyPrefix' if large message bodies are used. To reserve bytes in the message size, use 'ReservedBytes'.",
       "Aliases": [
         "NServiceBus.SqsTransport, NServiceBus.AmazonSQS",
         "ServiceControl.Transports.AmazonSQS.ServiceControlSqsTransport, ServiceControl.Transports.AmazonSQS"