Добавли возможность настройки для логирования в трассы и в консоль

Byndyusoft.Net.RabbitMq.sln.DotSettings

@@ -1,3 +1,4 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Byndyusoft/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Liveness/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=middlewares/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

Directory.Build.props

@@ -1,6 +1,6 @@
 <Project>
 	<PropertyGroup>
-		<Version>0.8.0</Version>
+		<Version>0.9.0</Version>
 		<Authors>Byndyusoft</Authors>
 		<PackageTags>Byndyusoft;RabbitMq</PackageTags>
 		<RepositoryUrl>https://github.com/Byndyusoft/Byndyusoft.Net.RabbitMq</RepositoryUrl>

README.md

@@ -150,6 +150,51 @@ public class QueueHostedService : BackgroundService
 }
 ```
 
+## Конфигурация
+
+```csharp
+public class Startup
+{
+	public void ConfigureServices(IServiceCollection services)
+	{
+		services.AddOpenTelemetry()
+				.WithTracing(builder => builder
+					.SetResourceBuilder(ResourceBuilder.CreateDefault().AddService("Byndyusoft.Net.RabbitMq"))
+					.AddJaegerExporter(jaeger =>
+					{
+						jaeger.AgentHost = "localhost";
+						jaeger.AgentPort = 6831;
+					})
+					.AddRabbitMqClientInstrumentation(o =>
+					{
+						options.LogEventsInTrace = false;
+						options.LogEventsInLogs = true;
+						options.TagRequestParamsInTrace = true;
+						options.EnrichLogsWithParams = true;
+						options.EnrichLogsWithQueueInfo = true;
+						options.RecordExceptions = true;
+						options.LogContentType = LogContentType.ReadModel;
+					}));
+		services.AddRabbitMqClient("host=localhost;username=guest;password=guest");
+		...
+	}
+}
+```
+
+Параметры конфигурации инструментации трассировки:
+1. LogEventsInTrace — создавать события в трассировке. По умолчанию: false.
+2. LogEventsInLogs — логировать события. По умолчанию: true.
+3. TagRequestParamsInTrace — добавлять параметры сообщения в тэги трассировки. По умолчанию: true. Чтобы узнать, как извлекаются данные, см. [здесь](https://github.com/Byndyusoft/Byndyusoft.Telemetry#object-telemetry-item-collector).
+4. EnrichLogsWithParams — обогатить каждый лог параметрами сообщения в контексте обработки этого сообщения. По умолчанию: true. Чтобы узнать, как извлекаются данные, см. [здесь](https://github.com/Byndyusoft/Byndyusoft.Telemetry#object-telemetry-item-collector).
+5. EnrichLogsWithQueueInfo — обогатить каждый лог информацией об очереди в контексте обработки этого сообщения. Default: true.
+6. RecordExceptions — помечать ошибки в трассировке. По умолчанию: true.
+7. LogContentType — способ извлечения содержимого сообщения при его обработке. По умолчанию: ReadModel.
+     * ReadModel - будет логироваться десериализованная модель в отдельном событии трассировки и/или в отдельной записи лога. В этом случае можно маскировать данные. См. [здесь](https://github.com/Byndyusoft/Byndyusoft.MaskedSerialization)
+     * Skip - не будет логироваться содержимое сообщения.
+     * RawString - будет логироваться содержимое сообщения как есть (строка). Маскировка данных работать не будет.
+
+<br/> 
+
 [![(License)](https://img.shields.io/github/license/Byndyusoft/Byndyusoft.Net.RabbitMq.svg)](LICENSE)
 
 | Package name | Nuget | Downloads |

example/Example.ConsoleApp.csproj

@@ -7,12 +7,15 @@
 	</PropertyGroup>
 
 	<ItemGroup>
+		<PackageReference Include="Byndyusoft.Logging.OpenTelemetry" Version="3.0.1" />
 		<PackageReference Include="Byndyusoft.Net.Http.MessagePack" Version="0.5.3" />
 		<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
-		<PackageReference Include="OpenTelemetry" Version="1.8.0" />
+		<PackageReference Include="OpenTelemetry" Version="1.8.1" />
 		<PackageReference Include="OpenTelemetry.Exporter.Jaeger" Version="1.5.1" />
-		<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.8.0" />
+		<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.8.1" />
 		<PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
+		<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.8.1" />
+		<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.8.1" />
 	</ItemGroup>
 
 	<ItemGroup>

example/HostedServices/PullingExample.cs

@@ -4,6 +4,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Byndyusoft.Messaging.RabbitMq;
+using Byndyusoft.Messaging.RabbitMq.Diagnostics;
 using Microsoft.Extensions.Hosting;
 
 namespace Byndyusoft.Net.RabbitMq.HostedServices
@@ -37,6 +38,7 @@ await _rabbitMqClient.CreateQueueAsync(_rabbitMqClient.Options.NamingConventions
                             {
                                 var model = await message.Content.ReadFromJsonAsync<Message>(
                                     cancellationToken: stoppingToken);
+                                RabbitMqClientEvents.OnMessageModelRead(model);
                                 Console.WriteLine(JsonSerializer.Serialize(model));
                                 await _rabbitMqClient.CompleteMessageAsync(message, ConsumeResult.Ack, stoppingToken);
                                 continue;

example/HostedServices/QueueInstallerHostedService.cs

@@ -27,6 +27,8 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
                         {
                             Console.WriteLine($"Retry count {message.RetryCount}");
 
+                            // TODO Expression is alway true. Возможно, проверка не нужна
+                            // ReSharper disable once ConditionIsAlwaysTrueOrFalse
                             if (message.RetryCount >= 0)
                                 return Task.FromResult(ConsumeResult.Retry);
 

example/HostedServices/SubscribeAsMessagePackExample.cs

@@ -4,6 +4,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Byndyusoft.Messaging.RabbitMq;
+using Byndyusoft.Messaging.RabbitMq.Diagnostics;
 using Byndyusoft.Messaging.RabbitMq.Utils;
 using MessagePack;
 using Microsoft.Extensions.Hosting;
@@ -25,6 +26,7 @@ async Task<ConsumeResult> OnMessage(ReceivedRabbitMqMessage message, Cancellatio
             {
                 var model = await message.Content.ReadFromMessagePackAsync<T>(options, token)
                     .ConfigureAwait(false);
+                RabbitMqClientEvents.OnMessageModelRead(model);
                 var result = await onMessage(model, token).ConfigureAwait(false);
                 return result;
             }
@@ -83,7 +85,7 @@ await Task.Run(async () =>
                 var rand = new Random();
                 while (stoppingToken.IsCancellationRequested == false)
                 {
-                    var message = new Message { Property = "messagepack-example" };
+                    var message = new Message { Property = "messagepack-example", Secret = "pwd" };
                     await _rabbitMqClient.PublishAsMessagePackAsync(null, queueName, message, null, stoppingToken);
                     await Task.Delay(TimeSpan.FromSeconds(rand.NextDouble()), stoppingToken);
                 }

example/Message.cs

@@ -1,7 +1,12 @@
+using Byndyusoft.MaskedSerialization.Annotations.Attributes;
+using Byndyusoft.Telemetry.Abstraction.Attributes;
+
 namespace Byndyusoft.Net.RabbitMq
 {
     public class Message
     {
-        public string Property { get; set; } = default!;
+        [TelemetryItem] public string Property { get; set; } = default!;
+
+        [Masked] public string Secret { get; set; } = default!;
     }
 }

example/Program.cs

@@ -1,78 +1,87 @@
-using System.Diagnostics;
 using System.Threading.Tasks;
 using Byndyusoft.Net.RabbitMq.HostedServices;
-using Microsoft.Extensions.Configuration;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
-using OpenTelemetry;
 using OpenTelemetry.Resources;
 using OpenTelemetry.Trace;
 
 namespace Byndyusoft.Net.RabbitMq
 {
     public static class Program
     {
-        private static readonly ActivitySource ActivitySource = new(nameof(Program));
-
         public static async Task Main(string[] args)
         {
-            using var tracerProvider = Sdk.CreateTracerProviderBuilder()
-                .SetResourceBuilder(ResourceBuilder.CreateDefault()
-                    .AddService("Byndyusoft.Net.RabbitMq"))
-                .SetSampler(new AlwaysOnSampler())
-                .AddSource(ActivitySource.Name)
-                .AddJaegerExporter(jaeger =>
-                {
-                    jaeger.AgentHost = "localhost";
-                    jaeger.AgentPort = 6831;
-                })
-                .AddRabbitMqClientInstrumentation()
-                .Build();
-
             await CreateHostBuilder(args).RunConsoleAsync();
         }
 
         private static IHostBuilder CreateHostBuilder(string[] args)
         {
             return Host.CreateDefaultBuilder(args)
-                .ConfigureHostOptions(options =>
-                {
-                    options.BackgroundServiceExceptionBehavior = BackgroundServiceExceptionBehavior.Ignore;
-                })
-                .ConfigureLogging(log => log.AddConsole())
-                .ConfigureAppConfiguration(configuration => { configuration.AddJsonFile("appsettings.json", true); })
-                .ConfigureServices((_, services) =>
+                .ConfigureWebHostDefaults(webBuilder =>
                 {
-                    services.AddRabbitMqRpc();
-                    services.AddSingleton<MathRpcServiceClient>();
-                    services.AddRpcService<MathRpcService>();
+                    webBuilder.UseStartup<Startup>();
+                    webBuilder.ConfigureLogging(i => i.AddConsole());
+                    //webBuilder.UseSerilog((context, configuration) => configuration
+                    //    .UseDefaultSettings(context.Configuration)
+                    //    .UseOpenTelemetryTraces()
+                    //    .WriteToOpenTelemetry(activityEventBuilder: StructuredActivityEventBuilder.Instance));
+                });
+        }
+    }
 
-                    //services.AddHostedService<PullingExample>();
-                    //services.AddHostedService<RetryAndErrorExample>();
-                    services.AddHostedService<RpcExample>();
+    public class Startup
+    {
+        public void ConfigureServices(IServiceCollection services)
+        {
+            services.AddOpenTelemetry()
+                        .WithTracing(builder => builder
+                            .SetResourceBuilder(ResourceBuilder.CreateDefault().AddService("Byndyusoft.Net.RabbitMq"))
+                            .AddJaegerExporter(jaeger =>
+                            {
+                                jaeger.AgentHost = "localhost";
+                                jaeger.AgentPort = 6831;
+                            })
+                            .AddRabbitMqClientInstrumentation(o =>
+                            {
+                                o.LogEventsInTrace = true;
+                                o.LogEventsInLogs = true;
+                                o.RecordExceptions = true;
+                            }));
+            services.AddRabbitMqRpc();
+            services.AddSingleton<MathRpcServiceClient>();
+            services.AddRpcService<MathRpcService>();
 
-                    //services.AddHostedService<SubscribeAsMessagePackExample>();
+            //services.AddHostedService<PullingExample>();
+            //services.AddHostedService<RetryAndErrorExample>();
+            //services.AddHostedService<RpcExample>();
 
-                    //services.AddHostedService<RpcServerExample>();
-                    //services.AddHostedService<SubscribeAsExample>();
-                    //services.AddHostedService<SubscribeAsJsonExample>();
-                    //services.AddHostedService<SubscribeExchangeExample>();
-                    //services.AddHostedService<ClientFactoryExample>();
+            services.AddHostedService<SubscribeAsMessagePackExample>();
 
-                    //services.AddHostedService<QueueInstallerHostedService>();
+            //services.AddHostedService<RpcServerExample>();
+            //services.AddHostedService<SubscribeAsExample>();
+            //services.AddHostedService<SubscribeAsJsonExample>();
+            //services.AddHostedService<SubscribeExchangeExample>();
+            //services.AddHostedService<ClientFactoryExample>();
 
-                    //services.AddRabbitMqClient("host=localhost;username=guest;password=guest");
+            //services.AddHostedService<QueueInstallerHostedService>();
 
-                    //services.AddRabbitMqClient("client-factory", "host=localhost;username=guest;password=guest");
-                    services.AddInMemoryRabbitMqClient();
+            services.AddRabbitMqClient("host=localhost;username=guest;password=guest");
 
-                    services.BuildServiceProvider(new ServiceProviderOptions
-                    {
-                        ValidateOnBuild = true,
-                        ValidateScopes = true
-                    });
-                });
+            //services.AddRabbitMqClient("client-factory", "host=localhost;username=guest;password=guest");
+            //services.AddInMemoryRabbitMqClient();
+
+            services.BuildServiceProvider(new ServiceProviderOptions
+            {
+                ValidateOnBuild = true,
+                ValidateScopes = true
+            });
+        }
+
+        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
+        {
         }
     }
 }

example/appsettings.json

@@ -0,0 +1,10 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  },
+  "AllowedHosts": "*"
+}

src/Byndyusoft.Messaging.RabbitMq.Abstractions/Byndyusoft.Messaging.RabbitMq.Abstractions.csproj

@@ -9,6 +9,7 @@
 	<ItemGroup>
 		<PackageReference Include="System.Text.Json" Version="7.0.0" />
 		<PackageReference Include="Byndyusoft.Net.Http.Json" Version="0.3.1" />
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="6.0.0" />
 	</ItemGroup>
 
 </Project>

src/Byndyusoft.Messaging.RabbitMq.Abstractions/ConsumeResult.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Net.Http;
 
 namespace Byndyusoft.Messaging.RabbitMq
 {

src/Byndyusoft.Messaging.RabbitMq.Abstractions/Diagnostics/Consts/DiagnosticNames.cs

@@ -0,0 +1,7 @@
+namespace Byndyusoft.Messaging.RabbitMq.Diagnostics.Consts
+{
+    public class DiagnosticNames
+    {
+        public static string RabbitMq = "Byndyusoft.RabbitMq";
+    }
+}

src/Byndyusoft.Messaging.RabbitMq.Abstractions/Diagnostics/Consts/EventNames.cs

@@ -0,0 +1,13 @@
+namespace Byndyusoft.Messaging.RabbitMq.Diagnostics.Consts
+{
+    public class EventNames
+    {
+        public static string MessagePublishing = "Byndyusoft.RabbitMq.Message.Publishing";
+        public static string MessageReturned = "Byndyusoft.RabbitMq.Message.Returned";
+        public static string MessageGot = "Byndyusoft.RabbitMq.Message.Got";
+        public static string MessageModelRead = "Byndyusoft.RabbitMq.Message.ModelRead";
+        public static string MessageReplied = "Byndyusoft.RabbitMq.Message.Replied";
+        public static string MessageConsumed = "Byndyusoft.RabbitMq.Message.Consumed";
+        public static string UnhandledException = "Byndyusoft.RabbitMq.UnhandledException";
+    }
+}