[camel] branch camel-3.11.x updated: CAMEL-16921: Fixed kafka span decorated logic to compute the kafka topic name

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch camel-3.11.x
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/camel-3.11.x by this push:
     new 9ea139b  CAMEL-16921: Fixed kafka span decorated logic to compute the 
kafka topic name
9ea139b is described below

commit 9ea139b4232648f982dae088f6eaaf48a1bd59c0
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Fri Sep 3 18:19:18 2021 +0200

    CAMEL-16921: Fixed kafka span decorated logic to compute the kafka topic 
name
---
 .../apache/camel/tracing/decorators/KafkaSpanDecorator.java   | 11 ++++-------
 .../camel/tracing/decorators/KafkaSpanDecoratorTest.java      |  4 ++--
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git 
a/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/KafkaSpanDecorator.java
 
b/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/KafkaSpanDecorator.java
index b28b857..ebb1e88 100644
--- 
a/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/KafkaSpanDecorator.java
+++ 
b/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/KafkaSpanDecorator.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.tracing.decorators;
 
-import java.util.Map;
-
 import org.apache.camel.Endpoint;
 import org.apache.camel.Exchange;
 import org.apache.camel.tracing.SpanAdapter;
@@ -35,7 +33,7 @@ public class KafkaSpanDecorator extends 
AbstractMessagingSpanDecorator {
     protected static final String PARTITION_KEY = "kafka.PARTITION_KEY";
     protected static final String PARTITION = "kafka.PARTITION";
     protected static final String KEY = "kafka.KEY";
-    protected static final String TOPIC = "kafka.TOPIC";
+    protected static final String OVERRIDE_TOPIC = "kafka.OVERRIDE_TOPIC";
     protected static final String OFFSET = "kafka.OFFSET";
 
     @Override
@@ -50,12 +48,11 @@ public class KafkaSpanDecorator extends 
AbstractMessagingSpanDecorator {
 
     @Override
     public String getDestination(Exchange exchange, Endpoint endpoint) {
-        String topic = exchange.getIn().getHeader(TOPIC, String.class);
+        String topic = exchange.getIn().getHeader(OVERRIDE_TOPIC, 
String.class);
         if (topic == null) {
-            Map<String, String> queryParameters = 
toQueryParameters(endpoint.getEndpointUri());
-            topic = queryParameters.get("topic");
+            topic = stripSchemeAndOptions(endpoint);
         }
-        return topic != null ? topic : super.getDestination(exchange, 
endpoint);
+        return topic;
     }
 
     @Override
diff --git 
a/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/KafkaSpanDecoratorTest.java
 
b/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/KafkaSpanDecoratorTest.java
index b88e517..99799f8 100644
--- 
a/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/KafkaSpanDecoratorTest.java
+++ 
b/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/KafkaSpanDecoratorTest.java
@@ -34,7 +34,7 @@ public class KafkaSpanDecoratorTest {
         Message message = Mockito.mock(Message.class);
 
         Mockito.when(exchange.getIn()).thenReturn(message);
-        Mockito.when(message.getHeader(KafkaSpanDecorator.TOPIC, 
String.class)).thenReturn("test");
+        Mockito.when(message.getHeader(KafkaSpanDecorator.OVERRIDE_TOPIC, 
String.class)).thenReturn("test");
 
         KafkaSpanDecorator decorator = new KafkaSpanDecorator();
 
@@ -49,7 +49,7 @@ public class KafkaSpanDecoratorTest {
 
         Mockito.when(exchange.getIn()).thenReturn(message);
         Mockito.when(endpoint.getEndpointUri())
-                
.thenReturn("kafka:localhost:9092?topic=test&groupId=testing&consumersCount=1");
+                
.thenReturn("kafka:test?brokers=localhost:9092&consumersCount=1");
 
         KafkaSpanDecorator decorator = new KafkaSpanDecorator();