Skip to content

Commit 6771eb0

Browse files
dependencyupdates[bot]bartekwasielak
dependencyupdates[bot]
authored and
bartekwasielak
committed
Update actions/upload-artifact action to v5 (#5150)
Co-authored-by: dependencyupdates[bot] <218638057+dependencyupdates[bot]@users.noreply.github.com> Update dependency NUnit.Analyzers to 4.10.0 (#5053) * Update dependency NUnit.Analyzers to 4.10.0 * Swap the assert * Make the class abstract --------- Co-authored-by: dependencyupdates[bot] <218638057+dependencyupdates[bot]@users.noreply.github.com> Co-authored-by: Tamara Rivera <[email protected]> Update dependency NUnit.Analyzers to 4.11.1 (#5152) Co-authored-by: dependencyupdates[bot] <218638057+dependencyupdates[bot]@users.noreply.github.com> Log email notification subject and body for all SendEmailNotificationHandler executions (#5139) * remove duplicate custom check - Audit Message Ingestion * add email notification subject and body to log * apply code review suggestions Ensure RetryAcknowledgementBehavior gets triggered WIP WIP2 Add MessageEditedAndRetried event Reedit WIP Using MessageFailed instead of MessageResolved - test Restoring original Handler Test editions format fix Added concurrency support formatting fixes Test modification Change contract types Adding more conditions to the test
1 parent 7f24cb9 commit 6771eb0

File tree

29 files changed

+907
-49
lines changed

29 files changed

+907
-49
lines changed

‎.github/workflows/build-windows.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,13 @@ jobs:
6464
New-Item assets\PowerShellModules -ItemType Directory
6565
Compress-Archive -Path deploy\PowerShellModules\Particular.ServiceControl.Management\* -DestinationPath assets\PowerShellModules\Particular.ServiceControl.Management.zip
6666
- name: Publish assets
67-
uses: actions/upload-artifact@v4.6.2
67+
uses: actions/upload-artifact@v5.0.0
6868
with:
6969
name: assets
7070
path: assets/*
7171
retention-days: 1
7272
- name: Publish zips
73-
uses: actions/upload-artifact@v4.6.2
73+
uses: actions/upload-artifact@v5.0.0
7474
with:
7575
name: zips
7676
path: zip/*
@@ -88,7 +88,7 @@ jobs:
8888
client-secret: ${{ secrets.AZURE_KEY_VAULT_CLIENT_SECRET }}
8989
certificate-name: ${{ secrets.AZURE_KEY_VAULT_CERTIFICATE_NAME }}
9090
- name: Publish NuGet packages
91-
uses: actions/upload-artifact@v4.6.2
91+
uses: actions/upload-artifact@v5.0.0
9292
with:
9393
name: nugets
9494
path: nugets/*

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
New-Item assets\PowerShellModules -ItemType Directory
5252
Compress-Archive -Path deploy\PowerShellModules\Particular.ServiceControl.Management\* -DestinationPath assets\PowerShellModules\Particular.ServiceControl.Management.zip
5353
- name: Upload assets
54-
uses: actions/upload-artifact@v4.6.2
54+
uses: actions/upload-artifact@v5.0.0
5555
if: matrix.test-category == 'Default'
5656
with:
5757
name: ${{ matrix.os-name }}-assets

‎src/Directory.Packages.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<PackageVersion Include="NServiceBus.Transport.PostgreSql" Version="8.1.9" />
5353
<PackageVersion Include="NuGet.Versioning" Version="6.14.0" />
5454
<PackageVersion Include="NUnit" Version="4.4.0" />
55-
<PackageVersion Include="NUnit.Analyzers" Version="4.7.0" />
55+
<PackageVersion Include="NUnit.Analyzers" Version="4.11.1" />
5656
<PackageVersion Include="NUnit3TestAdapter" Version="5.2.0" />
5757
<PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.9.0" />
5858
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.9.0" />

‎src/ServiceControl.AcceptanceTesting/NServiceBusAcceptanceTest.cs‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
namespace ServiceControl.AcceptanceTesting
22
{
3+
using System;
34
using System.Linq;
45
using System.Threading;
6+
using NServiceBus.AcceptanceTesting;
57
using NServiceBus.AcceptanceTesting.Customization;
68
using NServiceBus.Logging;
79
using NUnit.Framework;
10+
using NUnit.Framework.Interfaces;
11+
using NUnit.Framework.Internal;
812

913
/// <summary>
1014
/// Base class for all the NSB test that sets up our conventions
@@ -35,5 +39,37 @@ public void SetUp()
3539
return testName + "." + endpointBuilder;
3640
};
3741
}
42+
43+
[TearDown]
44+
public void TearDown()
45+
{
46+
if (!TestExecutionContext.CurrentContext.TryGetRunDescriptor(out var runDescriptor))
47+
{
48+
return;
49+
}
50+
51+
var scenarioContext = runDescriptor.ScenarioContext;
52+
53+
// if (Environment.GetEnvironmentVariable("CI") != "true" || Environment.GetEnvironmentVariable("VERBOSE_TEST_LOGGING")?.ToLower() == "true")
54+
// {
55+
TestContext.Out.WriteLine($@"Test settings:
56+
{string.Join(Environment.NewLine, runDescriptor.Settings.Select(setting => $" {setting.Key}: {setting.Value}"))}");
57+
58+
TestContext.Out.WriteLine($@"Context:
59+
{string.Join(Environment.NewLine, scenarioContext.GetType().GetProperties().Select(p => $"{p.Name} = {p.GetValue(scenarioContext, null)}"))}");
60+
// }
61+
62+
if (TestExecutionContext.CurrentContext.CurrentResult.ResultState == ResultState.Failure || TestExecutionContext.CurrentContext.CurrentResult.ResultState == ResultState.Error)
63+
{
64+
TestContext.Out.WriteLine(string.Empty);
65+
TestContext.Out.WriteLine($"Log entries (log level: {scenarioContext.LogLevel}):");
66+
TestContext.Out.WriteLine("--- Start log entries ---------------------------------------------------");
67+
foreach (var logEntry in scenarioContext.Logs)
68+
{
69+
TestContext.Out.WriteLine($"{logEntry.Timestamp:T} {logEntry.Level} {logEntry.Endpoint ?? TestContext.CurrentContext.Test.Name}: {logEntry.Message}");
70+
}
71+
TestContext.Out.WriteLine("--- End log entries ---------------------------------------------------");
72+
}
73+
}
3874
}
3975
}

‎src/ServiceControl.AcceptanceTests.RavenDB/ServiceControl.AcceptanceTests.RavenDB.csproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,8 @@
3030
<Compile Include="..\ServiceControl.Persistence.Tests.RavenDB\StopSharedDatabase.cs" />
3131
</ItemGroup>
3232

33+
<ItemGroup>
34+
<Folder Include="Shared\Recoverability\ExternalIntegration\" />
35+
</ItemGroup>
36+
3337
</Project>

‎src/ServiceControl.AcceptanceTests/Recoverability/ExternalIntegration/ExternalIntegrationAcceptanceTest.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ public ErrorSender() =>
2020
EndpointSetup<DefaultServerWithoutAudit>(c =>
2121
{
2222
c.NoDelayedRetries();
23+
//TODO: Get back to this to determine whether or not this duplication for simulating the production code is really needed
2324
c.ReportSuccessfulRetriesToServiceControl();
2425
});
2526

‎src/ServiceControl.AcceptanceTests/Recoverability/ExternalIntegration/FailedMessageExtensions.cs‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
using System.Collections.Generic;
2+
using System.Linq;
3+
using System.Threading.Tasks;
4+
using ServiceControl.AcceptanceTesting;
5+
using ServiceControl.AcceptanceTests;
6+
using ServiceControl.MessageFailures.Api;
7+
8+
public static class FailedMessageExtensions
9+
{
10+
internal static async Task<string> GetOnlyFailedUnresolvedMessageId(this AcceptanceTest test)
11+
{
12+
var allFailedMessages =
13+
await test.TryGet<IList<FailedMessageView>>($"/api/errors/?status=unresolved");
14+
if (!allFailedMessages.HasResult)
15+
{
16+
return null;
17+
}
18+
19+
if (allFailedMessages.Item.Count != 1)
20+
{
21+
return null;
22+
}
23+
24+
return allFailedMessages.Item.First().Id;
25+
}
26+
}

‎src/ServiceControl.AcceptanceTests/Recoverability/ExternalIntegration/When_a_failed_edit_is_resolved_by_retry.cs‎

Lines changed: 191 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,191 @@
1+
namespace ServiceControl.AcceptanceTests.Recoverability.ExternalIntegration
2+
{
3+
using System.Collections.Generic;
4+
using System.Linq;
5+
using System.Threading.Tasks;
6+
using AcceptanceTesting;
7+
using AcceptanceTesting.EndpointTemplates;
8+
using Contracts;
9+
using NServiceBus;
10+
using NServiceBus.AcceptanceTesting;
11+
using NUnit.Framework;
12+
using ServiceControl.MessageFailures;
13+
using ServiceControl.MessageFailures.Api;
14+
using JsonSerializer = System.Text.Json.JsonSerializer;
15+
16+
class When_a_failed_edit_is_resolved_by_retry : AcceptanceTest
17+
{
18+
[Test]
19+
public async Task Should_publish_notification()
20+
{
21+
CustomConfiguration = config => config.OnEndpointSubscribed<EditMessageResolutionContext>((s, ctx) =>
22+
{
23+
ctx.ExternalProcessorSubscribed = s.SubscriberReturnAddress.Contains(nameof(MessageReceiver));
24+
});
25+
26+
var context = await Define<EditMessageResolutionContext>()
27+
.WithEndpoint<MessageReceiver>(b => b.When(async (bus, c) =>
28+
{
29+
await bus.Subscribe<MessageFailureResolvedByRetry>();
30+
await bus.Subscribe<MessageFailed>();
31+
await bus.Subscribe<MessageEditedAndRetried>();
32+
33+
if (c.HasNativePubSubSupport)
34+
{
35+
c.ExternalProcessorSubscribed = true;
36+
}
37+
}).When(c => c.SendLocal(new EditResolutionMessage())).DoNotFailOnErrorMessages())
38+
.Done(async ctx =>
39+
{
40+
if (!ctx.ExternalProcessorSubscribed)
41+
{
42+
return false;
43+
}
44+
45+
// second message - edit & retry
46+
if (ctx.MessageSentCount == 0 && ctx.MessageHandledCount == 1)
47+
{
48+
var failedMessagedId = await this.GetOnlyFailedUnresolvedMessageId();
49+
if (failedMessagedId == null)
50+
{
51+
return false;
52+
}
53+
54+
ctx.OriginalMessageFailureId = failedMessagedId;
55+
ctx.MessageSentCount = 1;
56+
57+
string editedMessage = JsonSerializer.Serialize(new EditResolutionMessage
58+
{ });
59+
60+
SingleResult<FailedMessage> failedMessage =
61+
await this.TryGet<FailedMessage>($"/api/errors/{ctx.OriginalMessageFailureId}");
62+
63+
var editModel = new EditMessageModel
64+
{
65+
MessageBody = editedMessage,
66+
MessageHeaders = failedMessage.Item.ProcessingAttempts.Last().Headers
67+
};
68+
await this.Post($"/api/edit/{ctx.OriginalMessageFailureId}", editModel);
69+
return false;
70+
}
71+
72+
// third message - retry
73+
if (ctx.MessageSentCount == 1 && ctx.MessageHandledCount == 2)
74+
{
75+
var failedMessageIdAfterId = await this.GetOnlyFailedUnresolvedMessageId();
76+
if (failedMessageIdAfterId == null)
77+
{
78+
return false;
79+
}
80+
81+
ctx.EditedMessageFailureId = failedMessageIdAfterId;
82+
ctx.MessageSentCount = 2;
83+
84+
await this.Post<object>($"/api/errors/{ctx.EditedMessageFailureId}/retry");
85+
return false;
86+
}
87+
88+
if (ctx.MessageHandledCount != 3)
89+
{
90+
return false;
91+
}
92+
93+
if (!ctx.MessageResolved || !ctx.EditAndRetryHandled || !ctx.MessageFailedResolved)
94+
{
95+
return false;
96+
}
97+
98+
return true;
99+
}).Run();
100+
101+
Assert.Multiple(() =>
102+
{
103+
Assert.That(context.ResolvedMessageId, Is.EqualTo(context.OriginalMessageFailureId));
104+
Assert.That(context.EditedMessageEditOf, Is.EqualTo(context.OriginalMessageFailureId));
105+
Assert.That(context.MessageFailedFailedMessageIds.Count, Is.EqualTo(2));
106+
Assert.That(context.MessageFailedFailedMessageIds, Is.Unique);
107+
Assert.That(context.MessageFailedFailedMessageIds, Has.Some.EqualTo(context.OriginalMessageFailureId));
108+
Assert.That(context.RetryFailedMessageId, Is.EqualTo(context.OriginalMessageFailureId));
109+
Assert.That(context.MessageFailedFailedMessageIds, Has.Some.EqualTo(context.EditedMessageFailureId));
110+
});
111+
}
112+
113+
114+
public class EditMessageResolutionContext : ScenarioContext
115+
{
116+
public string OriginalMessageFailureId { get; set; }
117+
public int MessageSentCount { get; set; }
118+
public int MessageHandledCount { get; set; }
119+
public string ResolvedMessageId { get; set; }
120+
public string EditedMessageFailureId { get; set; }
121+
public string EditedMessageEditOf { get; set; }
122+
public bool ExternalProcessorSubscribed { get; set; }
123+
public bool MessageResolved { get; set; }
124+
public bool MessageFailedResolved { get; set; }
125+
public string RetryFailedMessageId { get; set; }
126+
public bool EditAndRetryHandled { get; set; }
127+
public List<string> MessageFailedFailedMessageIds { get; } = [];
128+
}
129+
130+
public class MessageReceiver : EndpointConfigurationBuilder
131+
{
132+
public MessageReceiver() => EndpointSetup<DefaultServerWithoutAudit>(c => c.NoRetries());
133+
134+
135+
public class EditMessageResolutionHandler(EditMessageResolutionContext testContext)
136+
: IHandleMessages<EditResolutionMessage>, IHandleMessages<MessageFailureResolvedByRetry>, IHandleMessages<MessageFailed>, IHandleMessages<MessageEditedAndRetried>
137+
{
138+
public Task Handle(EditResolutionMessage message, IMessageHandlerContext context)
139+
{
140+
// First run - supposed to fail
141+
if (testContext.MessageSentCount == 0)
142+
{
143+
testContext.MessageHandledCount = 1;
144+
throw new SimulatedException();
145+
}
146+
147+
// Second run - edit retry - supposed to fail
148+
if (testContext.MessageSentCount == 1)
149+
{
150+
testContext.EditedMessageEditOf = context.MessageHeaders["ServiceControl.EditOf"];
151+
testContext.MessageHandledCount = 2;
152+
throw new SimulatedException();
153+
}
154+
155+
// Last run - normal retry - supposed to succeed
156+
testContext.MessageHandledCount = 3;
157+
return Task.CompletedTask;
158+
}
159+
160+
public Task Handle(MessageFailureResolvedByRetry message, IMessageHandlerContext context)
161+
{
162+
testContext.ResolvedMessageId = message.FailedMessageId;
163+
testContext.MessageResolved = true;
164+
return Task.CompletedTask;
165+
}
166+
167+
public Task Handle(MessageFailed message, IMessageHandlerContext context)
168+
{
169+
testContext.MessageFailedFailedMessageIds.Add(message.FailedMessageId);
170+
if (testContext.MessageFailedFailedMessageIds.Count == 2)
171+
{
172+
testContext.MessageFailedResolved = true;
173+
}
174+
return Task.CompletedTask;
175+
}
176+
177+
public Task Handle(MessageEditedAndRetried message, IMessageHandlerContext context)
178+
{
179+
testContext.RetryFailedMessageId = message.FailedMessageId;
180+
testContext.EditAndRetryHandled = true;
181+
return Task.CompletedTask;
182+
}
183+
}
184+
}
185+
186+
public class EditResolutionMessage : IMessage
187+
{
188+
}
189+
}
190+
}
191+

0 commit comments

Comments
 (0)