refactor: activityfactory

Farfetch · Nov 14, 2023 · 9b9bb1b · 9b9bb1b
1 parent 3e926e7
commit 9b9bb1b
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 23 deletions.
diff --git 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
+{
     /// <summary>
     /// ActivitySource properties
     /// </summary>

diff --git 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
@@ -46,7 +46,6 @@ public KafkaConfiguration Build()
                 .AddSingleton<IConsumerAccessor>(new ConsumerAccessor())
                 .AddSingleton<IConsumerManagerFactory>(new ConsumerManagerFactory())
                 .AddSingleton<IClusterManagerAccessor, ClusterManagerAccessor>()
-                .AddSingleton<IActivityFactory, ActivityFactory>()
                 .AddSingleton(r =>
                 {
                     var logHandler = r.Resolve<ILogHandler>();

diff --git 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<ConsumeResult<byte[], byte[]>> messagesBuffer;
 
@@ -39,7 +38,6 @@ public ConsumerWorker(
             this.logHandler = logHandler;
             this.messagesBuffer = Channel.CreateBounded<ConsumeResult<byte[], byte[]>>(consumer.Configuration.BufferSize);
             this.globalEvents = this.dependencyResolver.Resolve<GlobalEvents>();
-            this.activityFactory = this.dependencyResolver.Resolve<IActivityFactory>();
         }
 
         public int Id { get; }
@@ -109,7 +107,7 @@ public void OnTaskCompleted(Action handler)
 
         private async Task ProcessMessageAsync(ConsumeResult<byte[], byte[]> 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
diff --git 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<GlobalEvents>();
-            this.activityFactory = this.dependencyResolver.Resolve<IActivityFactory>();
         }
 
         public string ProducerName => this.configuration.Name;
@@ -43,7 +41,7 @@ public async Task<DeliveryResult<byte[], byte[]>> 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);