This is an automated email from the ASF dual-hosted git repository.
bvahdat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new ebcb1c8c199 cleanup camel-tracing codebase a bit (#7566)
ebcb1c8c199 is described below
commit ebcb1c8c199e699df4588747ea4422e1a50be901
Author: Babak Vahdat <bvah...@apache.org>
AuthorDate: Sat May 7 18:17:17 2022 +0200
cleanup camel-tracing codebase a bit (#7566)
---
.../apache/camel/tracing/decorators/CqlSpanDecorator.java | 4 ++--
.../camel/tracing/decorators/IronmqSpanDecorator.java | 2 +-
.../apache/camel/tracing/decorators/JmsSpanDecorator.java | 2 +-
.../apache/camel/tracing/decorators/NsqSpanDecorator.java | 2 +-
.../apache/camel/tracing/decorators/SqlSpanDecorator.java | 6 +++---
.../java/org/apache/camel/tracing/MockSpanAdapter.java | 4 ++--
.../tracing/decorators/AbstractHttpSpanDecoratorTest.java | 15 ++++++++-------
.../camel/tracing/decorators/CometdSpanDecoratorTest.java | 6 +++---
.../camel/tracing/decorators/CqlSpanDecoratorTest.java | 2 +-
.../camel/tracing/decorators/IronmqSpanDecoratorTest.java | 4 ++--
.../camel/tracing/decorators/JmsSpanDecoratorTest.java | 8 ++++----
.../camel/tracing/decorators/KafkaSpanDecoratorTest.java | 4 ++--
.../camel/tracing/decorators/SqlSpanDecoratorTest.java | 2 +-
.../camel/tracing/decorators/StompSpanDecoratorTest.java | 2 +-
14 files changed, 32 insertions(+), 31 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/main/java/org/apache/camel/tracing/decorators/IronmqSpanDecorator.java
b/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/IronmqSpanDecorator.java
index 3b5b2612228..1c4f73e175e 100644
---
a/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/IronmqSpanDecorator.java
+++
b/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/IronmqSpanDecorator.java
@@ -34,7 +34,7 @@ public class IronmqSpanDecorator extends
AbstractMessagingSpanDecorator {
@Override
protected String getMessageId(Exchange exchange) {
- return (String) exchange.getIn().getHeader(CAMEL_IRON_MQ_MESSAGE_ID);
+ return exchange.getIn().getHeader(CAMEL_IRON_MQ_MESSAGE_ID,
String.class);
}
}
diff --git
a/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/JmsSpanDecorator.java
b/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/JmsSpanDecorator.java
index 6d7c8dca32c..ba3d48073cb 100644
---
a/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/JmsSpanDecorator.java
+++
b/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/JmsSpanDecorator.java
@@ -45,7 +45,7 @@ public class JmsSpanDecorator extends
AbstractMessagingSpanDecorator {
@Override
protected String getMessageId(Exchange exchange) {
- return (String) exchange.getIn().getHeader(JMS_MESSAGE_ID);
+ return exchange.getIn().getHeader(JMS_MESSAGE_ID, String.class);
}
}
diff --git
a/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/NsqSpanDecorator.java
b/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/NsqSpanDecorator.java
index 6b1fc5b460f..ba1a68b2f65 100644
---
a/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/NsqSpanDecorator.java
+++
b/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/NsqSpanDecorator.java
@@ -38,7 +38,7 @@ public class NsqSpanDecorator extends
AbstractMessagingSpanDecorator {
@Override
public String getDestination(Exchange exchange, Endpoint endpoint) {
- String topic = (String) exchange.getIn().getHeader(NSQ_TOPIC);
+ String topic = exchange.getIn().getHeader(NSQ_TOPIC, String.class);
if (topic == null) {
Map<String, String> queryParameters =
toQueryParameters(endpoint.getEndpointUri());
topic = queryParameters.get("topic");
diff --git
a/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/SqlSpanDecorator.java
b/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/SqlSpanDecorator.java
index c21be7ee9ae..f25517e0e82 100644
---
a/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/SqlSpanDecorator.java
+++
b/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/SqlSpanDecorator.java
@@ -40,9 +40,9 @@ public class SqlSpanDecorator extends AbstractSpanDecorator {
super.pre(span, exchange, endpoint);
span.setTag(Tag.DB_TYPE, "sql");
- Object sqlquery = exchange.getIn().getHeader(CAMEL_SQL_QUERY);
- if (sqlquery instanceof String) {
- span.setTag(Tag.DB_STATEMENT, (String) sqlquery);
+ String sqlquery = exchange.getIn().getHeader(CAMEL_SQL_QUERY,
String.class);
+ if (sqlquery != null) {
+ span.setTag(Tag.DB_STATEMENT, sqlquery);
}
}
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 3cacc99c65f..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;
@@ -97,7 +97,8 @@ public class AbstractHttpSpanDecoratorTest {
Mockito.when(endpoint.getEndpointUri()).thenReturn("http://localhost:8080/endpoint?query=hello";);
Mockito.when(exchange.getIn()).thenReturn(message);
-
Mockito.when(message.getHeader(Exchange.HTTP_URI)).thenReturn("http://localhost:8080/endpoint?query=hello";);
+ Mockito.when(message.getHeader(Exchange.HTTP_URI, String.class))
+ .thenReturn("http://localhost:8080/endpoint?query=hello";);
assertEquals(AbstractHttpSpanDecorator.GET_METHOD,
AbstractHttpSpanDecorator.getHttpMethod(exchange, endpoint));
@@ -111,7 +112,7 @@ public class AbstractHttpSpanDecoratorTest {
Mockito.when(endpoint.getEndpointUri()).thenReturn(TEST_URI);
Mockito.when(exchange.getIn()).thenReturn(message);
-
Mockito.when(message.getHeader(Exchange.HTTP_URI)).thenReturn(TEST_URI);
+ Mockito.when(message.getHeader(Exchange.HTTP_URI,
String.class)).thenReturn(TEST_URI);
Mockito.when(message.getBody()).thenReturn("Message Body");
assertEquals(AbstractHttpSpanDecorator.POST_METHOD,
@@ -140,7 +141,7 @@ public class AbstractHttpSpanDecoratorTest {
Mockito.when(endpoint.getEndpointUri()).thenReturn(TEST_URI);
Mockito.when(exchange.getIn()).thenReturn(message);
-
Mockito.when(message.getHeader(Exchange.HTTP_URI)).thenReturn(TEST_URI);
+ Mockito.when(message.getHeader(Exchange.HTTP_URI,
String.class)).thenReturn(TEST_URI);
SpanDecorator decorator = new AbstractHttpSpanDecorator() {
@Override
@@ -170,8 +171,8 @@ public class AbstractHttpSpanDecoratorTest {
Mockito.when(endpoint.getEndpointUri()).thenReturn(TEST_URI);
Mockito.when(exchange.getIn()).thenReturn(message);
- Mockito.when(message.getHeader(Exchange.HTTP_URI)).thenReturn("Another
URL");
-
Mockito.when(message.getHeader(Exchange.HTTP_URL)).thenReturn(TEST_URI);
+ Mockito.when(message.getHeader(Exchange.HTTP_URI,
String.class)).thenReturn("Another URL");
+ Mockito.when(message.getHeader(Exchange.HTTP_URL,
String.class)).thenReturn(TEST_URI);
AbstractHttpSpanDecorator decorator = new AbstractHttpSpanDecorator() {
@Override
@@ -196,7 +197,7 @@ public class AbstractHttpSpanDecoratorTest {
Mockito.when(endpoint.getEndpointUri()).thenReturn(TEST_URI);
Mockito.when(exchange.getIn()).thenReturn(message);
-
Mockito.when(message.getHeader(Exchange.HTTP_URI)).thenReturn(TEST_URI);
+ Mockito.when(message.getHeader(Exchange.HTTP_URI,
String.class)).thenReturn(TEST_URI);
AbstractHttpSpanDecorator decorator = new AbstractHttpSpanDecorator() {
@Override
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 72000ac8c4b..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
@@ -32,9 +32,9 @@ public class IronmqSpanDecoratorTest {
Message message = Mockito.mock(Message.class);
Mockito.when(exchange.getIn()).thenReturn(message);
-
Mockito.when(message.getHeader(IronmqSpanDecorator.CAMEL_IRON_MQ_MESSAGE_ID)).thenReturn(messageId);
+
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 32ab30dcf7d..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
@@ -33,9 +33,9 @@ public class JmsSpanDecoratorTest {
Message message = Mockito.mock(Message.class);
Mockito.when(exchange.getIn()).thenReturn(message);
-
Mockito.when(message.getHeader(JmsSpanDecorator.JMS_MESSAGE_ID)).thenReturn(messageId);
+ 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/SqlSpanDecoratorTest.java
b/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/SqlSpanDecoratorTest.java
index 697a8effb9b..6e38917c188 100644
---
a/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/SqlSpanDecoratorTest.java
+++
b/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/SqlSpanDecoratorTest.java
@@ -39,7 +39,7 @@ public class SqlSpanDecoratorTest {
Mockito.when(endpoint.getEndpointUri()).thenReturn("test");
Mockito.when(exchange.getIn()).thenReturn(message);
-
Mockito.when(message.getHeader(SqlSpanDecorator.CAMEL_SQL_QUERY)).thenReturn(SQL_STATEMENT);
+ Mockito.when(message.getHeader(SqlSpanDecorator.CAMEL_SQL_QUERY,
String.class)).thenReturn(SQL_STATEMENT);
SpanDecorator decorator = new SqlSpanDecorator();
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));
}
