This is an automated email from the ASF dual-hosted git repository.
bvahdat pushed a commit to branch cleanup
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/cleanup by this push:
new d9d10d293b3 cleanup camel-tracing codebase a bit
d9d10d293b3 is described below
commit d9d10d293b37bfe89e067a656500fca6348a2d61
Author: Babak Vahdat <bvah...@apache.org>
AuthorDate: Sat May 7 20:57:31 2022 +0200
cleanup camel-tracing codebase a bit
---
.../java/org/apache/camel/tracing/decorators/CqlSpanDecorator.java | 4 ++--
.../src/test/java/org/apache/camel/tracing/MockSpanAdapter.java | 4 ++--
.../camel/tracing/decorators/AbstractHttpSpanDecoratorTest.java | 2 +-
.../apache/camel/tracing/decorators/CometdSpanDecoratorTest.java | 6 +++---
.../org/apache/camel/tracing/decorators/CqlSpanDecoratorTest.java | 2 +-
.../apache/camel/tracing/decorators/IronmqSpanDecoratorTest.java | 2 +-
.../org/apache/camel/tracing/decorators/JmsSpanDecoratorTest.java | 6 +++---
.../org/apache/camel/tracing/decorators/KafkaSpanDecoratorTest.java | 4 ++--
.../org/apache/camel/tracing/decorators/StompSpanDecoratorTest.java | 2 +-
9 files changed, 16 insertions(+), 16 deletions(-)
diff --git
a/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/CqlSpanDecorator.java
b/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/CqlSpanDecorator.java
index e4a5a9c3eb1..f8e07caabc0 100644
---
a/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/CqlSpanDecorator.java
+++
b/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/CqlSpanDecorator.java
@@ -50,9 +50,9 @@ public class CqlSpanDecorator extends AbstractSpanDecorator {
span.setTag(Tag.DB_INSTANCE, uri.getPath().substring(1));
}
- Object cql = exchange.getIn().getHeader(CAMEL_CQL_QUERY);
+ String cql = exchange.getIn().getHeader(CAMEL_CQL_QUERY, String.class);
if (cql != null) {
- span.setTag(Tag.DB_STATEMENT, cql.toString());
+ span.setTag(Tag.DB_STATEMENT, cql);
} else {
Map<String, String> queryParameters =
toQueryParameters(endpoint.getEndpointUri());
if (queryParameters.containsKey("cql")) {
diff --git
a/components/camel-tracing/src/test/java/org/apache/camel/tracing/MockSpanAdapter.java
b/components/camel-tracing/src/test/java/org/apache/camel/tracing/MockSpanAdapter.java
index 61cff5ce8fa..157900c0dba 100644
---
a/components/camel-tracing/src/test/java/org/apache/camel/tracing/MockSpanAdapter.java
+++
b/components/camel-tracing/src/test/java/org/apache/camel/tracing/MockSpanAdapter.java
@@ -24,7 +24,7 @@ import java.util.Map;
public class MockSpanAdapter implements SpanAdapter {
private List<LogEntry> logEntries = new ArrayList<>();
- private HashMap<String, Object> tags = new HashMap<>();
+ private Map<String, Object> tags = new HashMap<>();
private String traceId;
private String spanId;
@@ -36,7 +36,7 @@ public class MockSpanAdapter implements SpanAdapter {
return new MockSpanAdapter().setOperation(operation);
}
- public HashMap<String, Object> tags() {
+ public Map<String, Object> tags() {
return tags;
}
diff --git
a/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/AbstractHttpSpanDecoratorTest.java
b/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/AbstractHttpSpanDecoratorTest.java
index 0818c5ecaef..7cd4d3087a0 100644
---
a/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/AbstractHttpSpanDecoratorTest.java
+++
b/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/AbstractHttpSpanDecoratorTest.java
@@ -40,7 +40,7 @@ public class AbstractHttpSpanDecoratorTest {
Mockito.when(exchange.getIn()).thenReturn(message);
Mockito.when(message.getHeader(Exchange.HTTP_METHOD)).thenReturn("PUT");
- AbstractHttpSpanDecorator decorator = new AbstractHttpSpanDecorator() {
+ SpanDecorator decorator = new AbstractHttpSpanDecorator() {
@Override
public String getComponent() {
return null;
diff --git
a/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/CometdSpanDecoratorTest.java
b/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/CometdSpanDecoratorTest.java
index bc3e18fd80c..9c38cfbab3e 100644
---
a/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/CometdSpanDecoratorTest.java
+++
b/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/CometdSpanDecoratorTest.java
@@ -28,10 +28,10 @@ public class CometdSpanDecoratorTest {
public void testGetDestination() {
Endpoint endpoint = Mockito.mock(Endpoint.class);
-
Mockito.when(endpoint.getEndpointUri()).thenReturn("cometd://localhost:8080/MyQueue?hello=world");
+
Mockito.when(endpoint.getEndpointUri()).thenReturn("cometd://localhost:8080/service/mychannel");
- CometdSpanDecorator decorator = new CometdSpanDecorator();
+ AbstractMessagingSpanDecorator decorator = new CometdSpanDecorator();
- assertEquals("MyQueue", decorator.getDestination(null, endpoint));
+ assertEquals("service/mychannel", decorator.getDestination(null,
endpoint));
}
}
diff --git
a/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/CqlSpanDecoratorTest.java
b/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/CqlSpanDecoratorTest.java
index 99981913196..8a85fe8f0fa 100644
---
a/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/CqlSpanDecoratorTest.java
+++
b/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/CqlSpanDecoratorTest.java
@@ -64,7 +64,7 @@ public class CqlSpanDecoratorTest {
Mockito.when(endpoint.getEndpointUri()).thenReturn("cql://host1,host2?consistencyLevel=quorum");
Mockito.when(exchange.getIn()).thenReturn(message);
-
Mockito.when(message.getHeader(CqlSpanDecorator.CAMEL_CQL_QUERY)).thenReturn(cql);
+ Mockito.when(message.getHeader(CqlSpanDecorator.CAMEL_CQL_QUERY,
String.class)).thenReturn(cql);
SpanDecorator decorator = new CqlSpanDecorator();
diff --git
a/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/IronmqSpanDecoratorTest.java
b/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/IronmqSpanDecoratorTest.java
index ecc3e2666c6..e1d6315162f 100644
---
a/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/IronmqSpanDecoratorTest.java
+++
b/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/IronmqSpanDecoratorTest.java
@@ -34,7 +34,7 @@ public class IronmqSpanDecoratorTest {
Mockito.when(exchange.getIn()).thenReturn(message);
Mockito.when(message.getHeader(IronmqSpanDecorator.CAMEL_IRON_MQ_MESSAGE_ID,
String.class)).thenReturn(messageId);
- IronmqSpanDecorator decorator = new IronmqSpanDecorator();
+ AbstractMessagingSpanDecorator decorator = new IronmqSpanDecorator();
assertEquals(messageId, decorator.getMessageId(exchange));
}
diff --git
a/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/JmsSpanDecoratorTest.java
b/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/JmsSpanDecoratorTest.java
index 166f0beea39..5d520fff452 100644
---
a/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/JmsSpanDecoratorTest.java
+++
b/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/JmsSpanDecoratorTest.java
@@ -35,7 +35,7 @@ public class JmsSpanDecoratorTest {
Mockito.when(exchange.getIn()).thenReturn(message);
Mockito.when(message.getHeader(JmsSpanDecorator.JMS_MESSAGE_ID,
String.class)).thenReturn(messageId);
- JmsSpanDecorator decorator = new JmsSpanDecorator();
+ AbstractMessagingSpanDecorator decorator = new JmsSpanDecorator();
assertEquals(messageId, decorator.getMessageId(exchange));
}
@@ -50,7 +50,7 @@ public class JmsSpanDecoratorTest {
Mockito.when(exchange.getMessage()).thenReturn(message);
Mockito.when(endpoint.getEndpointUri()).thenReturn("jms:cheese?clientId=123");
- JmsSpanDecorator decorator = new JmsSpanDecorator();
+ AbstractMessagingSpanDecorator decorator = new JmsSpanDecorator();
assertEquals("cheese", decorator.getDestination(exchange, endpoint));
}
@@ -65,7 +65,7 @@ public class JmsSpanDecoratorTest {
Mockito.when(exchange.getMessage().getHeader("CamelJmsDestinationName",
String.class)).thenReturn("gauda");
Mockito.when(endpoint.getEndpointUri()).thenReturn("jms:${header.foo}?clientId=123");
- JmsSpanDecorator decorator = new JmsSpanDecorator();
+ AbstractMessagingSpanDecorator decorator = new JmsSpanDecorator();
assertEquals("gauda", decorator.getDestination(exchange, endpoint));
}
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 99799f8b25e..e3091143dd5 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
@@ -36,7 +36,7 @@ public class KafkaSpanDecoratorTest {
Mockito.when(exchange.getIn()).thenReturn(message);
Mockito.when(message.getHeader(KafkaSpanDecorator.OVERRIDE_TOPIC,
String.class)).thenReturn("test");
- KafkaSpanDecorator decorator = new KafkaSpanDecorator();
+ AbstractMessagingSpanDecorator decorator = new KafkaSpanDecorator();
assertEquals("test", decorator.getDestination(exchange, null));
}
@@ -51,7 +51,7 @@ public class KafkaSpanDecoratorTest {
Mockito.when(endpoint.getEndpointUri())
.thenReturn("kafka:test?brokers=localhost:9092&consumersCount=1");
- KafkaSpanDecorator decorator = new KafkaSpanDecorator();
+ AbstractMessagingSpanDecorator decorator = new KafkaSpanDecorator();
assertEquals("test", decorator.getDestination(exchange, endpoint));
}
diff --git
a/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/StompSpanDecoratorTest.java
b/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/StompSpanDecoratorTest.java
index 3c63879b1b0..e7d06b43c8a 100644
---
a/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/StompSpanDecoratorTest.java
+++
b/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/StompSpanDecoratorTest.java
@@ -30,7 +30,7 @@ public class StompSpanDecoratorTest {
Mockito.when(endpoint.getEndpointUri()).thenReturn("stomp:queue:test");
- StompSpanDecorator decorator = new StompSpanDecorator();
+ AbstractMessagingSpanDecorator decorator = new StompSpanDecorator();
assertEquals("test", decorator.getDestination(null, endpoint));
}
