Support for UUIDv7 values

Signed-off-by: Tomasz Maruszak <[email protected]>

.github/workflows/build.yml

@@ -25,11 +25,6 @@ jobs:
       group: ${{ github.workflow }}-${{ github.ref }}
       cancel-in-progress: true
     steps:
-      # - name: Dump GitHub context
-      #   env:
-      #     GITHUB_CONTEXT: ${{ toJson(github) }}
-      #   run: echo "$GITHUB_CONTEXT"
-
       - name: PR - Checkout
         if: github.event_name == 'pull_request_target'
         uses: actions/checkout@v3
@@ -195,7 +190,7 @@ jobs:
           name: .NET Tests
           path: ./test-results/*.trx
           reporter: dotnet-trx
-          fail-on-error: false
+          fail-on-error: true
 
       - name: Copy NuGet packages
         shell: bash

README.md

@@ -89,7 +89,7 @@ SlimMessageBus is a client façade for message brokers for .NET. It comes with i
 | `.Host.Interceptor`                  | Core interface for interceptors                                                                                     | [![NuGet](https://img.shields.io/nuget/v/SlimMessageBus.Host.Interceptor.svg)](https://www.nuget.org/packages/SlimMessageBus.Host.Interceptor)                                   |
 | `.Host.FluentValidation`             | Validation for messages based on [FluentValidation](https://www.nuget.org/packages/FluentValidation)                | [![NuGet](https://img.shields.io/nuget/v/SlimMessageBus.Host.FluentValidation.svg)](https://www.nuget.org/packages/SlimMessageBus.Host.FluentValidation)                         |
 | `.Host.Outbox.Sql`                   | Transactional Outbox using SQL                                                                                      | [![NuGet](https://img.shields.io/nuget/v/SlimMessageBus.Host.Outbox.Sql.svg)](https://www.nuget.org/packages/SlimMessageBus.Host.Outbox.Sql)                                     |
-| `.Host.Outbox.DbContext`             | Transactional Outbox using EF DbContext                                                                             | [![NuGet](https://img.shields.io/nuget/v/SlimMessageBus.Host.Outbox.DbContext.svg)](https://www.nuget.org/packages/SlimMessageBus.Host.Outbox.DbContext)                         |
+| `.Host.Outbox.Sql.DbContext`         | Transactional Outbox using EF DbContext                                                                             | [![NuGet](https://img.shields.io/nuget/v/SlimMessageBus.Host.Outbox.Sql.DbContext.svg)](https://www.nuget.org/packages/SlimMessageBus.Host.Outbox.Sql.DbContext)                 |
 | `.Host.AsyncApi`                     | [AsyncAPI](https://www.asyncapi.com/) specification generation via [Saunter](https://github.com/tehmantra/saunter)  | [![NuGet](https://img.shields.io/nuget/v/SlimMessageBus.Host.AsyncApi.svg)](https://www.nuget.org/packages/SlimMessageBus.Host.AsyncApi)                                         |
 
 Typically the application layers (domain model, business logic) only need to depend on `SlimMessageBus` which is the facade, and ultimately the application hosting layer (ASP.NET, Console App, Windows Service) will reference and configure the other packages (`SlimMessageBus.Host.*`) which are the messaging transport providers and additional plugins.

build/tasks.ps1

@@ -40,7 +40,7 @@ $projects = @(
 
 	"SlimMessageBus.Host.Outbox",
 	"SlimMessageBus.Host.Outbox.Sql",
-	"SlimMessageBus.Host.Outbox.DbContext",
+	"SlimMessageBus.Host.Outbox.Sql.DbContext",
 
 	"SlimMessageBus.Host.AsyncApi"
 )

docs/plugin_outbox.md

@@ -12,6 +12,7 @@ Please read the [Introduction](intro.md) before reading this provider documentat
     - [UseTransactionScope](#usetransactionscope)
     - [UseSqlTransaction](#usesqltransaction)
 - [How it works](#how-it-works)
+- [Important note](#important-note)
 
 ## Introduction
 
@@ -27,15 +28,15 @@ Outbox plugin can work in combination with any transport provider.
 
 ### Entity Framework
 
-> Required: [`SlimMessageBus.Host.Outbox.DbContext`](https://www.nuget.org/packages/SlimMessageBus.Host.Outbox.DbContext)
+> Required: [`SlimMessageBus.Host.Outbox.Sql.DbContext`](https://www.nuget.org/packages/SlimMessageBus.Host.Outbox.Sql.DbContext)
 
 ```cs
-using SlimMessageBus.Host.Outbox.DbContext;
+using SlimMessageBus.Host.Outbox.Sql.DbContext;
 ```
 
 Consider the following example (from [Samples](../src/Samples/Sample.OutboxWebApi/Program.cs)):
 
-- `services.AddOutboxUsingDbContext<CustomerContext>(...)` is used to add the [Outbox.DbContext](https://www.nuget.org/packages/SlimMessageBus.Host.Outbox.DbContext) plugin to the container.
+- `services.AddOutboxUsingDbContext<CustomerContext>(...)` is used to add the [Outbox.DbContext](https://www.nuget.org/packages/SlimMessageBus.Host.Outbox.Sql.DbContext) plugin to the container.
 - `CustomerContext` is the application specific Entity Framework `DbContext`.
 - `CustomerCreatedEvent` is produced on the `AzureSB` child bus, the bus will deliver these events via outbox - see `.UseOutbox()`
 - `CreateCustomerCommand` is consumed on the `Memory` child bus, each command is wrapped in an SQL transaction - see `UseSqlTransaction()`
@@ -181,7 +182,7 @@ When applied on the (child) bus level then all consumers (or handlers) will inhe
 
 #### UseSqlTransaction
 
-> Required: [`SlimMessageBus.Host.Outbox.Sql`](https://www.nuget.org/packages/SlimMessageBus.Host.Outbox.Sql) or [`SlimMessageBus.Host.Outbox.DbContext`](https://www.nuget.org/packages/SlimMessageBus.Host.Outbox.DbContext)
+> Required: [`SlimMessageBus.Host.Outbox.Sql`](https://www.nuget.org/packages/SlimMessageBus.Host.Outbox.Sql) or [`SlimMessageBus.Host.Outbox.Sql.DbContext`](https://www.nuget.org/packages/SlimMessageBus.Host.Outbox.Sql.DbContext)
 
 ```cs
 using SlimMessageBus.Host.Outbox.Sql;
@@ -218,6 +219,6 @@ When applied on the (child) bus level then all consumers (or handlers) will inhe
 
 ## Important note
 
-As the outbox can be processed by instance of the application that did not originally process it, it is important to ensure that all active instances maintian the same message registrations (and compatible JSON schema definitions). 
+As the outbox can be processed by instance of the application that did not originally process it, it is important to ensure that all active instances maintain the same message registrations (and compatible JSON schema definitions).
 
 A message that fails to deserialize will be flagged as invalid by setting the associated `DeliveryAborted` field in the `Outbox` table, to `1`. It is safe to manually reset this field value to `0` once the version incompatibility has been resolved.

docs/plugin_outbox.t.md

@@ -12,6 +12,7 @@ Please read the [Introduction](intro.md) before reading this provider documentat
     - [UseTransactionScope](#usetransactionscope)
     - [UseSqlTransaction](#usesqltransaction)
 - [How it works](#how-it-works)
+- [Important note](#important-note)
 
 ## Introduction
 
@@ -27,15 +28,15 @@ Outbox plugin can work in combination with any transport provider.
 
 ### Entity Framework
 
-> Required: [`SlimMessageBus.Host.Outbox.DbContext`](https://www.nuget.org/packages/SlimMessageBus.Host.Outbox.DbContext)
+> Required: [`SlimMessageBus.Host.Outbox.Sql.DbContext`](https://www.nuget.org/packages/SlimMessageBus.Host.Outbox.Sql.DbContext)
 
 ```cs
-using SlimMessageBus.Host.Outbox.DbContext;
+using SlimMessageBus.Host.Outbox.Sql.DbContext;
 ```
 
 Consider the following example (from [Samples](../src/Samples/Sample.OutboxWebApi/Program.cs)):
 
-- `services.AddOutboxUsingDbContext<CustomerContext>(...)` is used to add the [Outbox.DbContext](https://www.nuget.org/packages/SlimMessageBus.Host.Outbox.DbContext) plugin to the container.
+- `services.AddOutboxUsingDbContext<CustomerContext>(...)` is used to add the [Outbox.DbContext](https://www.nuget.org/packages/SlimMessageBus.Host.Outbox.Sql.DbContext) plugin to the container.
 - `CustomerContext` is the application specific Entity Framework `DbContext`.
 - `CustomerCreatedEvent` is produced on the `AzureSB` child bus, the bus will deliver these events via outbox - see `.UseOutbox()`
 - `CreateCustomerCommand` is consumed on the `Memory` child bus, each command is wrapped in an SQL transaction - see `UseSqlTransaction()`
@@ -112,7 +113,7 @@ When applied on the (child) bus level then all consumers (or handlers) will inhe
 
 #### UseSqlTransaction
 
-> Required: [`SlimMessageBus.Host.Outbox.Sql`](https://www.nuget.org/packages/SlimMessageBus.Host.Outbox.Sql) or [`SlimMessageBus.Host.Outbox.DbContext`](https://www.nuget.org/packages/SlimMessageBus.Host.Outbox.DbContext)
+> Required: [`SlimMessageBus.Host.Outbox.Sql`](https://www.nuget.org/packages/SlimMessageBus.Host.Outbox.Sql) or [`SlimMessageBus.Host.Outbox.Sql.DbContext`](https://www.nuget.org/packages/SlimMessageBus.Host.Outbox.Sql.DbContext)
 
 ```cs
 using SlimMessageBus.Host.Outbox.Sql;
@@ -149,6 +150,6 @@ When applied on the (child) bus level then all consumers (or handlers) will inhe
 
 ## Important note
 
-As the outbox can be processed by instance of the application that did not originally process it, it is important to ensure that all active instances maintian the same message registrations (and compatible JSON schema definitions). 
+As the outbox can be processed by instance of the application that did not originally process it, it is important to ensure that all active instances maintain the same message registrations (and compatible JSON schema definitions).
 
-A message that fails to deserialize will be flagged as invalid by setting the associated `DeliveryAborted` field in the `Outbox` table, to `1`. It is safe to manually reset this field value to `0` once the version incompatibility has been resolved.
+A message that fails to deserialize will be flagged as invalid by setting the associated `DeliveryAborted` field in the `Outbox` table, to `1`. It is safe to manually reset this field value to `0` once the version incompatibility has been resolved.

docs/provider_kafka.md

@@ -29,7 +29,7 @@ When troubleshooting or fine tuning it is worth reading the `librdkafka` and `co
 
 ## Configuration properties
 
-Producer, consumer and global configuration properties are described [here](https://github.com/edenhill/librdkafka/blob/master/CONFIGURATION.md).
+Producer, consumer and global configuration properties are described [here](https://github.com/confluentinc/librdkafka/blob/master/CONFIGURATION.md).
 The configuration on the underlying Kafka client can be adjusted like so:
 
 ```cs
@@ -53,7 +53,7 @@ services.AddSlimMessageBus(mbb =>
 
 ### Minimizing message latency
 
-There is a good description [here](https://github.com/edenhill/librdkafka/wiki/How-to-decrease-message-latency) on improving the latency by applying producer/consumer settings on librdkafka. Here is how you enter the settings using SlimMessageBus:
+There is a good description [here](https://github.com/confluentinc/librdkafka/wiki/How-to-decrease-message-latency) on improving the latency by applying producer/consumer settings on librdkafka. Here is how you enter the settings using SlimMessageBus:
 
 ```cs
 services.AddSlimMessageBus(mbb =>
@@ -176,7 +176,7 @@ public class PingConsumer : IConsumer<PingMessage>, IConsumerWithContext
 {
    public IConsumerContext Context { get; set; }
 
-   public Task OnHandle(PingMessage message, CancellationToken cancellationToken)
+   public Task OnHandle(PingMessage message)
    {
       // SMB Kafka transport specific extension:
       var transportMessage = Context.GetTransportMessage();
@@ -211,7 +211,8 @@ mbb
 
 ### Offset Commit
 
-In the current Kafka provider implementation, SMB handles the manual commit of topic-partition offsets for the consumer. This configuration is controlled through the following methods on the consumer builder:
+In the current Kafka provider implementation, SMB handles the manual commit of topic-partition offsets for the consumer.Th
+is configuration is controlled through the following methods on the consumer builder:
 
 - `CheckpointEvery(int)` – Commits the offset after a specified number of processed messages.
 - `CheckpointAfter(TimeSpan)` – Commits the offset after a specified time interval.

src/Host.Plugin.Properties.xml

@@ -4,7 +4,7 @@
   <Import Project="Common.NuGet.Properties.xml" />
 
   <PropertyGroup>
-    <Version>3.0.0-rc11</Version>
+    <Version>3.0.0-rc12</Version>
   </PropertyGroup>
 
 </Project>

src/Samples/Sample.OutboxWebApi/Program.cs

@@ -12,8 +12,8 @@
 using SlimMessageBus.Host.AzureServiceBus;
 using SlimMessageBus.Host.Memory;
 using SlimMessageBus.Host.Outbox;
-using SlimMessageBus.Host.Outbox.DbContext;
 using SlimMessageBus.Host.Outbox.Sql;
+using SlimMessageBus.Host.Outbox.Sql.DbContext;
 using SlimMessageBus.Host.Serialization.Json;
 
 // Local file with secrets

src/Samples/Sample.OutboxWebApi/Sample.OutboxWebApi.csproj

@@ -20,9 +20,7 @@
     <ProjectReference Include="..\..\SlimMessageBus.Host.AspNetCore\SlimMessageBus.Host.AspNetCore.csproj" />
     <ProjectReference Include="..\..\SlimMessageBus.Host.AzureServiceBus\SlimMessageBus.Host.AzureServiceBus.csproj" />
     <ProjectReference Include="..\..\SlimMessageBus.Host.Memory\SlimMessageBus.Host.Memory.csproj" />
-    <ProjectReference Include="..\..\SlimMessageBus.Host.Outbox.DbContext\SlimMessageBus.Host.Outbox.DbContext.csproj" />
-    <ProjectReference Include="..\..\SlimMessageBus.Host.Outbox.Sql\SlimMessageBus.Host.Outbox.Sql.csproj" />
-    <ProjectReference Include="..\..\SlimMessageBus.Host.Outbox\SlimMessageBus.Host.Outbox.csproj" />
+    <ProjectReference Include="..\..\SlimMessageBus.Host.Outbox.Sql.DbContext\SlimMessageBus.Host.Outbox.Sql.DbContext.csproj" />
     <ProjectReference Include="..\..\SlimMessageBus.Host.Serialization.Json\SlimMessageBus.Host.Serialization.Json.csproj" />
     <ProjectReference Include="..\..\Tools\SecretStore\SecretStore.csproj" />
   </ItemGroup>

src/SlimMessageBus.Host.Configuration/SlimMessageBus.Host.Configuration.csproj

@@ -6,7 +6,7 @@
     <Description>Core configuration interfaces of SlimMessageBus</Description>
     <PackageTags>SlimMessageBus</PackageTags>
     <RootNamespace>SlimMessageBus.Host</RootNamespace>
-    <Version>3.0.0-rc11</Version>
+    <Version>3.0.0-rc12</Version>
   </PropertyGroup>
 
   <ItemGroup>

src/SlimMessageBus.Host.Interceptor/SlimMessageBus.Host.Interceptor.csproj

@@ -3,7 +3,7 @@
   <Import Project="../Common.NuGet.Properties.xml" />
 
   <PropertyGroup>
-    <Version>3.0.0-rc11</Version>
+    <Version>3.0.0-rc12</Version>
     <Description>Core interceptor interfaces of SlimMessageBus</Description>
     <PackageTags>SlimMessageBus</PackageTags>
   </PropertyGroup>

src/SlimMessageBus.Host.Outbox.Sql.DbContext/Configuration/MessageBusBuilderExtensions.cs

@@ -0,0 +1,28 @@
+namespace SlimMessageBus.Host.Outbox.Sql.DbContext;
+
+public static class MessageBusBuilderExtensions
+{
+    public static MessageBusBuilder AddOutboxUsingDbContext<TDbContext>(this MessageBusBuilder mbb, Action<SqlOutboxSettings> configure)
+        where TDbContext : Microsoft.EntityFrameworkCore.DbContext
+    {
+        mbb.PostConfigurationActions.Add(services =>
+        {
+            services.TryAddScoped<ISqlTransactionService, DbContextTransactionService<TDbContext>>();
+            services.TryAddScoped(svp =>
+            {
+                var settings = svp.GetRequiredService<SqlOutboxSettings>();
+                return new DbContextOutboxRepository<TDbContext>(
+                        svp.GetRequiredService<ILogger<DbContextOutboxRepository<TDbContext>>>(),
+                        settings,
+                        svp.GetRequiredService<SqlOutboxTemplate>(),
+                        settings.IdGeneration.GuidGenerator ?? (IGuidGenerator)svp.GetRequiredService(settings.IdGeneration.GuidGeneratorType),
+                        svp.GetRequiredService<ICurrentTimeProvider>(),
+                        svp.GetRequiredService<IInstanceIdProvider>(),
+                        svp.GetRequiredService<TDbContext>(),
+                        svp.GetRequiredService<ISqlTransactionService>()
+                    );
+            });
+        });
+        return mbb.AddOutboxUsingSql<DbContextOutboxRepository<TDbContext>>(configure);
+    }
+}

src/SlimMessageBus.Host.Outbox.Sql.DbContext/DbContextOutboxRepository.cs

@@ -0,0 +1,28 @@
+namespace SlimMessageBus.Host.Outbox.Sql.DbContext;
+
+public class DbContextOutboxRepository<TDbContext> : SqlOutboxMessageRepository where TDbContext : Microsoft.EntityFrameworkCore.DbContext
+{
+    public TDbContext DbContext { get; }
+
+    public DbContextOutboxRepository(
+        ILogger<DbContextOutboxRepository<TDbContext>> logger,
+        SqlOutboxSettings settings,
+        SqlOutboxTemplate sqlOutboxTemplate,
+        IGuidGenerator guidGenerator,
+        ICurrentTimeProvider currentTimeProvider,
+        IInstanceIdProvider instanceIdProvider,
+        TDbContext dbContext,
+        ISqlTransactionService transactionService)
+        : base(
+            logger,
+            settings,
+            sqlOutboxTemplate,
+            guidGenerator,
+            currentTimeProvider,
+            instanceIdProvider,
+            (SqlConnection)dbContext.Database.GetDbConnection(),
+            transactionService)
+    {
+        DbContext = dbContext;
+    }
+}

src/SlimMessageBus.Host.Outbox.DbContext/DbContextTransactionService.cs → src/SlimMessageBus.Host.Outbox.Sql.DbContext/DbContextTransactionService.cs

@@ -1,14 +1,8 @@
-namespace SlimMessageBus.Host.Outbox.DbContext;
-
-using Microsoft.Data.SqlClient;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Storage;
-
-using SlimMessageBus.Host.Sql.Common;
+namespace SlimMessageBus.Host.Outbox.Sql.DbContext;
 
 public class DbContextTransactionService<TDbContext>(TDbContext dbContext, ISqlSettings sqlSettings)
     : AbstractSqlTransactionService((SqlConnection)dbContext.Database.GetDbConnection())
-    where TDbContext : DbContext
+    where TDbContext : Microsoft.EntityFrameworkCore.DbContext
 {
     public TDbContext DbContext { get; } = dbContext;
 

src/SlimMessageBus.Host.Outbox.Sql.DbContext/GlobalUsings.cs

@@ -0,0 +1,8 @@
+global using Microsoft.Data.SqlClient;
+global using Microsoft.EntityFrameworkCore;
+global using Microsoft.EntityFrameworkCore.Storage;
+global using Microsoft.Extensions.DependencyInjection;
+global using Microsoft.Extensions.DependencyInjection.Extensions;
+global using Microsoft.Extensions.Logging;
+
+global using SlimMessageBus.Host.Sql.Common;