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

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>

example/Example.ConsoleApp.csproj

@@ -9,9 +9,11 @@
 	<ItemGroup>
 		<PackageReference Include="Byndyusoft.Net.Http.MessagePack" Version="0.5.3" />
 		<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
-		<PackageReference Include="OpenTelemetry" Version="1.5.1" />
+		<PackageReference Include="OpenTelemetry" Version="1.7.0" />
 		<PackageReference Include="OpenTelemetry.Exporter.Jaeger" Version="1.5.1" />
-		<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.5.1" />
+		<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.7.0" />
+		<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.7.0" />
+		<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.6.0-rc.1" />
 		<PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
 	</ItemGroup>
 

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/Program.cs

@@ -5,7 +5,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
-using OpenTelemetry;
 using OpenTelemetry.Resources;
 using OpenTelemetry.Trace;
 
@@ -17,19 +16,6 @@ public static class 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();
         }
 
@@ -44,6 +30,20 @@ private static IHostBuilder CreateHostBuilder(string[] args)
                 .ConfigureAppConfiguration(configuration => { configuration.AddJsonFile("appsettings.json", true); })
                 .ConfigureServices((_, 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>();

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/RabbitMqClientCoreOptions.cs

@@ -8,7 +8,6 @@ namespace Byndyusoft.Messaging.RabbitMq
 {
     public class RabbitMqClientCoreOptions
     {
-        private RabbitMqDiagnosticsOptions _diagnosticsOptions = new();
         private QueueNamingConventions _namingConventions = new();
 
         public string ApplicationName { get; set; } =
@@ -20,12 +19,6 @@ public QueueNamingConventions NamingConventions
             set => _namingConventions = Preconditions.CheckNotNull(value, nameof(NamingConventions));
         }
 
-        public RabbitMqDiagnosticsOptions DiagnosticsOptions
-        {
-            get => _diagnosticsOptions;
-            set => _diagnosticsOptions = Preconditions.CheckNotNull(value, nameof(RabbitMqDiagnosticsOptions));
-        }
-
         public TimeSpan? RpcLivenessCheckPeriod { get; set; } = TimeSpan.FromMinutes(1);
 
         public TimeSpan? RpcIdleLifetime { get; set; } = null;

src/Byndyusoft.Messaging.RabbitMq.Abstractions/Topology/QueueOptionsExtensions.cs

@@ -2,6 +2,7 @@
 using Byndyusoft.Messaging.RabbitMq.Topology;
 using Byndyusoft.Messaging.RabbitMq.Utils;
 
+// ReSharper disable once CheckNamespace
 namespace Byndyusoft.Messaging.RabbitMq
 {
     /// <summary>

src/Byndyusoft.Messaging.RabbitMq.Core/Byndyusoft.Messaging.RabbitMq.Core.csproj

@@ -7,8 +7,8 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="6.0.0" />
-		<PackageReference Include="OpenTelemetry.API" Version="1.3.1" />
+    <PackageReference Include="OpenTelemetry.API" Version="1.3.1" />
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="6.0.0" />
 	</ItemGroup>
 
 	<ItemGroup>

src/Byndyusoft.Messaging.RabbitMq.Core/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.Core/Diagnostics/Consts/EventNames.cs

@@ -0,0 +1,12 @@
+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 MessageReplied = "Byndyusoft.RabbitMq.Message.Replied";
+        public static string MessageConsumed = "Byndyusoft.RabbitMq.Message.Consumed";
+        public static string UnhandledException = "Byndyusoft.RabbitMq.UnhandledException";
+    }
+}

src/Byndyusoft.Messaging.RabbitMq.Core/Diagnostics/EventItem.cs

@@ -0,0 +1,18 @@
+namespace Byndyusoft.Messaging.RabbitMq.Diagnostics
+{
+    public class EventItem
+    {
+        public string Name { get; }
+
+        public object? Value { get; }
+
+        public string Description { get; }
+
+        public EventItem(string name, object? value, string description)
+        {
+            Name = name;
+            Value = value;
+            Description = description;
+        }
+    }
+}

src/Byndyusoft.Messaging.RabbitMq.Core/Diagnostics/RabbitMqClientActivitySource.Events.cs

@@ -1,124 +1,39 @@
-using System.Diagnostics;
-using Byndyusoft.Messaging.RabbitMq.Serialization;
+using Byndyusoft.Messaging.RabbitMq.Diagnostics.Consts;
 
 namespace Byndyusoft.Messaging.RabbitMq.Diagnostics
 {
     public partial class RabbitMqClientActivitySource
     {
         public class RabbitMqClientActivitySourceEvents
         {
-            private readonly RabbitMqClientActivitySource _activitySource;
-
-            public RabbitMqClientActivitySourceEvents(RabbitMqClientActivitySource activitySource)
+            public void MessagePublishing(RabbitMqMessage message)
             {
-                _activitySource = activitySource;
+                if (EventLogger.IsEnabled(EventNames.MessagePublishing))
+                    EventLogger.Write(EventNames.MessagePublishing, message);
             }
 
-            public void MessagePublishing(Activity? activity, RabbitMqMessage message)
+            public void MessageReturned(ReturnedRabbitMqMessage message)
             {
-                if (activity is null)
-                    return;
-
-                var tags = GetPublishedMessageEventTags(message);
-                var activityEvent = new ActivityEvent("message.publishing", tags: tags);
-                activity.AddEvent(activityEvent);
+                if (EventLogger.IsEnabled(EventNames.MessageReturned))
+                    EventLogger.Write(EventNames.MessageReturned, message);
             }
 
-            public void MessageReturned(Activity? activity, ReturnedRabbitMqMessage message)
+            public void MessageGot(ReceivedRabbitMqMessage? message)
             {
-                if (activity is null)
-                    return;
-
-                var tags = GetReturnedMessageEventTags(message);
-                var activityEvent = new ActivityEvent("message.returned", tags: tags);
-                activity.AddEvent(activityEvent);
+                if (EventLogger.IsEnabled(EventNames.MessageGot))
+                    EventLogger.Write(EventNames.MessageGot, message);
             }
 
-            public void MessageGot(Activity? activity, ReceivedRabbitMqMessage? message)
+            public void MessageReplied(ReceivedRabbitMqMessage message)
             {
-                if (activity is null)
-                    return;
-
-                ActivityContextPropagation.ExtractContext(activity, message?.Headers);
-
-                var tags = GetConsumedMessageEventTags(message);
-                var activityEvent = new ActivityEvent("message.got", tags: tags);
-                activity.AddEvent(activityEvent);
-            }
-
-            public void MessageReplied(Activity? activity, ReceivedRabbitMqMessage message)
-            {
-                if (activity is null)
-                    return;
-
-                var tags = GetConsumedMessageEventTags(message);
-                var activityEvent = new ActivityEvent("message.replied", tags: tags);
-                activity.AddEvent(activityEvent);
-            }
-
-            public void MessageConsumed(Activity? activity, ReceivedRabbitMqMessage _, ConsumeResult result)
-            {
-                if (activity is null)
-                    return;
-
-                var tags = new ActivityTagsCollection {{"result", result.GetDescription()}};
-                var activityEvent = new ActivityEvent("message.consumed", tags: tags);
-                activity.AddEvent(activityEvent);
+                if (EventLogger.IsEnabled(EventNames.MessageReplied))
+                    EventLogger.Write(EventNames.MessageReplied, message);
             }
 
-            private ActivityTagsCollection GetReturnedMessageEventTags(ReturnedRabbitMqMessage message)
+            public void MessageConsumed(ConsumeResult result)
             {
-                var tags = new ActivityTagsCollection();
-
-                tags.Add("amqp.message.exchange", message.Exchange ?? string.Empty);
-                tags.Add("amqp.message.routing_key", message.RoutingKey);
-                tags.Add("amqp.message.return_reason", message.ReturnReason);
-                tags.Add("amqp.message.content",
-                    message.Content.ReadAsStringAsync().GetAwaiter().GetResult());
-                tags.Add("amqp.message.properties",
-                    JsonSerializer.Serialize(message.Properties, _activitySource._options));
-
-                return tags;
-            }
-
-            private ActivityTagsCollection GetPublishedMessageEventTags(RabbitMqMessage message)
-            {
-                var tags = new ActivityTagsCollection();
-
-                tags.Add("amqp.message.exchange", message.Exchange ?? string.Empty);
-                tags.Add("amqp.message.routing_key", message.RoutingKey);
-                tags.Add("amqp.message.mandatory", message.Mandatory);
-                tags.Add("amqp.message.content",
-                    message.Content.ReadAsStringAsync().GetAwaiter().GetResult());
-                tags.Add("amqp.message.properties",
-                    JsonSerializer.Serialize(message.Properties, _activitySource._options));
-
-                return tags;
-            }
-
-            private ActivityTagsCollection GetConsumedMessageEventTags(ReceivedRabbitMqMessage? message)
-            {
-                var tags = new ActivityTagsCollection();
-
-                if (message is null)
-                {
-                    tags.Add("amqp.message", "null");
-                }
-                else
-                {
-                    tags.Add("amqp.message.content", message.Content.ReadAsStringAsync().GetAwaiter().GetResult());
-                    tags.Add("amqp.message.exchange", message.Exchange);
-                    tags.Add("amqp.message.queue", message.Queue);
-                    tags.Add("amqp.message.routing_key", message.RoutingKey);
-                    tags.Add("amqp.message.delivery_tag", message.DeliveryTag);
-                    tags.Add("amqp.message.redelivered", message.Redelivered);
-                    tags.Add("amqp.message.consumer_tag", message.ConsumerTag);
-                    tags.Add("amqp.message.retry_count", message.RetryCount);
-                    tags.Add("amqp.message.properties",
-                        JsonSerializer.Serialize(message.Properties, _activitySource._options));
-                }
-
-                return tags;
+                if (EventLogger.IsEnabled(EventNames.MessageConsumed))
+                    EventLogger.Write(EventNames.MessageConsumed, result);
             }
         }
     }

src/Byndyusoft.Messaging.RabbitMq.Core/Diagnostics/RabbitMqClientActivitySource.cs

@@ -2,6 +2,7 @@
 using System.Diagnostics;
 using System.Reflection;
 using System.Threading.Tasks;
+using Byndyusoft.Messaging.RabbitMq.Diagnostics.Consts;
 using Byndyusoft.Messaging.RabbitMq.Utils;
 
 namespace Byndyusoft.Messaging.RabbitMq.Diagnostics
@@ -10,21 +11,18 @@ public partial class RabbitMqClientActivitySource
     {
         public static readonly string Name = typeof(RabbitMqClientActivitySource).Assembly.GetName().Name;
 
+        private static readonly DiagnosticListener EventLogger = new(DiagnosticNames.RabbitMq);
+
         private static readonly string? Version = typeof(RabbitMqClientActivitySource)
             .GetCustomAttribute<AssemblyFileVersionAttribute>()?.Version;
 
-        private readonly RabbitMqDiagnosticsOptions _options;
-
         private readonly ActivitySource _source;
 
-        public RabbitMqClientActivitySource(RabbitMqDiagnosticsOptions options)
+        public RabbitMqClientActivitySource()
         {
-            Preconditions.CheckNotNull(options, nameof(options));
-
             _source = new ActivitySource(Name, Version);
-            _options = options;
 
-            Events = new RabbitMqClientActivitySourceEvents(this);
+            Events = new RabbitMqClientActivitySourceEvents();
             Activities = new RabbitMqClientActivitySourceActivities(this);
         }
 
@@ -52,31 +50,20 @@ private static void StopActivity(Activity? activity)
                 return;
 
             activity.SetStatus(ActivityStatusCode.Ok);
-            activity.SetTag("otel.status_code", "OK");
             activity.Dispose();
         }
 
-        private static void SetException(Activity? activity, Exception exception, bool escaped = true)
+        private static void SetException(Activity? activity, Exception exception)
         {
             Preconditions.CheckNotNull(exception, nameof(exception));
+            if (EventLogger.IsEnabled(EventNames.UnhandledException))
+                EventLogger.Write(EventNames.UnhandledException, exception);
 
             if (activity is null)
                 return;
 
-            activity.SetStatus(ActivityStatusCode.Error, exception.Message);
-
-            var tags = new ActivityTagsCollection
-            {
-                {"exception.type", exception.GetType().FullName},
-                {"exception.message", exception.Message},
-                {"exception.stacktrace", exception.ToString()},
-                {"exception.escaped", escaped}
-            };
-            var activityEvent = new ActivityEvent("exception", tags: tags);
-            activity.AddEvent(activityEvent);
             activity.SetTag("error", "true");
-            activity.SetTag("otel.status_code", "ERROR");
-            activity.SetTag("otel.status_description", exception.Message);
+            activity.SetStatus(ActivityStatusCode.Error, exception.Message);
             activity.Dispose();
         }