Particular · Scooletz · Nov 23, 2018 · Nov 14, 2018 · Nov 19, 2018 · Nov 19, 2018
diff --git a/src/Packaging.NServiceBus.AmazonSQS/Packaging.NServiceBus.AmazonSQS.csproj b/src/Packaging.NServiceBus.AmazonSQS/Packaging.NServiceBus.AmazonSQS.csproj
@@ -52,7 +52,7 @@
       <HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="NServiceBus.AmazonSQS, Version=4.0.0.0, Culture=neutral, PublicKeyToken=9fc386479f8a226c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NServiceBus.AmazonSQS.4.1.1\lib\net452\NServiceBus.AmazonSQS.dll</HintPath>
+      <HintPath>..\packages\NServiceBus.AmazonSQS.4.1.2\lib\net452\NServiceBus.AmazonSQS.dll</HintPath>
     </Reference>
     <Reference Include="NServiceBus.Core, Version=7.0.0.0, Culture=neutral, PublicKeyToken=9fc386479f8a226c, processorArchitecture=MSIL">
       <HintPath>..\packages\NServiceBus.7.1.4\lib\net452\NServiceBus.Core.dll</HintPath>

diff --git a/src/Packaging.NServiceBus.AmazonSQS/packages.config b/src/Packaging.NServiceBus.AmazonSQS/packages.config
@@ -5,5 +5,5 @@
   <package id="AWSSDK.SQS" version="3.3.3.2" targetFramework="net461" />
   <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net461" />
   <package id="NServiceBus" version="7.1.4" targetFramework="net461" />
-  <package id="NServiceBus.AmazonSQS" version="4.1.1" targetFramework="net461" />
+  <package id="NServiceBus.AmazonSQS" version="4.1.2" targetFramework="net461" />
 </packages>
