Skip to content
This repository was archived by the owner on Mar 27, 2020. It is now read-only.

Commit 4339547

Browse files
ScooletzScooletz
authored
Merge pull request #166 from Particular/release-2.0.1
Release 2.0.1
2 parents 7c8427b + 462c9b4 commit 4339547

12 files changed

Lines changed: 22 additions & 15 deletions

File tree

‎src/Packaging.NServiceBus.AmazonSQS/Packaging.NServiceBus.AmazonSQS.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
5353
</Reference>
5454
<Reference Include="NServiceBus.AmazonSQS, Version=4.0.0.0, Culture=neutral, PublicKeyToken=9fc386479f8a226c, processorArchitecture=MSIL">
55-
<HintPath>..\packages\NServiceBus.AmazonSQS.4.1.1\lib\net452\NServiceBus.AmazonSQS.dll</HintPath>
55+
<HintPath>..\packages\NServiceBus.AmazonSQS.4.1.2\lib\net452\NServiceBus.AmazonSQS.dll</HintPath>
5656
</Reference>
5757
<Reference Include="NServiceBus.Core, Version=7.0.0.0, Culture=neutral, PublicKeyToken=9fc386479f8a226c, processorArchitecture=MSIL">
5858
<HintPath>..\packages\NServiceBus.7.1.4\lib\net452\NServiceBus.Core.dll</HintPath>

‎src/Packaging.NServiceBus.AmazonSQS/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
<package id="AWSSDK.SQS" version="3.3.3.2" targetFramework="net461" />
66
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net461" />
77
<package id="NServiceBus" version="7.1.4" targetFramework="net461" />
8-
<package id="NServiceBus.AmazonSQS" version="4.1.1" targetFramework="net461" />
8+
<package id="NServiceBus.AmazonSQS" version="4.1.2" targetFramework="net461" />
99
</packages>

‎src/ServiceControl.Monitoring.SmokeTests.AmazonSQS/DefaultServer.cs‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,7 @@
1313

