From 52427042f0b4894933bac7f0fa235d27238c14f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sim=C3=A3o=20Ribeiro?= <simao.ribeiro@farfetch.com>
Date: Tue, 7 Nov 2023 15:14:39 +0000
Subject: [PATCH] more fixes

---
 src/KafkaFlow.Abstractions/IConsumerContext.cs        |  1 -
 src/KafkaFlow.Abstractions/IProducerContext.cs        |  2 --
 src/KafkaFlow.OpenTelemetry/ActivitySourceAccessor.cs |  3 ++-
 .../OpenTelemetryConsumerEventsHandler.cs             | 11 +----------
 src/KafkaFlow/Consumers/ConsumerContext.cs            |  1 -
 src/KafkaFlow/Producers/ProducerContext.cs            |  6 +-----
 6 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/src/KafkaFlow.Abstractions/IConsumerContext.cs b/src/KafkaFlow.Abstractions/IConsumerContext.cs
index cb080034a..b185d9c2b 100644
--- a/src/KafkaFlow.Abstractions/IConsumerContext.cs
+++ b/src/KafkaFlow.Abstractions/IConsumerContext.cs
@@ -1,7 +1,6 @@
 namespace KafkaFlow
 {
     using System;
-    using System.Collections.Generic;
     using System.Threading;
     using System.Threading.Tasks;
 
diff --git a/src/KafkaFlow.Abstractions/IProducerContext.cs b/src/KafkaFlow.Abstractions/IProducerContext.cs
index 443fc1892..1f63af400 100644
--- a/src/KafkaFlow.Abstractions/IProducerContext.cs
+++ b/src/KafkaFlow.Abstractions/IProducerContext.cs
@@ -1,7 +1,5 @@
 namespace KafkaFlow;
 
-using System.Collections.Generic;
-
 /// <summary>
 /// Some producer metadata
 /// </summary>
diff --git a/src/KafkaFlow.OpenTelemetry/ActivitySourceAccessor.cs b/src/KafkaFlow.OpenTelemetry/ActivitySourceAccessor.cs
index 0508a010d..b41b3065f 100644
--- a/src/KafkaFlow.OpenTelemetry/ActivitySourceAccessor.cs
+++ b/src/KafkaFlow.OpenTelemetry/ActivitySourceAccessor.cs
@@ -5,6 +5,7 @@ namespace KafkaFlow.OpenTelemetry
     using System;
     using System.Collections.Generic;
     using System.Diagnostics;
+    using System.Linq;
     using System.Reflection;
     using Conventions = SemanticConventions::OpenTelemetry.Trace.TraceSemanticConventions;
 
@@ -24,7 +25,7 @@ internal static class ActivitySourceAccessor
         public static void SetGenericTags(Activity activity, IEnumerable<string> bootstrapServers)
         {
             activity?.SetTag(Conventions.AttributeMessagingSystem, MessagingSystemId);
-            activity?.SetTag(Conventions.AttributePeerService, string.Join(",", bootstrapServers));
+            activity?.SetTag(Conventions.AttributePeerService, string.Join(",", bootstrapServers ?? Enumerable.Empty<string>()));
         }
 
         public static ActivityEvent CreateExceptionEvent(Exception exception)
diff --git a/src/KafkaFlow.OpenTelemetry/OpenTelemetryConsumerEventsHandler.cs b/src/KafkaFlow.OpenTelemetry/OpenTelemetryConsumerEventsHandler.cs
index 1170e1a5d..b3c3244c4 100644
--- a/src/KafkaFlow.OpenTelemetry/OpenTelemetryConsumerEventsHandler.cs
+++ b/src/KafkaFlow.OpenTelemetry/OpenTelemetryConsumerEventsHandler.cs
@@ -84,16 +84,7 @@ private static IEnumerable<string> ExtractTraceContextIntoBasicProperties(IMessa
 
         private static void SetConsumerTags(IMessageContext context, Activity activity)
         {
-            string messageKey = string.Empty;
-
-            try
-            {
-                messageKey = Encoding.UTF8.GetString(context.Message.Key as byte[]);
-            }
-            catch
-            {
-                // Do nothing
-            }
+            string messageKey = context.Message.Key != null ? Encoding.UTF8.GetString(context.Message.Key as byte[]) : string.Empty;
 
             activity.SetTag(ActivitySourceAccessor.AttributeMessagingOperation, ProcessString);
             activity.SetTag(AttributeMessagingSourceName, context.ConsumerContext.Topic);
diff --git a/src/KafkaFlow/Consumers/ConsumerContext.cs b/src/KafkaFlow/Consumers/ConsumerContext.cs
index 42a33c5f6..794dd7031 100644
--- a/src/KafkaFlow/Consumers/ConsumerContext.cs
+++ b/src/KafkaFlow/Consumers/ConsumerContext.cs
@@ -1,7 +1,6 @@
 namespace KafkaFlow.Consumers
 {
     using System;
-    using System.Collections.Generic;
     using System.Threading;
     using System.Threading.Tasks;
     using Confluent.Kafka;
diff --git a/src/KafkaFlow/Producers/ProducerContext.cs b/src/KafkaFlow/Producers/ProducerContext.cs
index 2b2af0596..98e8d17fc 100644
--- a/src/KafkaFlow/Producers/ProducerContext.cs
+++ b/src/KafkaFlow/Producers/ProducerContext.cs
@@ -1,12 +1,8 @@
 namespace KafkaFlow.Producers
 {
-    using System.Collections.Generic;
-
     internal class ProducerContext : IProducerContext
     {
-        public ProducerContext(
-            string topic,
-            IDependencyResolver producerDependencyResolver)
+        public ProducerContext(string topic, IDependencyResolver producerDependencyResolver)
         {
             this.Topic = topic;
             this.DependencyResolver = producerDependencyResolver;