diff --git a/src/ServiceControl.Monitoring.SmokeTests.AmazonSQS/DefaultServer.cs b/src/ServiceControl.Monitoring.SmokeTests.AmazonSQS/DefaultServer.cs
@@ -13,10 +13,7 @@
 
     public class DefaultServer : IEndpointSetupTemplate
     {
-        public static string ConnectionString => string.Join(";",
-      Build("AccessKeyId", "AWS_ACCESS_KEY_ID"),
-      Build("SecretAccessKey", "AWS_SECRET_ACCESS_KEY"),
-      Build("Region", "AWS_REGION"));
+        public static string ConnectionString => $"{string.Join(";", Build("AccessKeyId", "AWS_ACCESS_KEY_ID"), Build("SecretAccessKey", "AWS_SECRET_ACCESS_KEY"), Build("Region", "AWS_REGION"))};QueueNamePrefix=SmokeTests-";
 
         static string Build(string name, string envName) => $"{name}={Environment.GetEnvironmentVariable(envName)}";
 

diff --git a/...rol.Monitoring.SmokeTests.AmazonSQS/ServiceControl.Monitoring.SmokeTests.AmazonSQS.csproj b/...rol.Monitoring.SmokeTests.AmazonSQS/ServiceControl.Monitoring.SmokeTests.AmazonSQS.csproj
@@ -51,7 +51,7 @@
       <HintPath>..\packages\NServiceBus.AcceptanceTesting.7.1.4\lib\net452\NServiceBus.AcceptanceTesting.dll</HintPath>
     </Reference>
     <Reference Include="NServiceBus.AmazonSQS, Version=4.0.0.0, Culture=neutral, PublicKeyToken=9fc386479f8a226c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NServiceBus.AmazonSQS.4.1.1\lib\net452\NServiceBus.AmazonSQS.dll</HintPath>
+      <HintPath>..\packages\NServiceBus.AmazonSQS.4.1.2\lib\net452\NServiceBus.AmazonSQS.dll</HintPath>
     </Reference>
     <Reference Include="NServiceBus.Core, Version=7.0.0.0, Culture=neutral, PublicKeyToken=9fc386479f8a226c, processorArchitecture=MSIL">
       <HintPath>..\packages\NServiceBus.7.1.4\lib\net452\NServiceBus.Core.dll</HintPath>

diff --git a/src/ServiceControl.Monitoring.SmokeTests.AmazonSQS/packages.config b/src/ServiceControl.Monitoring.SmokeTests.AmazonSQS/packages.config
@@ -6,7 +6,7 @@
   <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net46" />
   <package id="NServiceBus" version="7.1.4" targetFramework="net46" />
   <package id="NServiceBus.AcceptanceTesting" version="7.1.4" targetFramework="net46" />
-  <package id="NServiceBus.AmazonSQS" version="4.1.1" targetFramework="net46" />
+  <package id="NServiceBus.AmazonSQS" version="4.1.2" targetFramework="net461" />
   <package id="NServiceBus.Metrics" version="3.0.0" targetFramework="net46" />
   <package id="NServiceBus.Metrics.ServiceControl" version="3.0.2" targetFramework="net46" />
   <package id="NServiceBus.Newtonsoft.Json" version="2.1.0" targetFramework="net46" />

diff --git a/...ng.SmokeTests.AzureServiceBus/ServiceControl.Monitoring.SmokeTests.AzureServiceBus.csproj b/...ng.SmokeTests.AzureServiceBus/ServiceControl.Monitoring.SmokeTests.AzureServiceBus.csproj
@@ -57,7 +57,7 @@
       <Version>3.0.2</Version>
     </PackageReference>
     <PackageReference Include="NServiceBus.Transport.AzureServiceBus">
-      <Version>1.0.0-alpha0164</Version>
+      <Version>1.0.0-alpha0172</Version>
     </PackageReference>
     <PackageReference Include="Newtonsoft.Json">
       <Version>11.0.2</Version>

diff --git a/...s.LegacyAzureServiceBus/ServiceControl.Monitoring.SmokeTests.LegacyAzureServiceBus.csproj b/...s.LegacyAzureServiceBus/ServiceControl.Monitoring.SmokeTests.LegacyAzureServiceBus.csproj
@@ -54,7 +54,7 @@
       <HintPath>..\packages\NServiceBus.AcceptanceTesting.7.1.4\lib\net452\NServiceBus.AcceptanceTesting.dll</HintPath>
     </Reference>
     <Reference Include="NServiceBus.Azure.Transports.WindowsAzureServiceBus, Version=8.0.0.0, Culture=neutral, PublicKeyToken=9fc386479f8a226c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NServiceBus.Azure.Transports.WindowsAzureServiceBus.8.0.3\lib\net452\NServiceBus.Azure.Transports.WindowsAzureServiceBus.dll</HintPath>
+      <HintPath>..\packages\NServiceBus.Azure.Transports.WindowsAzureServiceBus.8.0.6\lib\net452\NServiceBus.Azure.Transports.WindowsAzureServiceBus.dll</HintPath>
     </Reference>
     <Reference Include="NServiceBus.Core, Version=7.0.0.0, Culture=neutral, PublicKeyToken=9fc386479f8a226c, processorArchitecture=MSIL">
       <HintPath>..\packages\NServiceBus.7.1.4\lib\net452\NServiceBus.Core.dll</HintPath>

diff --git a/src/ServiceControl.Monitoring.SmokeTests.LegacyAzureServiceBus/packages.config b/src/ServiceControl.Monitoring.SmokeTests.LegacyAzureServiceBus/packages.config
@@ -5,7 +5,7 @@
   <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net46" />
   <package id="NServiceBus" version="7.1.4" targetFramework="net46" />
   <package id="NServiceBus.AcceptanceTesting" version="7.1.4" targetFramework="net46" />
-  <package id="NServiceBus.Azure.Transports.WindowsAzureServiceBus" version="8.0.3" targetFramework="net46" />
+  <package id="NServiceBus.Azure.Transports.WindowsAzureServiceBus" version="8.0.6" targetFramework="net46" />
   <package id="NServiceBus.Metrics" version="3.0.0" targetFramework="net46" />
   <package id="NServiceBus.Metrics.ServiceControl" version="3.0.2" targetFramework="net46" />
   <package id="NServiceBus.Newtonsoft.Json" version="2.1.0" targetFramework="net46" />

diff --git a/src/ServiceControl.Transports.AmazonSQS/QueueLengthProvider.cs b/src/ServiceControl.Transports.AmazonSQS/QueueLengthProvider.cs
@@ -2,6 +2,7 @@
 {
     using System;
     using System.Collections.Concurrent;
+    using System.Data.Common;
     using System.Linq;
     using System.Threading;
     using System.Threading.Tasks;
@@ -20,18 +21,26 @@ public class QueueLengthProvider : IProvideQueueLength
 
         QueueLengthStore store;
 
+        string queueNamePrefix;
         CancellationTokenSource stop = new CancellationTokenSource();
         Task pooler;
 
+
         public void Initialize(string connectionString, QueueLengthStore store)
         {
+            var builder = new DbConnectionStringBuilder { ConnectionString = connectionString };
+            if (builder.TryGetValue("QueueNamePrefix", out var prefix))
+            {
+                queueNamePrefix = (string)prefix;
+
+            }
             this.store = store;
         }
 
         public void Process(EndpointInstanceId endpointInstanceId, EndpointMetadataReport metadataReport)
         {
             var endpointInputQueue = new EndpointInputQueue(endpointInstanceId.EndpointName, metadataReport.LocalAddress);
-            var queue = QueueNameHelper.GetSqsQueueName(metadataReport.LocalAddress);
+            var queue = QueueNameHelper.GetSqsQueueName(metadataReport.LocalAddress, queueNamePrefix);
 
             queues.AddOrUpdate(endpointInputQueue, _ => queue, (_, currentQueue) =>
             {
@@ -107,6 +116,7 @@ void UpdateQueueLengthStore()
 
         Task FetchQueueSizes(QueueAttributesRequestCache cache, IAmazonSQS client) => Task.WhenAll(sizes.Select(kvp => FetchLength(kvp.Key, client, cache)));
 
+
         async Task FetchLength(string queue, IAmazonSQS client, QueueAttributesRequestCache cache)
         {
             try

diff --git a/src/ServiceControl.Transports.AmazonSQS/ServiceControl.Transports.AmazonSQS.csproj b/src/ServiceControl.Transports.AmazonSQS/ServiceControl.Transports.AmazonSQS.csproj
@@ -7,7 +7,7 @@
 
   <ItemGroup>
     <PackageReference Include="AWSSDK.SQS" Version="3.3.3.8" />
-    <PackageReference Include="NServiceBus.AmazonSQS" Version="4.1.1" />
+    <PackageReference Include="NServiceBus.AmazonSQS" Version="4.1.2" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...erviceControl.Transports.AzureServiceBus/ServiceControl.Transports.AzureServiceBus.csproj b/...erviceControl.Transports.AzureServiceBus/ServiceControl.Transports.AzureServiceBus.csproj
@@ -9,7 +9,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NServiceBus.Transport.AzureServiceBus" Version="1.0.0-alpha0164" />
+    <PackageReference Include="NServiceBus.Transport.AzureServiceBus" Version="1.0.0-alpha0172" />
   </ItemGroup>
 
 </Project>
diff --git a/...l.Transports.LegacyAzureServiceBus/ServiceControl.Transports.LegacyAzureServiceBus.csproj b/...l.Transports.LegacyAzureServiceBus/ServiceControl.Transports.LegacyAzureServiceBus.csproj
@@ -9,7 +9,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NServiceBus.Azure.Transports.WindowsAzureServiceBus" Version="8.0.3" />
+    <PackageReference Include="NServiceBus.Azure.Transports.WindowsAzureServiceBus" Version="8.0.6" />
   </ItemGroup>
 
 </Project>