From 9805b94ecf4650d3a2c68b7669cfac069b31d35f Mon Sep 17 00:00:00 2001
From: Daniel Marbach <daniel.marbach@openplace.net>
Date: Wed, 13 Mar 2024 17:28:43 +0000
Subject: [PATCH] Disable delayed delivery for ASQ (#4010)

---
 src/ServiceControl.Transports.ASQ/ASQTransportCustomization.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/ServiceControl.Transports.ASQ/ASQTransportCustomization.cs b/src/ServiceControl.Transports.ASQ/ASQTransportCustomization.cs
index 91e1372ca7..1835bbbe62 100644
--- a/src/ServiceControl.Transports.ASQ/ASQTransportCustomization.cs
+++ b/src/ServiceControl.Transports.ASQ/ASQTransportCustomization.cs
@@ -24,7 +24,7 @@ protected override AzureStorageQueueTransport CreateTransport(TransportSettings
         {
             var connectionString = transportSettings.ConnectionString.RemoveCustomConnectionStringParts(out var subscriptionTableName);
 
-            var transport = new AzureStorageQueueTransport(connectionString)
+            var transport = new AzureStorageQueueTransport(connectionString, useNativeDelayedDeliveries: false)
             {
                 QueueNameSanitizer = BackwardsCompatibleQueueNameSanitizer.Sanitize,
                 MessageInvisibleTime = TimeSpan.FromMinutes(1)
@@ -36,7 +36,6 @@ protected override AzureStorageQueueTransport CreateTransport(TransportSettings
             }
 
             transport.MessageWrapperSerializationDefinition = new NewtonsoftJsonSerializer();
-            transport.DelayedDelivery.DelayedDeliveryPoisonQueue = transportSettings.ErrorQueue;
 
             transport.TransportTransactionMode = transport.GetSupportedTransactionModes().Contains(preferredTransactionMode) ? preferredTransactionMode : TransportTransactionMode.ReceiveOnly;