Merge branch 'release/2.8'

Author: MvRens

Examples/08-MessageHandlerLogging/08-MessageHandlerLogging.csproj

@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <RootNamespace>_08_MessageHandlerLogging</RootNamespace>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.0" />
+    <PackageReference Include="SimpleInjector" Version="5.3.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\Tapeti.Serilog\Tapeti.Serilog.csproj" />
+    <ProjectReference Include="..\ExampleLib\ExampleLib.csproj" />
+    <ProjectReference Include="..\Messaging.TapetiExample\Messaging.TapetiExample.csproj" />
+    <ProjectReference Include="..\..\Tapeti.SimpleInjector\Tapeti.SimpleInjector.csproj" />
+    <ProjectReference Include="..\..\Tapeti\Tapeti.csproj" />
+  </ItemGroup>
+
+</Project>

Examples/08-MessageHandlerLogging/Program.cs

@@ -0,0 +1,62 @@
+using System;
+using System.Threading.Tasks;
+using ExampleLib;
+using Messaging.TapetiExample;
+using Serilog;
+using Serilog.Events;
+using SimpleInjector;
+using Tapeti;
+using Tapeti.Serilog;
+using Tapeti.SimpleInjector;
+using ILogger = Tapeti.ILogger;
+
+namespace _08_MessageHandlerLogging
+{
+    public class Program
+    {
+        public static void Main()
+        {
+            var container = new Container();
+            var dependencyResolver = new SimpleInjectorDependencyResolver(container);
+
+            var seriLogger = new LoggerConfiguration()
+                .MinimumLevel.Debug()
+                
+                // Include {Properties} or specific keys in the output template to see properties added to the diagnostic context
+                .WriteTo.Console(outputTemplate: "[{Timestamp:HH:mm:ss} {Level:u3}] {Message:lj} {Properties}{NewLine}{Exception}")
+                .CreateLogger();
+
+            container.RegisterInstance((Serilog.ILogger)seriLogger);
+            container.Register<ILogger, TapetiSeriLogger.WithMessageLogging>();
+            
+
+            var helper = new ExampleConsoleApp(dependencyResolver);
+            helper.Run(MainAsync);
+
+            seriLogger.Dispose();
+        }
+
+
+        internal static async Task MainAsync(IDependencyResolver dependencyResolver, Func<Task> waitForDone)
+        {
+            var config = new TapetiConfig(dependencyResolver)
+                .WithMessageHandlerLogging()
+                .RegisterAllControllers()
+                .Build();
+
+
+            await using var connection = new TapetiConnection(config);
+            var subscriber = await connection.Subscribe(false);
+
+
+            var publisher = dependencyResolver.Resolve<IPublisher>();
+            await publisher.Publish(new PublishSubscribeMessage
+            {
+                Greeting = "Hello message handler logging!"
+            });
+            
+            await subscriber.Resume();
+            await waitForDone();
+        }
+    }
+}

Examples/08-MessageHandlerLogging/SlowMessageController.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Threading.Tasks;
+using ExampleLib;
+using Messaging.TapetiExample;
+using Tapeti.Annotations;
+
+namespace _08_MessageHandlerLogging
+{
+    [MessageController]
+    [DynamicQueue("tapeti.example.08.slow")]
+    public class SlowMessageController
+    {
+        private readonly IExampleState exampleState;
+
+
+        public SlowMessageController(IExampleState exampleState)
+        {
+            this.exampleState = exampleState;
+        }
+
+
+        public async Task GimmeASec(PublishSubscribeMessage message)
+        {
+            Console.WriteLine("Received message (in slow controller): " + message.Greeting);
+
+            await Task.Delay(1000);
+            
+            exampleState.Done();
+        }
+    }
+}

Examples/08-MessageHandlerLogging/SpeedyMessageController.cs

@@ -0,0 +1,20 @@
+using System;
+using Messaging.TapetiExample;
+using Tapeti.Annotations;
+using Tapeti.Serilog;
+
+namespace _08_MessageHandlerLogging
+{
+    [MessageController]
+    [DynamicQueue("tapeti.example.08.speedy")]
+    public class SpeedyMessageController
+    {
+        // ReSharper disable once InconsistentNaming
+        public void IAmSpeed(PublishSubscribeMessage message, IDiagnosticContext diagnosticContext)
+        {
+            diagnosticContext.Set("PropertySetByMessageHandler", 42);
+            
+            Console.WriteLine("Received message (in speedy controller): " + message.Greeting);
+        }
+    }
+}

Examples/Messaging.TapetiExample/Messaging.TapetiExample.csproj

@@ -6,10 +6,7 @@
 
   <ItemGroup>
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\Tapeti.Annotations\Tapeti.Annotations.csproj" />
+    <PackageReference Include="Tapeti.Annotations" Version="3.0.0" />
   </ItemGroup>
 
 </Project>

README.md

@@ -1,3 +1,4 @@
+
 ## Introduction
 Tapeti is a wrapper for the RabbitMQ .NET Client designed for long-running microservices. It’s main goal is to minimize the amount of messaging code required, and instead focus on the higher-level flow.
 
@@ -47,6 +48,17 @@ The documentation for Tapeti is available on Read the Docs:
 [![Documentation Status](https://readthedocs.org/projects/tapeti/badge/?version=latest)](http://tapeti.readthedocs.io/en/latest/introduction.html?badge=latest)
 
 
+## Related repositories
+Parts of Tapeti have been split into their own repository. This allows them to have their own version numbers which increases compatibility between shared message packages when services use different Tapeti versions.
+
+ - [Tapeti.Annotations](https://github.com/MvRens/Tapeti.Annotations)
+ annotations used in message classes, like [Request]
+
+ - [Tapeti.DataAnnotations.Extensions](https://github.com/MvRens/Tapet.DataAnnotations.Extensions)
+ generic data annotation attributes useful in messages, like the [RequiredGuid] attribute
+
+ - [Tapeti.Cmd](https://github.com/MvRens/Tapeti.Cmd)
+ the standalone tool to manage RabbitMQ messages and queues, focused on Tapeti-compatible messages
 
 ## Builds
 Builds are automatically run using AppVeyor, with the resulting packages being pushed to NuGet.