Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update ASB transport address issue processing large batch sizes #4372

Closed
wants to merge 4 commits into from
Closed

update ASB transport address issue processing large batch sizes #4372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5a71eb3
handle messagetype being null
PhilBastian Aug 13, 2024
af2e360
pre-filter messagetypes for null
PhilBastian Aug 14, 2024
5fb7061
update NServiceBus.Transport.AzureServiceBus version to address issue…
PhilBastian Aug 14, 2024
688f808
Merge branch 'master' into 1318_update_asb_transport
PhilBastian Aug 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions src/Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
<Project>

<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
</PropertyGroup>

<ItemGroup Label="Versions for direct package references">
<PackageVersion Include="Autofac" Version="8.0.0" />
<PackageVersion Include="AWSSDK.CloudWatch" Version="3.7.401.2" />
Expand Down Expand Up @@ -45,7 +43,7 @@
<PackageVersion Include="NServiceBus.RabbitMQ" Version="9.1.0" />
<PackageVersion Include="NServiceBus.SagaAudit" Version="5.0.0" />
<PackageVersion Include="NServiceBus.Testing" Version="9.0.0" />
<PackageVersion Include="NServiceBus.Transport.AzureServiceBus" Version="4.0.1" />
<PackageVersion Include="NServiceBus.Transport.AzureServiceBus" Version="4.2.0" />
<PackageVersion Include="NServiceBus.Transport.AzureStorageQueues" Version="13.0.0" />
<PackageVersion Include="NServiceBus.Transport.Msmq.Sources" Version="3.0.1" />
<PackageVersion Include="NServiceBus.Transport.SqlServer" Version="8.1.3" />
Expand Down Expand Up @@ -73,7 +71,6 @@
<PackageVersion Include="Validar.Fody" Version="1.9.0" />
<PackageVersion Include="Yarp.ReverseProxy" Version="2.1.0" />
</ItemGroup>

<ItemGroup Label="Versions to pin transitive references">
<PackageVersion Include="System.Drawing.Common" Version="8.0.7" />
<PackageVersion Include="System.Formats.Asn1" Version="8.0.1" />
Expand All @@ -85,11 +82,9 @@
<PackageVersion Include="System.Text.Json" Version="8.0.4" />
<PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
</ItemGroup>

<ItemGroup>
<GlobalPackageReference Include="Microsoft.Build.Artifacts" Version="6.1.30" />
<GlobalPackageReference Include="Microsoft.Build.CopyOnWrite" Version="1.0.315" />
<GlobalPackageReference Include="Particular.Packaging" Version="4.1.0" />
</ItemGroup>

</Project>
4 changes: 3 additions & 1 deletion src/ServiceControl.Monitoring/Infrastructure/Api/EndpointMetricsApi.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,9 @@ static MonitoredMetric<BreakdownT> CreateMetric<BreakdownT, StoreT>(string name,

static MonitoredEndpointMessageType[] GetMonitoredMessageTypes(IEnumerable<EndpointMessageType> messageTypes)
{
return messageTypes.Select(mt => MonitoredEndpointMessageTypeParser.Parse(mt.MessageType))
return messageTypes
.Where(mt => !string.IsNullOrEmpty(mt.MessageType))
.Select(mt => MonitoredEndpointMessageTypeParser.Parse(mt.MessageType))
.ToArray();
}

Expand Down
2 changes: 1 addition & 1 deletion src/ServiceControl.Monitoring/Infrastructure/EndpointMessageType.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ public readonly struct EndpointMessageType
{
public EndpointMessageType(string endpointName, string enclosedMessageTypes)
{
var index = enclosedMessageTypes.IndexOf(';');
var index = (enclosedMessageTypes ?? "").IndexOf(';');

var firstType = index != -1
? enclosedMessageTypes.Substring(0, index)
Expand Down