From a979d57b27e889710ea96595b5eae7b59fc37878 Mon Sep 17 00:00:00 2001
From: Miguel Alexandre <miguel.alexandre@bynder.com>
Date: Thu, 22 Dec 2022 18:01:24 +0000
Subject: [PATCH] Fix ambiguous references

---
 .../kafka/client/SpanPropagation.scala               | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/instrumentation/kamon-kafka/src/main/scala/kamon/instrumentation/kafka/client/SpanPropagation.scala b/instrumentation/kamon-kafka/src/main/scala/kamon/instrumentation/kafka/client/SpanPropagation.scala
index df7b7a981..cd6f79551 100644
--- a/instrumentation/kamon-kafka/src/main/scala/kamon/instrumentation/kafka/client/SpanPropagation.scala
+++ b/instrumentation/kamon-kafka/src/main/scala/kamon/instrumentation/kafka/client/SpanPropagation.scala
@@ -18,11 +18,11 @@ package kamon.instrumentation.kafka.client
 
 import kamon.context.{Context, _}
 import kamon.trace.Span
-import org.apache.kafka.common.header.Headers
+import org.apache.kafka.common.header.{Headers => KafkaHeaders}
 
 import java.nio.charset.StandardCharsets
 
-trait KafkaPropagator extends Propagation.EntryReader[Headers] with Propagation.EntryWriter[Headers] {}
+trait KafkaPropagator extends Propagation.EntryReader[KafkaHeaders] with Propagation.EntryWriter[KafkaHeaders] {}
 
 /**
   * Propagation mechanisms for Kamon's Span data to and from HTTP and Binary mediums.
@@ -33,7 +33,7 @@ object SpanPropagation {
 
     import kamon.trace.SpanPropagation.W3CTraceContext._
 
-    override def read(medium: Headers, context: Context): Context = {
+    override def read(medium: KafkaHeaders, context: Context): Context = {
 
       val contextWithParent = for {
         traceParent <- Option(medium.lastHeader(Headers.TraceParent))
@@ -49,7 +49,7 @@ object SpanPropagation {
       contextWithParent.getOrElse(context)
     }
 
-    override def write(context: Context, medium: Headers): Unit = {
+    override def write(context: Context, medium: KafkaHeaders): Unit = {
       val span = context.get(Span.Key)
 
       if (span != Span.Empty) {
@@ -71,7 +71,7 @@ object SpanPropagation {
 
     import KCtxHeader._
 
-    override def read(medium: Headers, context: Context): Context = {
+    override def read(medium: KafkaHeaders, context: Context): Context = {
       val header = Option(medium.lastHeader(Headers.Kctx))
 
       header.map { h =>
@@ -79,7 +79,7 @@ object SpanPropagation {
       }.getOrElse(context)
     }
 
-    override def write(context: Context, medium: Headers): Unit = {
+    override def write(context: Context, medium: KafkaHeaders): Unit = {
 
       medium.add(Headers.Kctx, ContextSerializationHelper.toByteArray(context))
     }