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

Adding Configurable Exponential Backoff in Pull Delivery #150

Merged
merged 5 commits into from
Jul 18, 2024
Merged

Adding Configurable Exponential Backoff in Pull Delivery #150

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7802415
Add RetryDelays parameter and default exponential backoff
Le-Merle Jul 16, 2024
368068c
Merge branch 'main' into feature/SGCORE-737_Implement-Retry-Policy
Le-Merle Jul 16, 2024
daf70d7
Use TimeSpans instead of int
Le-Merle Jul 18, 2024
e7d3313
Safety check for emptiness
Le-Merle Jul 18, 2024
5e95437
Fix warnings
Le-Merle Jul 18, 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
373 changes: 230 additions & 143 deletions ...orkleap.DomainEventPropagation.Subscription.PullDelivery.Tests/EventPullerServiceTests.cs
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion ...PullDelivery.Tests/Workleap.DomainEventPropagation.Subscription.PullDelivery.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="AutoBogus" Version="2.13.1" />
<PackageReference Include="CliWrap" Version="3.6.6" />
<PackageReference Include="FakeItEasy" Version="8.0.0" />
<PackageReference Include="GSoft.Extensions.Xunit" Version="1.0.1" />
Expand Down
10 changes: 5 additions & 5 deletions ...entPropagation.Subscription.PullDelivery/EventGridClientAdapter/EventGridClientAdapter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,24 +17,24 @@ public async Task<IEnumerable<EventBundle>> ReceiveCloudEventsAsync(string topic
var result = await this._adaptee.ReceiveCloudEventsAsync(topicName, eventSubscriptionName, maxEvents, cancellationToken: cancellationToken).ConfigureAwait(false);

return result.HasValue
? result.Value.Value.Select(x => new EventBundle(x.Event, x.BrokerProperties.LockToken))
: Array.Empty<EventBundle>();
? result.Value.Value.Select(x => new EventBundle(x.Event, x.BrokerProperties.LockToken, x.BrokerProperties.DeliveryCount))
: [];
}

public Task AcknowledgeCloudEventsAsync(string topicName, string eventSubscriptionName, IEnumerable<string> lockTokens, CancellationToken cancellationToken)
{
return this._adaptee.AcknowledgeCloudEventsAsync(topicName, eventSubscriptionName, new AcknowledgeOptions(lockTokens), cancellationToken);
}

public Task ReleaseCloudEventsAsync(string topicName, string eventSubscriptionName, IEnumerable<string> lockTokens, CancellationToken cancellationToken)
public Task ReleaseCloudEventsAsync(string topicName, string eventSubscriptionName, IEnumerable<string> lockTokens, TimeSpan releaseDelay, CancellationToken cancellationToken)
{
return this._adaptee.ReleaseCloudEventsAsync(topicName, eventSubscriptionName, new ReleaseOptions(lockTokens), cancellationToken: cancellationToken);
return this._adaptee.ReleaseCloudEventsAsync(topicName, eventSubscriptionName, new ReleaseOptions(lockTokens), releaseDelay.Seconds, cancellationToken);
}

public Task RejectCloudEventsAsync(string topicName, string eventSubscriptionName, IEnumerable<string> lockTokens, CancellationToken cancellationToken)
{
return this._adaptee.RejectCloudEventsAsync(topicName, eventSubscriptionName, new RejectOptions(lockTokens), cancellationToken);
}

internal sealed record EventBundle(CloudEvent Event, string LockToken);
internal sealed record EventBundle(CloudEvent Event, string LockToken, int DeliveryCount);
}
2 changes: 1 addition & 1 deletion ...ntPropagation.Subscription.PullDelivery/EventGridClientAdapter/IEventGridClientAdapter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ internal interface IEventGridClientAdapter

Task AcknowledgeCloudEventsAsync(string topicName, string eventSubscriptionName, IEnumerable<string> lockTokens, CancellationToken cancellationToken);

Task ReleaseCloudEventsAsync(string topicName, string eventSubscriptionName, IEnumerable<string> lockTokens, CancellationToken cancellationToken);
Task ReleaseCloudEventsAsync(string topicName, string eventSubscriptionName, IEnumerable<string> lockTokens, TimeSpan releaseDelay, CancellationToken cancellationToken);

Task RejectCloudEventsAsync(string topicName, string eventSubscriptionName, IEnumerable<string> lockTokens, CancellationToken cancellationToken);
}
2 changes: 2 additions & 0 deletions ...p.DomainEventPropagation.Subscription.PullDelivery/EventPropagationSubscriptionOptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,6 @@ public class EventPropagationSubscriptionOptions
public string SubscriptionName { get; set; } = string.Empty;

public int MaxDegreeOfParallelism { get; set; } = 1;

public IReadOnlyCollection<TimeSpan>? RetryDelays { get; set; }
}
168 changes: 59 additions & 109 deletions src/Workleap.DomainEventPropagation.Subscription.PullDelivery/EventPullerService.cs
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 0 additions & 6 deletions src/Workleap.DomainEventPropagation.Subscription.PullDelivery/EventPullerServiceOptions.cs
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions src/Workleap.DomainEventPropagation.Subscription.PullDelivery/PublicAPI.Shipped.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ Workleap.DomainEventPropagation.EventPropagationSubscriptionOptions.TopicName.ge
Workleap.DomainEventPropagation.EventPropagationSubscriptionOptions.TopicName.set -> void
Workleap.DomainEventPropagation.EventPropagationSubscriptionOptions.MaxDegreeOfParallelism.get -> int
Workleap.DomainEventPropagation.EventPropagationSubscriptionOptions.MaxDegreeOfParallelism.set -> void
Workleap.DomainEventPropagation.EventPropagationSubscriptionOptions.RetryDelays.get -> System.Collections.Generic.IReadOnlyCollection<System.TimeSpan>?
Workleap.DomainEventPropagation.EventPropagationSubscriptionOptions.RetryDelays.set -> void
Workleap.DomainEventPropagation.EventPropagationSubscriptionOptionsValidator
Workleap.DomainEventPropagation.EventPropagationSubscriptionOptionsValidator.EventPropagationSubscriptionOptionsValidator() -> void
Workleap.DomainEventPropagation.EventPropagationSubscriptionOptionsValidator.Validate(string! name, Workleap.DomainEventPropagation.EventPropagationSubscriptionOptions! options) -> Microsoft.Extensions.Options.ValidateOptionsResult!
Expand Down