From 9b9bb1b2bc2523ce987dd95e3fc0bf53e0852748 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sim=C3=A3o=20Ribeiro?= Date: Tue, 14 Nov 2023 11:37:23 +0000 Subject: [PATCH] refactor: activityfactory --- src/KafkaFlow.Abstractions/ActivitySourceAccessor.cs | 8 ++++---- src/KafkaFlow/ActivityFactory.cs | 4 ++-- src/KafkaFlow/Configuration/KafkaConfigurationBuilder.cs | 1 - src/KafkaFlow/Consumers/ConsumerWorker.cs | 4 +--- src/KafkaFlow/IActivityFactory.cs | 9 --------- src/KafkaFlow/Producers/MessageProducer.cs | 6 ++---- 6 files changed, 9 insertions(+), 23 deletions(-) delete mode 100644 src/KafkaFlow/IActivityFactory.cs diff --git a/src/KafkaFlow.Abstractions/ActivitySourceAccessor.cs b/src/KafkaFlow.Abstractions/ActivitySourceAccessor.cs index c65fa0f00..52bdd4c9f 100644 --- a/src/KafkaFlow.Abstractions/ActivitySourceAccessor.cs +++ b/src/KafkaFlow.Abstractions/ActivitySourceAccessor.cs @@ -1,8 +1,8 @@ -namespace KafkaFlow -{ - using System.Diagnostics; - using System.Reflection; +using System.Diagnostics; +using System.Reflection; +namespace KafkaFlow +{ /// /// ActivitySource properties /// diff --git a/src/KafkaFlow/ActivityFactory.cs b/src/KafkaFlow/ActivityFactory.cs index c1c291658..95d7a582a 100644 --- a/src/KafkaFlow/ActivityFactory.cs +++ b/src/KafkaFlow/ActivityFactory.cs @@ -2,9 +2,9 @@ namespace KafkaFlow { - internal class ActivityFactory : IActivityFactory + internal class ActivityFactory { - public Activity Start(string topicName, ActivityOperationType activityOperationType, ActivityKind activityKind) + public static Activity Start(string topicName, ActivityOperationType activityOperationType, ActivityKind activityKind) { var activityName = !string.IsNullOrEmpty(topicName) ? $"{topicName} {activityOperationType}" : activityOperationType.ToString().ToLower(); diff --git a/src/KafkaFlow/Configuration/KafkaConfigurationBuilder.cs b/src/KafkaFlow/Configuration/KafkaConfigurationBuilder.cs index e7dd8e93c..b1758da1e 100644 --- a/src/KafkaFlow/Configuration/KafkaConfigurationBuilder.cs +++ b/src/KafkaFlow/Configuration/KafkaConfigurationBuilder.cs @@ -46,7 +46,6 @@ public KafkaConfiguration Build() .AddSingleton(new ConsumerAccessor()) .AddSingleton(new ConsumerManagerFactory()) .AddSingleton() - .AddSingleton() .AddSingleton(r => { var logHandler = r.Resolve(); diff --git a/src/KafkaFlow/Consumers/ConsumerWorker.cs b/src/KafkaFlow/Consumers/ConsumerWorker.cs index 3258268d9..1add26ac1 100644 --- a/src/KafkaFlow/Consumers/ConsumerWorker.cs +++ b/src/KafkaFlow/Consumers/ConsumerWorker.cs @@ -15,7 +15,6 @@ internal class ConsumerWorker : IConsumerWorker private readonly IMiddlewareExecutor middlewareExecutor; private readonly ILogHandler logHandler; private readonly GlobalEvents globalEvents; - private readonly IActivityFactory activityFactory; private readonly Channel> messagesBuffer; @@ -39,7 +38,6 @@ public ConsumerWorker( this.logHandler = logHandler; this.messagesBuffer = Channel.CreateBounded>(consumer.Configuration.BufferSize); this.globalEvents = this.dependencyResolver.Resolve(); - this.activityFactory = this.dependencyResolver.Resolve(); } public int Id { get; } @@ -109,7 +107,7 @@ public void OnTaskCompleted(Action handler) private async Task ProcessMessageAsync(ConsumeResult message, CancellationToken cancellationToken) { - var activity = this.activityFactory.Start(message.Topic, ActivityOperationType.Process, ActivityKind.Consumer); + var activity = ActivityFactory.Start(message.Topic, ActivityOperationType.Process, ActivityKind.Consumer); try { diff --git a/src/KafkaFlow/IActivityFactory.cs b/src/KafkaFlow/IActivityFactory.cs deleted file mode 100644 index cd3bc6a7c..000000000 --- a/src/KafkaFlow/IActivityFactory.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace KafkaFlow -{ - using System.Diagnostics; - - internal interface IActivityFactory - { - public Activity Start(string topicName, ActivityOperationType activityOperationType, ActivityKind activityKind); - } -} diff --git a/src/KafkaFlow/Producers/MessageProducer.cs b/src/KafkaFlow/Producers/MessageProducer.cs index 7a4501920..d378630cb 100644 --- a/src/KafkaFlow/Producers/MessageProducer.cs +++ b/src/KafkaFlow/Producers/MessageProducer.cs @@ -13,7 +13,6 @@ internal class MessageProducer : IMessageProducer, IDisposable private readonly IProducerConfiguration configuration; private readonly MiddlewareExecutor middlewareExecutor; private readonly GlobalEvents globalEvents; - private readonly IActivityFactory activityFactory; private readonly object producerCreationSync = new(); @@ -27,7 +26,6 @@ public MessageProducer( this.configuration = configuration; this.middlewareExecutor = new MiddlewareExecutor(configuration.MiddlewaresConfigurations); this.globalEvents = this.dependencyResolver.Resolve(); - this.activityFactory = this.dependencyResolver.Resolve(); } public string ProducerName => this.configuration.Name; @@ -43,7 +41,7 @@ public async Task> ProduceAsync( using var scope = this.dependencyResolver.CreateScope(); - var activity = this.activityFactory.Start(topic, ActivityOperationType.Publish, ActivityKind.Producer); + var activity = ActivityFactory.Start(topic, ActivityOperationType.Publish, ActivityKind.Producer); var messageContext = this.CreateMessageContext(topic, messageKey, messageValue, headers); @@ -106,7 +104,7 @@ public void Produce( { var scope = this.dependencyResolver.CreateScope(); - var activity = this.activityFactory.Start(topic, ActivityOperationType.Publish, ActivityKind.Producer); + var activity = ActivityFactory.Start(topic, ActivityOperationType.Publish, ActivityKind.Producer); var messageContext = this.CreateMessageContext(topic, messageKey, messageValue, headers);