You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2024/05/29 18:37:16 UTC
(camel) branch main updated (dc286924610 -> 2d2c632f336)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
from dc286924610 camel-tracing - Add region to tags. Optimize code a bit
new 4d94cc7fd7e camel-tracing - Do not use deprecated code
new 4b747b8367c camel-tracing - Do not use deprecated code
new 2d2c632f336 Polished
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../observation/CamelMicrometerObservationTestSupport.java | 6 ++++--
.../camel/tracing/decorators/AbstractHttpSpanDecorator.java | 8 ++++----
.../tracing/decorators/AbstractMessagingSpanDecorator.java | 7 +------
.../camel/tracing/decorators/AbstractSpanDecorator.java | 8 ++++----
.../apache/camel/tracing/decorators/CqlSpanDecorator.java | 12 ++++++------
.../camel/tracing/decorators/ElasticsearchSpanDecorator.java | 10 ++++------
.../apache/camel/tracing/decorators/JdbcSpanDecorator.java | 6 +++---
.../camel/tracing/decorators/MongoDBSpanDecorator.java | 8 ++++----
.../apache/camel/tracing/decorators/RestSpanDecorator.java | 8 ++------
.../apache/camel/tracing/decorators/SqlSpanDecorator.java | 10 +++++-----
.../tracing/decorators/AbstractHttpSpanDecoratorTest.java | 4 ----
.../decorators/AbstractMessagingSpanDecoratorTest.java | 3 ---
.../camel/tracing/decorators/AbstractSpanDecoratorTest.java | 3 ---
.../camel/tracing/decorators/CqlSpanDecoratorTest.java | 10 +++-------
.../tracing/decorators/ElasticsearchSpanDecoratorTest.java | 3 ---
.../camel/tracing/decorators/JdbcSpanDecoratorTest.java | 3 ---
.../camel/tracing/decorators/MongoDBSpanDecoratorTest.java | 4 ----
.../camel/tracing/decorators/SqlSpanDecoratorTest.java | 3 ---
.../main/java/org/apache/camel/support/ExchangeHelper.java | 1 -
19 files changed, 40 insertions(+), 77 deletions(-)
(camel) 02/03: camel-tracing - Do not use deprecated code
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 4b747b8367cadb317bc4cd3aad5827b2e425e10c
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed May 29 20:31:47 2024 +0200
camel-tracing - Do not use deprecated code
---
.../camel/observation/CamelMicrometerObservationTestSupport.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/components/camel-observation/src/test/java/org/apache/camel/observation/CamelMicrometerObservationTestSupport.java b/components/camel-observation/src/test/java/org/apache/camel/observation/CamelMicrometerObservationTestSupport.java
index 55d28c73f6d..8da596694a5 100644
--- a/components/camel-observation/src/test/java/org/apache/camel/observation/CamelMicrometerObservationTestSupport.java
+++ b/components/camel-observation/src/test/java/org/apache/camel/observation/CamelMicrometerObservationTestSupport.java
@@ -54,7 +54,6 @@ import io.opentelemetry.sdk.trace.data.SpanData;
import io.opentelemetry.sdk.trace.export.SimpleSpanProcessor;
import org.apache.camel.CamelContext;
import org.apache.camel.test.junit5.CamelTestSupport;
-import org.apache.camel.tracing.SpanDecorator;
import org.assertj.core.api.Assertions;
import org.awaitility.Awaitility;
import org.junit.jupiter.api.AfterEach;
@@ -68,6 +67,7 @@ class CamelMicrometerObservationTestSupport extends CamelTestSupport {
static final AttributeKey<String> CAMEL_URI_KEY = AttributeKey.stringKey("camel-uri");
static final AttributeKey<String> COMPONENT_KEY = AttributeKey.stringKey("component");
+ static final AttributeKey<String> CAMEL_SCHEME_KEY = AttributeKey.stringKey("url.scheme");
static final AttributeKey<String> PRE_KEY = AttributeKey.stringKey("pre");
static final AttributeKey<String> POST_KEY = AttributeKey.stringKey("post");
@@ -221,8 +221,10 @@ class CamelMicrometerObservationTestSupport extends CamelTestSupport {
String component = span.getAttributes().get(COMPONENT_KEY);
assertNotNull(component);
+ String scheme = span.getAttributes().get(CAMEL_SCHEME_KEY);
+
if (td.getUri() != null) {
- assertEquals(SpanDecorator.CAMEL_COMPONENT + URI.create(td.getUri()).getScheme(), component, td.getLabel());
+ assertEquals(URI.create(td.getUri()).getScheme(), scheme);
}
if ("camel-seda".equals(component)) {
(camel) 01/03: camel-tracing - Do not use deprecated code
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 4d94cc7fd7e1b39b7326c5631036f68914abcaa4
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed May 29 19:34:12 2024 +0200
camel-tracing - Do not use deprecated code
---
.../camel/tracing/decorators/AbstractHttpSpanDecorator.java | 8 ++++----
.../tracing/decorators/AbstractMessagingSpanDecorator.java | 7 +------
.../camel/tracing/decorators/AbstractSpanDecorator.java | 8 ++++----
.../apache/camel/tracing/decorators/CqlSpanDecorator.java | 12 ++++++------
.../camel/tracing/decorators/ElasticsearchSpanDecorator.java | 10 ++++------
.../apache/camel/tracing/decorators/JdbcSpanDecorator.java | 6 +++---
.../camel/tracing/decorators/MongoDBSpanDecorator.java | 8 ++++----
.../apache/camel/tracing/decorators/RestSpanDecorator.java | 8 ++------
.../apache/camel/tracing/decorators/SqlSpanDecorator.java | 10 +++++-----
.../tracing/decorators/AbstractHttpSpanDecoratorTest.java | 4 ----
.../decorators/AbstractMessagingSpanDecoratorTest.java | 3 ---
.../camel/tracing/decorators/AbstractSpanDecoratorTest.java | 3 ---
.../camel/tracing/decorators/CqlSpanDecoratorTest.java | 10 +++-------
.../tracing/decorators/ElasticsearchSpanDecoratorTest.java | 3 ---
.../camel/tracing/decorators/JdbcSpanDecoratorTest.java | 3 ---
.../camel/tracing/decorators/MongoDBSpanDecoratorTest.java | 4 ----
.../camel/tracing/decorators/SqlSpanDecoratorTest.java | 3 ---
17 files changed, 36 insertions(+), 74 deletions(-)
diff --git a/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/AbstractHttpSpanDecorator.java b/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/AbstractHttpSpanDecorator.java
index 2b7081d7d36..9de3987a4b8 100644
--- a/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/AbstractHttpSpanDecorator.java
+++ b/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/AbstractHttpSpanDecorator.java
@@ -20,7 +20,7 @@ import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.tracing.SpanAdapter;
-import org.apache.camel.tracing.Tag;
+import org.apache.camel.tracing.TagConstants;
public abstract class AbstractHttpSpanDecorator extends AbstractSpanDecorator {
@@ -69,9 +69,9 @@ public abstract class AbstractHttpSpanDecorator extends AbstractSpanDecorator {
String httpUrl = getHttpURL(exchange, endpoint);
if (httpUrl != null) {
- span.setTag(Tag.HTTP_URL, httpUrl);
+ span.setTag(TagConstants.HTTP_URL, httpUrl);
}
- span.setLowCardinalityTag(Tag.HTTP_METHOD, getHttpMethod(exchange, endpoint));
+ span.setTag(TagConstants.HTTP_METHOD, getHttpMethod(exchange, endpoint));
}
protected String getHttpURL(Exchange exchange, Endpoint endpoint) {
@@ -101,7 +101,7 @@ public abstract class AbstractHttpSpanDecorator extends AbstractSpanDecorator {
if (message != null) {
Integer responseCode = message.getHeader(Exchange.HTTP_RESPONSE_CODE, Integer.class);
if (responseCode != null) {
- span.setLowCardinalityTag(Tag.HTTP_STATUS, responseCode);
+ span.setTag(TagConstants.HTTP_STATUS, responseCode);
}
}
}
diff --git a/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/AbstractMessagingSpanDecorator.java b/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/AbstractMessagingSpanDecorator.java
index 93c6f46f392..9477ccc5e79 100644
--- a/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/AbstractMessagingSpanDecorator.java
+++ b/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/AbstractMessagingSpanDecorator.java
@@ -24,16 +24,12 @@ import org.apache.camel.tracing.ExtractAdapter;
import org.apache.camel.tracing.InjectAdapter;
import org.apache.camel.tracing.SpanAdapter;
import org.apache.camel.tracing.SpanKind;
-import org.apache.camel.tracing.Tag;
import org.apache.camel.tracing.TagConstants;
import org.apache.camel.tracing.propagation.CamelMessagingHeadersExtractAdapter;
import org.apache.camel.tracing.propagation.CamelMessagingHeadersInjectAdapter;
public abstract class AbstractMessagingSpanDecorator extends AbstractSpanDecorator {
- @Deprecated
- public static final String MESSAGE_BUS_ID = "message_bus.id";
-
@Override
public String getOperationName(Exchange exchange, Endpoint endpoint) {
// Use the destination name
@@ -43,11 +39,10 @@ public abstract class AbstractMessagingSpanDecorator extends AbstractSpanDecorat
@Override
public void pre(SpanAdapter span, Exchange exchange, Endpoint endpoint) {
super.pre(span, exchange, endpoint);
- span.setTag(Tag.MESSAGE_BUS_DESTINATION, getDestination(exchange, endpoint));
+ span.setTag(TagConstants.MESSAGE_BUS_DESTINATION, getDestination(exchange, endpoint));
String messageId = getMessageId(exchange);
if (messageId != null) {
- span.setTag(MESSAGE_BUS_ID, messageId);
span.setTag(TagConstants.MESSAGE_ID, messageId);
}
}
diff --git a/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/AbstractSpanDecorator.java b/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/AbstractSpanDecorator.java
index bb3a84c1e2f..08e301f4321 100644
--- a/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/AbstractSpanDecorator.java
+++ b/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/AbstractSpanDecorator.java
@@ -123,17 +123,17 @@ public abstract class AbstractSpanDecorator implements SpanDecorator {
if (ap != null) {
span.setTag(TagConstants.SERVER_PROTOCOL, ap);
}
- Map map = ela.getServiceMetadata();
+ Map<String, String> map = ela.getServiceMetadata();
if (map != null) {
- String un = (String) map.get("username");
+ String un = map.get("username");
if (un != null) {
span.setTag(TagConstants.USER_NAME, un);
}
- String id = (String) map.get("clientId");
+ String id = map.get("clientId");
if (id != null) {
span.setTag(TagConstants.USER_ID, id);
}
- String region = (String) map.get("region");
+ String region = map.get("region");
if (region != null) {
span.setTag(TagConstants.SERVER_REGION, region);
}
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 61db6f68211..18e27aa8a69 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
@@ -22,7 +22,7 @@ import java.util.Map;
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.tracing.SpanAdapter;
-import org.apache.camel.tracing.Tag;
+import org.apache.camel.tracing.TagConstants;
public class CqlSpanDecorator extends AbstractSpanDecorator {
@@ -43,20 +43,20 @@ public class CqlSpanDecorator extends AbstractSpanDecorator {
@Override
public void pre(SpanAdapter span, Exchange exchange, Endpoint endpoint) {
super.pre(span, exchange, endpoint);
- span.setLowCardinalityTag(Tag.DB_TYPE, CASSANDRA_DB_TYPE);
+ span.setTag(TagConstants.DB_SYSTEM, CASSANDRA_DB_TYPE);
URI uri = URI.create(endpoint.getEndpointUri());
- if (uri.getPath() != null && uri.getPath().length() > 0) {
+ if (uri.getPath() != null && !uri.getPath().isEmpty()) {
// Strip leading '/' from path
- span.setTag(Tag.DB_INSTANCE, uri.getPath().substring(1));
+ span.setTag(TagConstants.DB_NAME, uri.getPath().substring(1));
}
String cql = exchange.getIn().getHeader(CAMEL_CQL_QUERY, String.class);
if (cql != null) {
- span.setTag(Tag.DB_STATEMENT, cql);
+ span.setTag(TagConstants.DB_STATEMENT, cql);
} else {
Map<String, String> queryParameters = toQueryParameters(endpoint.getEndpointUri());
if (queryParameters.containsKey("cql")) {
- span.setTag(Tag.DB_STATEMENT, queryParameters.get("cql"));
+ span.setTag(TagConstants.DB_STATEMENT, queryParameters.get("cql"));
}
}
}
diff --git a/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/ElasticsearchSpanDecorator.java b/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/ElasticsearchSpanDecorator.java
index 36f68bd7d32..b0f73325919 100644
--- a/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/ElasticsearchSpanDecorator.java
+++ b/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/ElasticsearchSpanDecorator.java
@@ -21,7 +21,7 @@ import java.util.Map;
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.tracing.SpanAdapter;
-import org.apache.camel.tracing.Tag;
+import org.apache.camel.tracing.TagConstants;
public class ElasticsearchSpanDecorator extends AbstractSpanDecorator {
@@ -51,17 +51,15 @@ public class ElasticsearchSpanDecorator extends AbstractSpanDecorator {
@Override
public void pre(SpanAdapter span, Exchange exchange, Endpoint endpoint) {
super.pre(span, exchange, endpoint);
- span.setLowCardinalityTag(Tag.DB_TYPE, ELASTICSEARCH_DB_TYPE);
+ span.setTag(TagConstants.DB_SYSTEM, ELASTICSEARCH_DB_TYPE);
Map<String, String> queryParameters = toQueryParameters(endpoint.getEndpointUri());
if (queryParameters.containsKey("indexName")) {
- span.setTag(Tag.DB_INSTANCE, queryParameters.get("indexName"));
+ span.setTag(TagConstants.DB_NAME, queryParameters.get("indexName"));
}
String cluster = stripSchemeAndOptions(endpoint);
- if (cluster != null) {
- span.setTag(ELASTICSEARCH_CLUSTER_TAG, cluster);
- }
+ span.setTag(ELASTICSEARCH_CLUSTER_TAG, cluster);
}
}
diff --git a/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/JdbcSpanDecorator.java b/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/JdbcSpanDecorator.java
index 0d079aef364..0c90fc0089e 100644
--- a/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/JdbcSpanDecorator.java
+++ b/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/JdbcSpanDecorator.java
@@ -19,7 +19,7 @@ package org.apache.camel.tracing.decorators;
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.tracing.SpanAdapter;
-import org.apache.camel.tracing.Tag;
+import org.apache.camel.tracing.TagConstants;
public class JdbcSpanDecorator extends AbstractSpanDecorator {
@@ -37,11 +37,11 @@ public class JdbcSpanDecorator extends AbstractSpanDecorator {
public void pre(SpanAdapter span, Exchange exchange, Endpoint endpoint) {
super.pre(span, exchange, endpoint);
- span.setLowCardinalityTag(Tag.DB_TYPE, "sql");
+ span.setTag(TagConstants.DB_SYSTEM, "sql");
Object body = exchange.getIn().getBody();
if (body instanceof String) {
- span.setTag(Tag.DB_STATEMENT, (String) body);
+ span.setTag(TagConstants.DB_STATEMENT, (String) body);
}
}
diff --git a/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/MongoDBSpanDecorator.java b/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/MongoDBSpanDecorator.java
index 3ec32145bb2..5e3b5fa5e52 100644
--- a/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/MongoDBSpanDecorator.java
+++ b/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/MongoDBSpanDecorator.java
@@ -21,7 +21,7 @@ import java.util.Map;
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.tracing.SpanAdapter;
-import org.apache.camel.tracing.Tag;
+import org.apache.camel.tracing.TagConstants;
public class MongoDBSpanDecorator extends AbstractSpanDecorator {
@@ -49,13 +49,13 @@ public class MongoDBSpanDecorator extends AbstractSpanDecorator {
public void pre(SpanAdapter span, Exchange exchange, Endpoint endpoint) {
super.pre(span, exchange, endpoint);
- span.setLowCardinalityTag(Tag.DB_TYPE, getComponent());
+ span.setTag(TagConstants.DB_SYSTEM, getComponent());
Map<String, String> queryParameters = toQueryParameters(endpoint.getEndpointUri());
String database = queryParameters.get("database");
if (database != null) {
- span.setTag(Tag.DB_INSTANCE, database);
+ span.setTag(TagConstants.DB_NAME, database);
}
- span.setTag(Tag.DB_STATEMENT, queryParameters.toString());
+ span.setTag(TagConstants.DB_STATEMENT, queryParameters.toString());
}
}
diff --git a/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/RestSpanDecorator.java b/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/RestSpanDecorator.java
index a8a927ddfef..77624a9374d 100644
--- a/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/RestSpanDecorator.java
+++ b/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/RestSpanDecorator.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.tracing.decorators;
-import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -79,11 +79,7 @@ public class RestSpanDecorator extends AbstractHttpSpanDecorator {
path = path.substring(0, index);
}
path = path.replace(":", "");
- try {
- path = URLDecoder.decode(path, "UTF-8");
- } catch (UnsupportedEncodingException e) {
- LOG.debug("Failed to decode URL path '{}', ignoring exception", path, e);
- }
+ path = URLDecoder.decode(path, StandardCharsets.UTF_8);
}
}
return path;
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 99409aeb397..9935c959e8c 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
@@ -19,7 +19,7 @@ package org.apache.camel.tracing.decorators;
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.tracing.SpanAdapter;
-import org.apache.camel.tracing.Tag;
+import org.apache.camel.tracing.TagConstants;
public class SqlSpanDecorator extends AbstractSpanDecorator {
@@ -38,11 +38,11 @@ public class SqlSpanDecorator extends AbstractSpanDecorator {
@Override
public void pre(SpanAdapter span, Exchange exchange, Endpoint endpoint) {
super.pre(span, exchange, endpoint);
- span.setLowCardinalityTag(Tag.DB_TYPE, "sql");
+ span.setTag(TagConstants.DB_SYSTEM, "sql");
- String sqlquery = exchange.getIn().getHeader(CAMEL_SQL_QUERY, String.class);
- if (sqlquery != null) {
- span.setTag(Tag.DB_STATEMENT, sqlquery);
+ String query = exchange.getIn().getHeader(CAMEL_SQL_QUERY, String.class);
+ if (query != null) {
+ span.setTag(TagConstants.DB_STATEMENT, query);
}
}
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 3da98531b9b..fc04663312f 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
@@ -21,7 +21,6 @@ import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.tracing.MockSpanAdapter;
import org.apache.camel.tracing.SpanDecorator;
-import org.apache.camel.tracing.Tag;
import org.apache.camel.tracing.TagConstants;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
@@ -160,9 +159,7 @@ public class AbstractHttpSpanDecoratorTest {
decorator.pre(span, exchange, endpoint);
- assertEquals(TEST_URI, span.tags().get(Tag.HTTP_URL.name()));
assertEquals(TEST_URI, span.tags().get(TagConstants.HTTP_URL));
- assertTrue(span.tags().containsKey(Tag.HTTP_METHOD.name()));
assertTrue(span.tags().containsKey(TagConstants.HTTP_METHOD));
}
@@ -289,7 +286,6 @@ public class AbstractHttpSpanDecoratorTest {
decorator.post(span, exchange, null);
- assertEquals(200, span.tags().get(Tag.HTTP_STATUS.name()));
assertEquals(200, span.tags().get(TagConstants.HTTP_STATUS));
}
diff --git a/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/AbstractMessagingSpanDecoratorTest.java b/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/AbstractMessagingSpanDecoratorTest.java
index 54c1f401e4f..b5a3a9374ed 100644
--- a/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/AbstractMessagingSpanDecoratorTest.java
+++ b/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/AbstractMessagingSpanDecoratorTest.java
@@ -20,7 +20,6 @@ import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.tracing.MockSpanAdapter;
import org.apache.camel.tracing.SpanDecorator;
-import org.apache.camel.tracing.Tag;
import org.apache.camel.tracing.TagConstants;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
@@ -72,7 +71,6 @@ public class AbstractMessagingSpanDecoratorTest {
decorator.pre(span, null, endpoint);
- assertEquals("MyQueue", span.tags().get(Tag.MESSAGE_BUS_DESTINATION.name()));
assertEquals("MyQueue", span.tags().get(TagConstants.MESSAGE_BUS_DESTINATION));
}
@@ -105,7 +103,6 @@ public class AbstractMessagingSpanDecoratorTest {
decorator.pre(span, exchange, endpoint);
- assertEquals(messageId, span.tags().get(AbstractMessagingSpanDecorator.MESSAGE_BUS_ID));
assertEquals(messageId, span.tags().get(TagConstants.MESSAGE_ID));
}
diff --git a/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/AbstractSpanDecoratorTest.java b/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/AbstractSpanDecoratorTest.java
index f767d55e5e2..d017a210cb6 100644
--- a/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/AbstractSpanDecoratorTest.java
+++ b/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/AbstractSpanDecoratorTest.java
@@ -20,7 +20,6 @@ import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.tracing.MockSpanAdapter;
import org.apache.camel.tracing.SpanDecorator;
-import org.apache.camel.tracing.Tag;
import org.apache.camel.tracing.TagConstants;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
@@ -77,7 +76,6 @@ public class AbstractSpanDecoratorTest {
decorator.pre(span, null, endpoint);
- assertEquals("camel-test", span.tags().get(Tag.COMPONENT.name()));
assertEquals("camel-test", span.tags().get(TagConstants.COMPONENT));
assertEquals("test", span.tags().get(TagConstants.URL_SCHEME));
assertEquals("uri", span.tags().get(TagConstants.URL_PATH));
@@ -109,7 +107,6 @@ public class AbstractSpanDecoratorTest {
decorator.post(span, exchange, null);
- assertEquals(true, span.tags().get(Tag.ERROR.name()));
assertEquals(true, span.tags().get(TagConstants.ERROR));
assertEquals(1, span.logEntries().size());
assertEquals("error", span.logEntries().get(0).fields().get("event"));
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 a8513853be8..0dcf9ad3c83 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
@@ -21,7 +21,6 @@ import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.tracing.MockSpanAdapter;
import org.apache.camel.tracing.SpanDecorator;
-import org.apache.camel.tracing.Tag;
import org.apache.camel.tracing.TagConstants;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
@@ -50,11 +49,8 @@ public class CqlSpanDecoratorTest {
decorator.pre(span, exchange, endpoint);
- assertEquals(CqlSpanDecorator.CASSANDRA_DB_TYPE, span.tags().get(Tag.DB_TYPE.name()));
assertEquals(CqlSpanDecorator.CASSANDRA_DB_TYPE, span.tags().get(TagConstants.DB_SYSTEM));
- assertEquals(cql, span.tags().get(Tag.DB_STATEMENT.name()));
assertEquals(cql, span.tags().get(TagConstants.DB_STATEMENT));
- assertEquals(keyspace, span.tags().get(Tag.DB_INSTANCE.name()));
assertEquals(keyspace, span.tags().get(TagConstants.DB_NAME));
}
@@ -76,9 +72,9 @@ public class CqlSpanDecoratorTest {
decorator.pre(span, exchange, endpoint);
- assertEquals(CqlSpanDecorator.CASSANDRA_DB_TYPE, span.tags().get(Tag.DB_TYPE.name()));
- assertEquals(cql, span.tags().get(Tag.DB_STATEMENT.name()));
- assertNull(span.tags().get(Tag.DB_INSTANCE.name()));
+ assertEquals(CqlSpanDecorator.CASSANDRA_DB_TYPE, span.tags().get(TagConstants.DB_SYSTEM));
+ assertEquals(cql, span.tags().get(TagConstants.DB_STATEMENT));
+ assertNull(span.tags().get(TagConstants.DB_NAME));
}
}
diff --git a/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/ElasticsearchSpanDecoratorTest.java b/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/ElasticsearchSpanDecoratorTest.java
index dae3c6c7b00..acd81b46bbb 100644
--- a/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/ElasticsearchSpanDecoratorTest.java
+++ b/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/ElasticsearchSpanDecoratorTest.java
@@ -21,7 +21,6 @@ import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.tracing.MockSpanAdapter;
import org.apache.camel.tracing.SpanDecorator;
-import org.apache.camel.tracing.Tag;
import org.apache.camel.tracing.TagConstants;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
@@ -63,9 +62,7 @@ public class ElasticsearchSpanDecoratorTest {
decorator.pre(span, exchange, endpoint);
- assertEquals(ElasticsearchSpanDecorator.ELASTICSEARCH_DB_TYPE, span.tags().get(Tag.DB_TYPE.name()));
assertEquals(ElasticsearchSpanDecorator.ELASTICSEARCH_DB_TYPE, span.tags().get(TagConstants.DB_SYSTEM));
- assertEquals(indexName, span.tags().get(Tag.DB_INSTANCE.name()));
assertEquals(indexName, span.tags().get(TagConstants.DB_NAME));
assertEquals(cluster, span.tags().get(ElasticsearchSpanDecorator.ELASTICSEARCH_CLUSTER_TAG));
assertNull(span.tags().get(TagConstants.SERVER_ADDRESS));
diff --git a/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/JdbcSpanDecoratorTest.java b/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/JdbcSpanDecoratorTest.java
index 0d5e7d0f15a..ac24d49ac98 100644
--- a/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/JdbcSpanDecoratorTest.java
+++ b/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/JdbcSpanDecoratorTest.java
@@ -21,7 +21,6 @@ import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.tracing.MockSpanAdapter;
import org.apache.camel.tracing.SpanDecorator;
-import org.apache.camel.tracing.Tag;
import org.apache.camel.tracing.TagConstants;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
@@ -48,9 +47,7 @@ public class JdbcSpanDecoratorTest {
decorator.pre(span, exchange, endpoint);
- assertEquals("sql", span.tags().get(Tag.DB_TYPE.name()));
assertEquals("sql", span.tags().get(TagConstants.DB_SYSTEM));
- assertEquals(SQL_STATEMENT, span.tags().get(Tag.DB_STATEMENT.name()));
assertEquals(SQL_STATEMENT, span.tags().get(TagConstants.DB_STATEMENT));
}
diff --git a/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/MongoDBSpanDecoratorTest.java b/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/MongoDBSpanDecoratorTest.java
index d53f0013fe2..a6982d6e335 100644
--- a/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/MongoDBSpanDecoratorTest.java
+++ b/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/MongoDBSpanDecoratorTest.java
@@ -21,7 +21,6 @@ import java.util.Map;
import org.apache.camel.Endpoint;
import org.apache.camel.tracing.MockSpanAdapter;
import org.apache.camel.tracing.SpanDecorator;
-import org.apache.camel.tracing.Tag;
import org.apache.camel.tracing.TagConstants;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
@@ -65,11 +64,8 @@ public class MongoDBSpanDecoratorTest {
decorator.pre(span, null, endpoint);
- assertEquals("mongodb", span.tags().get(Tag.DB_TYPE.name()));
assertEquals("mongodb", span.tags().get(TagConstants.DB_SYSTEM));
- assertEquals("flights", span.tags().get(Tag.DB_INSTANCE.name()));
assertEquals("flights", span.tags().get(TagConstants.DB_NAME));
- assertTrue(span.tags().containsKey(Tag.DB_STATEMENT.name()));
assertTrue(span.tags().containsKey(TagConstants.DB_STATEMENT));
}
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 acbf0c98584..b9f0bf5252c 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
@@ -21,7 +21,6 @@ import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.tracing.MockSpanAdapter;
import org.apache.camel.tracing.SpanDecorator;
-import org.apache.camel.tracing.Tag;
import org.apache.camel.tracing.TagConstants;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
@@ -48,9 +47,7 @@ public class SqlSpanDecoratorTest {
decorator.pre(span, exchange, endpoint);
- assertEquals("sql", span.tags().get(Tag.DB_TYPE.name()));
assertEquals("sql", span.tags().get(TagConstants.DB_SYSTEM));
- assertEquals(SQL_STATEMENT, span.tags().get(Tag.DB_STATEMENT.name()));
assertEquals(SQL_STATEMENT, span.tags().get(TagConstants.DB_STATEMENT));
}
(camel) 03/03: Polished
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 2d2c632f336fb75058c25ecb5cf11b11a0559a61
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed May 29 20:37:03 2024 +0200
Polished
---
.../src/main/java/org/apache/camel/support/ExchangeHelper.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/ExchangeHelper.java b/core/camel-support/src/main/java/org/apache/camel/support/ExchangeHelper.java
index 88674c95fa6..e201a16448f 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/ExchangeHelper.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/ExchangeHelper.java
@@ -1181,7 +1181,6 @@ public final class ExchangeHelper {
final String id = getRepositoryId(name);
if (id != null) {
repo = getVariableRepository(exchange, id);
-
name = resolveRepositoryName(exchange, name, id);
}
final VariableAware va = getVariableAware(exchange, repo);