Skip to content

CDMS-1324 - DLQ queue count #376

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

Open
t11omas wants to merge 4 commits into
base: main
Choose a base branch
from
+26 −783
Open

CDMS-1324 - DLQ queue count #376

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
b4b1039
Integrates SQS DLQ management library
t11omas Mar 4, 2026
2f270c1
updated nuget version
t11omas Mar 4, 2026
390e8f7
added Admin tags
t11omas Mar 5, 2026
4dbb27d
Update Defra.TradeImports.SQS.Endpoints package version
t11omas Mar 5, 2026
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
228 changes: 0 additions & 228 deletions src/Processor/Endpoints/Admin/EndpointRouteBuilderExtensions.cs
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions src/Processor/Extensions/ServiceCollectionExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using System.Text.Json;
using Amazon.SQS;
using Defra.TradeImports.SQS.Endpoints;
using Defra.TradeImportsDataApi.Api.Client;
using Defra.TradeImportsDataApi.Domain.CustomsDeclaration;
using Defra.TradeImportsProcessor.Processor.Configuration;
Expand All @@ -10,7 +11,6 @@
using Defra.TradeImportsProcessor.Processor.Models.ImportNotification;
using Defra.TradeImportsProcessor.Processor.Models.Ipaffs;
using Defra.TradeImportsProcessor.Processor.Services;
using Defra.TradeImportsProcessor.Processor.Services.Admin;
using Defra.TradeImportsProcessor.Processor.Utils;
using Defra.TradeImportsProcessor.Processor.Utils.CorrelationId;
using Defra.TradeImportsProcessor.Processor.Utils.Logging;
Expand Down Expand Up @@ -73,7 +73,7 @@ IConfiguration configuration
)
{
services.AddAWSService<IAmazonSQS>();
services.AddSingleton<ISqsDeadLetterService, SqsDeadLetterService>();
services.AddDeadLetterQueueManagementServices();
services.AddSingleton<ICorrelationIdGenerator, CorrelationIdGenerator>();
services.AddOptions<CdpOptions>().Bind(configuration).ValidateDataAnnotations();
services.AddOptions<DataApiOptions>().BindConfiguration(DataApiOptions.SectionName).ValidateDataAnnotations();
Expand Down
1 change: 1 addition & 0 deletions src/Processor/Processor.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="AspNetCore.HealthChecks.AzureServiceBus" Version="9.0.0" />
<PackageReference Include="Defra.TradeImports.SQS.Endpoints" Version="0.1.2" />
<PackageReference Include="Defra.TradeImportsDataApi.Api.Client" Version="0.37.0" />
<PackageReference Include="Elastic.CommonSchema.Serilog" Version="9.0.0" />
<PackageReference Include="Elastic.Serilog.Enrichers.Web" Version="9.0.0" />
Expand Down
25 changes: 23 additions & 2 deletions src/Processor/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
using Defra.TradeImports.SQS.Endpoints.Endpoints;
using Defra.TradeImportsProcessor.Processor.Authentication;
using Defra.TradeImportsProcessor.Processor.Configuration;
using Defra.TradeImportsProcessor.Processor.Data.Extensions;
using Defra.TradeImportsProcessor.Processor.Endpoints;
using Defra.TradeImportsProcessor.Processor.Endpoints.Admin;
using Defra.TradeImportsProcessor.Processor.Extensions;
using Defra.TradeImportsProcessor.Processor.Health;
using Defra.TradeImportsProcessor.Processor.Metrics;
Expand All @@ -10,6 +11,7 @@
using Defra.TradeImportsProcessor.Processor.Utils.Logging;
using Elastic.CommonSchema.Serilog;
using Microsoft.AspNetCore.Diagnostics;
using Microsoft.Extensions.Options;
using Serilog;

Log.Logger = new LoggerConfiguration().WriteTo.Console(new EcsTextFormatter()).CreateBootstrapLogger();
Expand Down Expand Up @@ -75,7 +77,26 @@ static WebApplication BuildWebApplication(WebApplicationBuilder builder)
app.UseHeaderPropagation();
app.UseMiddleware<MetricsMiddleware>();
app.MapRawMessageEndpoints();
app.MapAdminEndpoints();
var resourceEventsOptions = app.Services.GetRequiredService<IOptions<ResourceEventsConsumerOptions>>();
app.MapDeadLetterQueueEndpoints(
resourceEventsOptions.Value.QueueName,
resourceEventsOptions.Value.DeadLetterQueueName,
policyName: PolicyNames.Execute,
pattern: "admin/resource-events/dlq",
nameSuffix: "resource-events",
tags: "Admin"
);
var customsDeclarationsEventsOptions = app.Services.GetRequiredService<
IOptions<CustomsDeclarationsConsumerOptions>
>();
app.MapDeadLetterQueueEndpoints(
customsDeclarationsEventsOptions.Value.QueueName,
customsDeclarationsEventsOptions.Value.DeadLetterQueueName,
policyName: PolicyNames.Execute,
pattern: "admin/customs-declarations/dlq",
nameSuffix: "customs-declarations",
tags: "Admin"
);
app.UseExceptionHandler(
new ExceptionHandlerOptions
{
Expand Down
Loading