Upgrade SQS in ServiceControl (#4934)

* upgrade sqs

* add reserved bytes to connection string

* example connectionstring

* remove pragma

* Transport and review updates

---------

Co-authored-by: Daniel Marbach <[email protected]>

Author: lailabougria

src/Directory.Packages.props

@@ -6,7 +6,7 @@
   <ItemGroup Label="Versions for direct package references">
     <PackageVersion Include="Autofac" Version="8.2.0" />
     <PackageVersion Include="AWSSDK.CloudWatch" Version="3.7.402.63" />
-    <PackageVersion Include="AWSSDK.SecurityToken" Version="3.7.401.64" />
+    <PackageVersion Include="AWSSDK.SecurityToken" Version="3.7.401.78" />
     <PackageVersion Include="Azure.Identity" Version="1.13.2" />
     <PackageVersion Include="Azure.Monitor.Query" Version="1.6.0" />
     <PackageVersion Include="Azure.ResourceManager.ServiceBus" Version="1.1.0" />
@@ -31,7 +31,7 @@
     <PackageVersion Include="NLog.Extensions.Logging" Version="5.4.0" />
     <PackageVersion Include="NServiceBus" Version="9.2.6" />
     <PackageVersion Include="NServiceBus.AcceptanceTesting" Version="9.2.6" />
-    <PackageVersion Include="NServiceBus.AmazonSQS" Version="7.1.1" />
+    <PackageVersion Include="NServiceBus.AmazonSQS" Version="7.3.0" />
     <PackageVersion Include="NServiceBus.CustomChecks" Version="5.0.1" />
     <PackageVersion Include="NServiceBus.Extensions.Hosting" Version="3.0.1" />
     <PackageVersion Include="NServiceBus.Extensions.Logging" Version="3.0.1" />

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("ReservedBytesInMessageSize", 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

@@ -71,9 +71,7 @@ protected override SqsTransport CreateTransport(TransportSettings transportSetti
                 snsClient = new AmazonSimpleNotificationServiceClient();
             }
 
-#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);
-#pragma warning restore NSBSQSEXP0001
+            var transport = new SqsTransport(sqsClient, snsClient, disableUnrestrictedDelayedDelivery: true);
 
             if (!string.IsNullOrEmpty(builder.QueueNamePrefix))
             {
@@ -109,6 +107,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

@@ -5,13 +5,13 @@
       "DisplayName": "AmazonSQS",
       "AssemblyName": "ServiceControl.Transports.SQS",
       "TypeName": "ServiceControl.Transports.SQS.SQSTransportCustomization, ServiceControl.Transports.SQS",
-      "SampleConnectionString": "Region=<REGION>;QueueNamePrefix=<prefix>;TopicNamePrefix=<prefix>;AccessKeyId=<ACCESSKEYID>;SecretAccessKey=<SECRETACCESSKEY>;S3BucketForLargeMessages=<BUCKETNAME>;S3KeyPrefix=<KEYPREFIX>",
+      "SampleConnectionString": "Region=<REGION>;QueueNamePrefix=<prefix>;TopicNamePrefix=<prefix>;AccessKeyId=<ACCESSKEYID>;SecretAccessKey=<SECRETACCESSKEY>;S3BucketForLargeMessages=<BUCKETNAME>;S3KeyPrefix=<KEYPREFIX>;DoNotWrapOutgoingMessages=<DONOTWRAP>;ReservedBytesInMessageSize=<RESERVEDBYTES>",
       "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 avoid wrapping outgoing messages, set 'DoNotWrapOutgoingMessages' to 'true'. To reserve bytes in the message size, use 'ReservedBytesInMessageSize'.",
       "Aliases": [
         "NServiceBus.SqsTransport, NServiceBus.AmazonSQS",
         "ServiceControl.Transports.AmazonSQS.ServiceControlSqsTransport, ServiceControl.Transports.AmazonSQS"
       ]
     }
   ]
-}
+}