1414
public class DefaultServer : IEndpointSetupTemplate
1515
{
16-
public static string ConnectionString => string.Join(";",
17-
Build("AccessKeyId", "AWS_ACCESS_KEY_ID"),
18-
Build("SecretAccessKey", "AWS_SECRET_ACCESS_KEY"),
19-
Build("Region", "AWS_REGION"));
16+
public static string ConnectionString => $"{string.Join(";", Build("AccessKeyId", "AWS_ACCESS_KEY_ID"), Build("SecretAccessKey", "AWS_SECRET_ACCESS_KEY"), Build("Region", "AWS_REGION"))};QueueNamePrefix=SmokeTests-";
2017

2118
static string Build(string name, string envName) => $"{name}={Environment.GetEnvironmentVariable(envName)}";
2219

‎src/ServiceControl.Monitoring.SmokeTests.AmazonSQS/ServiceControl.Monitoring.SmokeTests.AmazonSQS.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
<HintPath>..\packages\NServiceBus.AcceptanceTesting.7.1.4\lib\net452\NServiceBus.AcceptanceTesting.dll</HintPath>
5252
</Reference>
5353
<Reference Include="NServiceBus.AmazonSQS, Version=4.0.0.0, Culture=neutral, PublicKeyToken=9fc386479f8a226c, processorArchitecture=MSIL">
54-
<HintPath>..\packages\NServiceBus.AmazonSQS.4.1.1\lib\net452\NServiceBus.AmazonSQS.dll</HintPath>
54+
<HintPath>..\packages\NServiceBus.AmazonSQS.4.1.2\lib\net452\NServiceBus.AmazonSQS.dll</HintPath>
5555
</Reference>
5656
<Reference Include="NServiceBus.Core, Version=7.0.0.0, Culture=neutral, PublicKeyToken=9fc386479f8a226c, processorArchitecture=MSIL">
5757
<HintPath>..\packages\NServiceBus.7.1.4\lib\net452\NServiceBus.Core.dll</HintPath>

‎src/ServiceControl.Monitoring.SmokeTests.AmazonSQS/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net46" />
77
<package id="NServiceBus" version="7.1.4" targetFramework="net46" />
88
<package id="NServiceBus.AcceptanceTesting" version="7.1.4" targetFramework="net46" />
9-
<package id="NServiceBus.AmazonSQS" version="4.1.1" targetFramework="net46" />
9+
<package id="NServiceBus.AmazonSQS" version="4.1.2" targetFramework="net461" />
1010
<package id="NServiceBus.Metrics" version="3.0.0" targetFramework="net46" />
1111
<package id="NServiceBus.Metrics.ServiceControl" version="3.0.2" targetFramework="net46" />
1212
<package id="NServiceBus.Newtonsoft.Json" version="2.1.0" targetFramework="net46" />

‎src/ServiceControl.Monitoring.SmokeTests.AzureServiceBus/ServiceControl.Monitoring.SmokeTests.AzureServiceBus.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
<Version>3.0.2</Version>
5858
</PackageReference>
5959
<PackageReference Include="NServiceBus.Transport.AzureServiceBus">
60-
<Version>1.0.0-alpha0164</Version>
60+
<Version>1.0.0-alpha0172</Version>
6161
</PackageReference>
6262
<PackageReference Include="Newtonsoft.Json">
6363
<Version>11.0.2</Version>

‎src/ServiceControl.Monitoring.SmokeTests.LegacyAzureServiceBus/ServiceControl.Monitoring.SmokeTests.LegacyAzureServiceBus.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
<HintPath>..\packages\NServiceBus.AcceptanceTesting.7.1.4\lib\net452\NServiceBus.AcceptanceTesting.dll</HintPath>
5555
</Reference>
5656
<Reference Include="NServiceBus.Azure.Transports.WindowsAzureServiceBus, Version=8.0.0.0, Culture=neutral, PublicKeyToken=9fc386479f8a226c, processorArchitecture=MSIL">
57-
<HintPath>..\packages\NServiceBus.Azure.Transports.WindowsAzureServiceBus.8.0.3\lib\net452\NServiceBus.Azure.Transports.WindowsAzureServiceBus.dll</HintPath>
57+
<HintPath>..\packages\NServiceBus.Azure.Transports.WindowsAzureServiceBus.8.0.6\lib\net452\NServiceBus.Azure.Transports.WindowsAzureServiceBus.dll</HintPath>
5858
</Reference>
5959
<Reference Include="NServiceBus.Core, Version=7.0.0.0, Culture=neutral, PublicKeyToken=9fc386479f8a226c, processorArchitecture=MSIL">
6060
<HintPath>..\packages\NServiceBus.7.1.4\lib\net452\NServiceBus.Core.dll</HintPath>

‎src/ServiceControl.Monitoring.SmokeTests.LegacyAzureServiceBus/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net46" />
66
<package id="NServiceBus" version="7.1.4" targetFramework="net46" />
77
<package id="NServiceBus.AcceptanceTesting" version="7.1.4" targetFramework="net46" />
8-
<package id="NServiceBus.Azure.Transports.WindowsAzureServiceBus" version="8.0.3" targetFramework="net46" />
8+
<package id="NServiceBus.Azure.Transports.WindowsAzureServiceBus" version="8.0.6" targetFramework="net46" />
99
<package id="NServiceBus.Metrics" version="3.0.0" targetFramework="net46" />
1010
<package id="NServiceBus.Metrics.ServiceControl" version="3.0.2" targetFramework="net46" />
1111
<package id="NServiceBus.Newtonsoft.Json" version="2.1.0" targetFramework="net46" />

‎src/ServiceControl.Transports.AmazonSQS/QueueLengthProvider.cs‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
{
33
using System;
44
using System.Collections.Concurrent;
5+
using System.Data.Common;
56
using System.Linq;
67
using System.Threading;
78
using System.Threading.Tasks;
@@ -20,18 +21,26 @@ public class QueueLengthProvider : IProvideQueueLength
2021

2122
QueueLengthStore store;
2223

24+
string queueNamePrefix;
2325
CancellationTokenSource stop = new CancellationTokenSource();
2426
Task pooler;
2527

28+
2629
public void Initialize(string connectionString, QueueLengthStore store)
2730
{
31+
var builder = new DbConnectionStringBuilder { ConnectionString = connectionString };
32+
if (builder.TryGetValue("QueueNamePrefix", out var prefix))
33+
{
34+
queueNamePrefix = (string)prefix;
35+
36+
}
2837
this.store = store;
2938
}
3039

3140
public void Process(EndpointInstanceId endpointInstanceId, EndpointMetadataReport metadataReport)
3241
{
3342
var endpointInputQueue = new EndpointInputQueue(endpointInstanceId.EndpointName, metadataReport.LocalAddress);
34-
var queue = QueueNameHelper.GetSqsQueueName(metadataReport.LocalAddress);
43+
var queue = QueueNameHelper.GetSqsQueueName(metadataReport.LocalAddress, queueNamePrefix);
3544

3645
queues.AddOrUpdate(endpointInputQueue, _ => queue, (_, currentQueue) =>
3746
{
@@ -107,6 +116,7 @@ void UpdateQueueLengthStore()
107116

108117
Task FetchQueueSizes(QueueAttributesRequestCache cache, IAmazonSQS client) => Task.WhenAll(sizes.Select(kvp => FetchLength(kvp.Key, client, cache)));
109118

119+
110120
async Task FetchLength(string queue, IAmazonSQS client, QueueAttributesRequestCache cache)
111121
{
112122
try

‎src/ServiceControl.Transports.AmazonSQS/ServiceControl.Transports.AmazonSQS.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
<ItemGroup>
99
<PackageReference Include="AWSSDK.SQS" Version="3.3.3.8" />
10-
<PackageReference Include="NServiceBus.AmazonSQS" Version="4.1.1" />
10+
<PackageReference Include="NServiceBus.AmazonSQS" Version="4.1.2" />
1111
</ItemGroup>
1212

1313
<ItemGroup>

0 commit comments

Comments
 (0)