You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bv...@apache.org on 2022/05/06 05:41:49 UTC
[camel] branch main updated (df51ef8815b -> a7c6d85f447)
This is an automated email from the ASF dual-hosted git repository.
bvahdat pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
from df51ef8815b CAMEL-18060: camel-jbang - Add option to turn off logging colors
new 95267b3b3c3 CAMEL-18055: Create tracing SpanDecorator for ServiceBusComponent
new d07116b16f6 fix checkstyle
new 460c428a7bb rename to AzureServiceBusSpanDecorator
new 8f2d7ccd736 rename to AzureServiceBusSpanDecorator
new a7c6d85f447 fix formatting
The 5 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:
.../org.apache.camel.tracing.SpanDecorator | 1 +
.../decorators/AzureServiceBusSpanDecorator.java | 124 +++++++++++++++++++++
.../AzureServiceBusSpanDecoratorTest.java | 99 ++++++++++++++++
3 files changed, 224 insertions(+)
create mode 100644 components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/AzureServiceBusSpanDecorator.java
create mode 100644 components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/AzureServiceBusSpanDecoratorTest.java
[camel] 04/05: rename to AzureServiceBusSpanDecorator
Posted by bv...@apache.org.
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
commit 8f2d7ccd736bfb3aadb44f39c075b1e7e9ad1bcf
Author: Babak Vahdat <bv...@apache.org>
AuthorDate: Thu May 5 22:11:34 2022 +0200
rename to AzureServiceBusSpanDecorator
---
.../apache/camel/tracing/decorators/AzureServiceBusSpanDecorator.java | 2 +-
.../camel/tracing/decorators/AzureServiceBusSpanDecoratorTest.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/AzureServiceBusSpanDecorator.java b/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/AzureServiceBusSpanDecorator.java
index 66c66d6a2da..504dbe6fc9e 100644
--- a/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/AzureServiceBusSpanDecorator.java
+++ b/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/AzureServiceBusSpanDecorator.java
@@ -23,7 +23,7 @@ import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.tracing.SpanAdapter;
-public class ServiceBusSpanDecorator extends AbstractMessagingSpanDecorator {
+public class AzureServiceBusSpanDecorator extends AbstractMessagingSpanDecorator {
static final String SERVICEBUS_CONTENT_TYPE = "contentType";
static final String SERVICEBUS_CORRELATION_ID = "correlationId";
diff --git a/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/AzureServiceBusSpanDecoratorTest.java b/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/AzureServiceBusSpanDecoratorTest.java
index 0c4d13ec340..84898700b51 100644
--- a/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/AzureServiceBusSpanDecoratorTest.java
+++ b/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/AzureServiceBusSpanDecoratorTest.java
@@ -28,7 +28,7 @@ import org.mockito.Mockito;
import static org.junit.jupiter.api.Assertions.assertEquals;
-public class ServiceBusSpanDecoratorTest {
+public class AzureServiceBusSpanDecoratorTest {
@Test
public void testGetMessageId() {
[camel] 02/05: fix checkstyle
Posted by bv...@apache.org.
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
commit d07116b16f63509db9a3a2746c27773bdf580815
Author: Babak Vahdat <bv...@apache.org>
AuthorDate: Thu May 5 21:37:20 2022 +0200
fix checkstyle
---
.../tracing/decorators/ServiceBusSpanDecorator.java | 16 ++++++++++++++++
.../tracing/decorators/ServiceBusSpanDecoratorTest.java | 16 ++++++++++++++++
2 files changed, 32 insertions(+)
diff --git a/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/ServiceBusSpanDecorator.java b/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/ServiceBusSpanDecorator.java
index 5a38f4489a0..66c66d6a2da 100644
--- a/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/ServiceBusSpanDecorator.java
+++ b/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/ServiceBusSpanDecorator.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.camel.tracing.decorators;
import java.time.Duration;
diff --git a/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/ServiceBusSpanDecoratorTest.java b/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/ServiceBusSpanDecoratorTest.java
index 3006673d7ca..a44fa7a3629 100644
--- a/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/ServiceBusSpanDecoratorTest.java
+++ b/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/ServiceBusSpanDecoratorTest.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.camel.tracing.decorators;
import java.time.Duration;
[camel] 01/05: CAMEL-18055: Create tracing SpanDecorator for ServiceBusComponent
Posted by bv...@apache.org.
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
commit 95267b3b3c3061fd0a003670681d3f275dd3962b
Author: Babak Vahdat <bv...@apache.org>
AuthorDate: Thu May 5 21:11:17 2022 +0200
CAMEL-18055: Create tracing SpanDecorator for ServiceBusComponent
---
.../org.apache.camel.tracing.SpanDecorator | 1 +
.../decorators/ServiceBusSpanDecorator.java | 108 +++++++++++++++++++++
.../decorators/ServiceBusSpanDecoratorTest.java | 81 ++++++++++++++++
3 files changed, 190 insertions(+)
diff --git a/components/camel-opentelemetry/src/main/resources/META-INF/services/org.apache.camel.tracing.SpanDecorator b/components/camel-opentelemetry/src/main/resources/META-INF/services/org.apache.camel.tracing.SpanDecorator
index 39b88a064e5..e575ef9978a 100644
--- a/components/camel-opentelemetry/src/main/resources/META-INF/services/org.apache.camel.tracing.SpanDecorator
+++ b/components/camel-opentelemetry/src/main/resources/META-INF/services/org.apache.camel.tracing.SpanDecorator
@@ -42,6 +42,7 @@ org.apache.camel.tracing.decorators.PlatformHttpSpanDecorator
org.apache.camel.tracing.decorators.RabbitmqSpanDecorator
org.apache.camel.tracing.decorators.RestSpanDecorator
org.apache.camel.tracing.decorators.SedaSpanDecorator
+org.apache.camel.tracing.decorators.ServiceBusSpanDecorator
org.apache.camel.tracing.decorators.ServletSpanDecorator
org.apache.camel.tracing.decorators.SjmsSpanDecorator
org.apache.camel.tracing.decorators.Sjms2SpanDecorator
diff --git a/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/ServiceBusSpanDecorator.java b/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/ServiceBusSpanDecorator.java
new file mode 100644
index 00000000000..5a38f4489a0
--- /dev/null
+++ b/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/ServiceBusSpanDecorator.java
@@ -0,0 +1,108 @@
+package org.apache.camel.tracing.decorators;
+
+import java.time.Duration;
+import java.time.OffsetDateTime;
+
+import org.apache.camel.Endpoint;
+import org.apache.camel.Exchange;
+import org.apache.camel.tracing.SpanAdapter;
+
+public class ServiceBusSpanDecorator extends AbstractMessagingSpanDecorator {
+
+ static final String SERVICEBUS_CONTENT_TYPE = "contentType";
+ static final String SERVICEBUS_CORRELATION_ID = "correlationId";
+ static final String SERVICEBUS_DELIVERY_COUNT = "deliveryCount";
+ static final String SERVICEBUS_ENQUEUED_SEQUENCE_NUMBER = "enqueuedSequenceNumber";
+ static final String SERVICEBUS_ENQUEUED_TIME = "enqueuedTime";
+ static final String SERVICEBUS_EXPIRES_AT = "expiresAt";
+ static final String SERVICEBUS_PARTITION_KEY = "partitionKey";
+ static final String SERVICEBUS_REPLY_TO_SESSION_ID = "replyToSessionId";
+ static final String SERVICEBUS_SESSION_ID = "sessionId";
+ static final String SERVICEBUS_TIME_TO_LIVE = "ttl";
+
+ /**
+ * Constants copied from {@link org.apache.camel.component.azure.servicebus.ServiceBusConstants}
+ */
+ static final String CONTENT_TYPE = "CamelAzureServiceBusContentType";
+ static final String CORRELATION_ID = "CamelAzureServiceBusCorrelationId";
+ static final String DELIVERY_COUNT = "CamelAzureServiceBusDeliveryCount";
+ static final String ENQUEUED_SEQUENCE_NUMBER = "CamelAzureServiceBusEnqueuedSequenceNumber";
+ static final String ENQUEUED_TIME = "CamelAzureServiceBusEnqueuedTime";
+ static final String EXPIRES_AT = "CamelAzureServiceBusExpiresAt";
+ static final String MESSAGE_ID = "CamelAzureServiceBusMessageId";
+ static final String SESSION_ID = "CamelAzureServiceBusSessionId";
+ static final String REPLY_TO_SESSION_ID = "CamelAzureServiceBusReplyToSessionId";
+ static final String PARTITION_KEY = "CamelAzureServiceBusPartitionKey";
+ static final String TIME_TO_LIVE = "CamelAzureServiceBusTimeToLive";
+
+ @Override
+ public String getComponent() {
+ return "azure-servicebus";
+ }
+
+ @Override
+ public String getComponentClassName() {
+ return "org.apache.camel.component.azure.servicebus.ServiceBusComponent";
+ }
+
+ @Override
+ public void pre(SpanAdapter span, Exchange exchange, Endpoint endpoint) {
+ super.pre(span, exchange, endpoint);
+
+ String contentType = exchange.getIn().getHeader(CONTENT_TYPE, String.class);
+ if (contentType != null) {
+ span.setTag(SERVICEBUS_CONTENT_TYPE, contentType);
+ }
+
+ String correlationId = exchange.getIn().getHeader(CORRELATION_ID, String.class);
+ if (correlationId != null) {
+ span.setTag(SERVICEBUS_CORRELATION_ID, correlationId);
+ }
+
+ Long deliveryCount = exchange.getIn().getHeader(DELIVERY_COUNT, Long.class);
+ if (deliveryCount != null) {
+ span.setTag(SERVICEBUS_DELIVERY_COUNT, deliveryCount);
+ }
+
+ OffsetDateTime enqueuedSequenceNumber = exchange.getIn().getHeader(ENQUEUED_SEQUENCE_NUMBER, OffsetDateTime.class);
+ if (enqueuedSequenceNumber != null) {
+ span.setTag(SERVICEBUS_ENQUEUED_SEQUENCE_NUMBER, enqueuedSequenceNumber.toString());
+ }
+
+ OffsetDateTime enqueuedTime = exchange.getIn().getHeader(ENQUEUED_TIME, OffsetDateTime.class);
+ if (enqueuedTime != null) {
+ span.setTag(SERVICEBUS_ENQUEUED_TIME, enqueuedTime.toString());
+ }
+
+ OffsetDateTime expiresAt = exchange.getIn().getHeader(EXPIRES_AT, OffsetDateTime.class);
+ if (expiresAt != null) {
+ span.setTag(SERVICEBUS_EXPIRES_AT, expiresAt.toString());
+ }
+
+ String partitionKey = exchange.getIn().getHeader(PARTITION_KEY, String.class);
+ if (partitionKey != null) {
+ span.setTag(SERVICEBUS_PARTITION_KEY, partitionKey);
+ }
+
+ String replyToSessionId = exchange.getIn().getHeader(REPLY_TO_SESSION_ID, String.class);
+ if (replyToSessionId != null) {
+ span.setTag(SERVICEBUS_REPLY_TO_SESSION_ID, replyToSessionId);
+ }
+
+ String sessionId = exchange.getIn().getHeader(SESSION_ID, String.class);
+ if (sessionId != null) {
+ span.setTag(SERVICEBUS_SESSION_ID, sessionId);
+ }
+
+ Duration timeToLive = exchange.getIn().getHeader(TIME_TO_LIVE, Duration.class);
+ if (timeToLive != null) {
+ span.setTag(SERVICEBUS_TIME_TO_LIVE, timeToLive.toString());
+ }
+ }
+
+ @Override
+ protected String getMessageId(Exchange exchange) {
+ return exchange.getIn().getHeader(MESSAGE_ID, String.class);
+ }
+
+}
diff --git a/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/ServiceBusSpanDecoratorTest.java b/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/ServiceBusSpanDecoratorTest.java
new file mode 100644
index 00000000000..3006673d7ca
--- /dev/null
+++ b/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/ServiceBusSpanDecoratorTest.java
@@ -0,0 +1,81 @@
+package org.apache.camel.tracing.decorators;
+
+import java.time.Duration;
+import java.time.OffsetDateTime;
+
+import org.apache.camel.Endpoint;
+import org.apache.camel.Exchange;
+import org.apache.camel.Message;
+import org.apache.camel.tracing.MockSpanAdapter;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class ServiceBusSpanDecoratorTest {
+
+ @Test
+ public void testGetMessageId() {
+ String messageId = "abcd";
+ Exchange exchange = Mockito.mock(Exchange.class);
+ Message message = Mockito.mock(Message.class);
+
+ Mockito.when(exchange.getIn()).thenReturn(message);
+ Mockito.when(message.getHeader(ServiceBusSpanDecorator.MESSAGE_ID, String.class)).thenReturn(messageId);
+
+ AbstractMessagingSpanDecorator decorator = new ServiceBusSpanDecorator();
+
+ assertEquals(messageId, decorator.getMessageId(exchange));
+ }
+
+ @Test
+ public void testPre() {
+ String contentType = "application/json";
+ String correlationId = "1234";
+ Long deliveryCount = 27L;
+ OffsetDateTime enqueuedSequenceNumber = OffsetDateTime.now();
+ OffsetDateTime enqueuedTime = OffsetDateTime.now();
+ OffsetDateTime expiresAt = OffsetDateTime.now();
+ String partitionKey = "MyPartitionKey";
+ String replyToSessionId = "MyReplyToSessionId";
+ String sessionId = "4321";
+ Duration ttl = Duration.ofDays(7);
+
+ Endpoint endpoint = Mockito.mock(Endpoint.class);
+ Exchange exchange = Mockito.mock(Exchange.class);
+ Message message = Mockito.mock(Message.class);
+
+ Mockito.when(endpoint.getEndpointUri()).thenReturn("azure-servicebus:topicOrQueueName");
+ Mockito.when(exchange.getIn()).thenReturn(message);
+ Mockito.when(message.getHeader(ServiceBusSpanDecorator.CONTENT_TYPE, String.class)).thenReturn(contentType);
+ Mockito.when(message.getHeader(ServiceBusSpanDecorator.CORRELATION_ID, String.class)).thenReturn(correlationId);
+ Mockito.when(message.getHeader(ServiceBusSpanDecorator.DELIVERY_COUNT, Long.class)).thenReturn(deliveryCount);
+ Mockito.when(message.getHeader(ServiceBusSpanDecorator.ENQUEUED_SEQUENCE_NUMBER, OffsetDateTime.class))
+ .thenReturn(enqueuedSequenceNumber);
+ Mockito.when(message.getHeader(ServiceBusSpanDecorator.ENQUEUED_TIME, OffsetDateTime.class)).thenReturn(enqueuedTime);
+ Mockito.when(message.getHeader(ServiceBusSpanDecorator.EXPIRES_AT, OffsetDateTime.class)).thenReturn(expiresAt);
+ Mockito.when(message.getHeader(ServiceBusSpanDecorator.PARTITION_KEY, String.class)).thenReturn(partitionKey);
+ Mockito.when(message.getHeader(ServiceBusSpanDecorator.REPLY_TO_SESSION_ID, String.class)).thenReturn(replyToSessionId);
+ Mockito.when(message.getHeader(ServiceBusSpanDecorator.SESSION_ID, String.class)).thenReturn(sessionId);
+ Mockito.when(message.getHeader(ServiceBusSpanDecorator.TIME_TO_LIVE, Duration.class)).thenReturn(ttl);
+
+ AbstractMessagingSpanDecorator decorator = new ServiceBusSpanDecorator();
+
+ MockSpanAdapter span = new MockSpanAdapter();
+
+ decorator.pre(span, exchange, endpoint);
+
+ assertEquals(contentType, span.tags().get(ServiceBusSpanDecorator.SERVICEBUS_CONTENT_TYPE));
+ assertEquals(correlationId, span.tags().get(ServiceBusSpanDecorator.SERVICEBUS_CORRELATION_ID));
+ assertEquals(deliveryCount, span.tags().get(ServiceBusSpanDecorator.SERVICEBUS_DELIVERY_COUNT));
+ assertEquals(enqueuedSequenceNumber.toString(),
+ span.tags().get(ServiceBusSpanDecorator.SERVICEBUS_ENQUEUED_SEQUENCE_NUMBER));
+ assertEquals(enqueuedTime.toString(), span.tags().get(ServiceBusSpanDecorator.SERVICEBUS_ENQUEUED_TIME));
+ assertEquals(expiresAt.toString(), span.tags().get(ServiceBusSpanDecorator.SERVICEBUS_EXPIRES_AT));
+ assertEquals(partitionKey, span.tags().get(ServiceBusSpanDecorator.SERVICEBUS_PARTITION_KEY));
+ assertEquals(replyToSessionId, span.tags().get(ServiceBusSpanDecorator.SERVICEBUS_REPLY_TO_SESSION_ID));
+ assertEquals(sessionId, span.tags().get(ServiceBusSpanDecorator.SERVICEBUS_SESSION_ID));
+ assertEquals(ttl.toString(), span.tags().get(ServiceBusSpanDecorator.SERVICEBUS_TIME_TO_LIVE));
+ }
+
+}
[camel] 03/05: rename to AzureServiceBusSpanDecorator
Posted by bv...@apache.org.
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
commit 460c428a7bb1e30e683c7d10e91846f0de40a19d
Author: Babak Vahdat <bv...@apache.org>
AuthorDate: Thu May 5 22:04:08 2022 +0200
rename to AzureServiceBusSpanDecorator
---
.../org.apache.camel.tracing.SpanDecorator | 2 +-
...ator.java => AzureServiceBusSpanDecorator.java} | 0
....java => AzureServiceBusSpanDecoratorTest.java} | 46 +++++++++++-----------
3 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/components/camel-opentelemetry/src/main/resources/META-INF/services/org.apache.camel.tracing.SpanDecorator b/components/camel-opentelemetry/src/main/resources/META-INF/services/org.apache.camel.tracing.SpanDecorator
index e575ef9978a..ed1246c87b3 100644
--- a/components/camel-opentelemetry/src/main/resources/META-INF/services/org.apache.camel.tracing.SpanDecorator
+++ b/components/camel-opentelemetry/src/main/resources/META-INF/services/org.apache.camel.tracing.SpanDecorator
@@ -17,6 +17,7 @@
org.apache.camel.tracing.decorators.AhcSpanDecorator
org.apache.camel.tracing.decorators.AmqpSpanDecorator
+org.apache.camel.tracing.decorators.AzureServiceBusSpanDecorator
org.apache.camel.tracing.decorators.CometdSpanDecorator
org.apache.camel.tracing.decorators.CometdsSpanDecorator
org.apache.camel.tracing.decorators.CqlSpanDecorator
@@ -42,7 +43,6 @@ org.apache.camel.tracing.decorators.PlatformHttpSpanDecorator
org.apache.camel.tracing.decorators.RabbitmqSpanDecorator
org.apache.camel.tracing.decorators.RestSpanDecorator
org.apache.camel.tracing.decorators.SedaSpanDecorator
-org.apache.camel.tracing.decorators.ServiceBusSpanDecorator
org.apache.camel.tracing.decorators.ServletSpanDecorator
org.apache.camel.tracing.decorators.SjmsSpanDecorator
org.apache.camel.tracing.decorators.Sjms2SpanDecorator
diff --git a/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/ServiceBusSpanDecorator.java b/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/AzureServiceBusSpanDecorator.java
similarity index 100%
rename from components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/ServiceBusSpanDecorator.java
rename to components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/AzureServiceBusSpanDecorator.java
diff --git a/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/ServiceBusSpanDecoratorTest.java b/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/AzureServiceBusSpanDecoratorTest.java
similarity index 50%
rename from components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/ServiceBusSpanDecoratorTest.java
rename to components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/AzureServiceBusSpanDecoratorTest.java
index a44fa7a3629..0c4d13ec340 100644
--- a/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/ServiceBusSpanDecoratorTest.java
+++ b/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/AzureServiceBusSpanDecoratorTest.java
@@ -37,9 +37,9 @@ public class ServiceBusSpanDecoratorTest {
Message message = Mockito.mock(Message.class);
Mockito.when(exchange.getIn()).thenReturn(message);
- Mockito.when(message.getHeader(ServiceBusSpanDecorator.MESSAGE_ID, String.class)).thenReturn(messageId);
+ Mockito.when(message.getHeader(AzureServiceBusSpanDecorator.MESSAGE_ID, String.class)).thenReturn(messageId);
- AbstractMessagingSpanDecorator decorator = new ServiceBusSpanDecorator();
+ AbstractMessagingSpanDecorator decorator = new AzureServiceBusSpanDecorator();
assertEquals(messageId, decorator.getMessageId(exchange));
}
@@ -63,35 +63,35 @@ public class ServiceBusSpanDecoratorTest {
Mockito.when(endpoint.getEndpointUri()).thenReturn("azure-servicebus:topicOrQueueName");
Mockito.when(exchange.getIn()).thenReturn(message);
- Mockito.when(message.getHeader(ServiceBusSpanDecorator.CONTENT_TYPE, String.class)).thenReturn(contentType);
- Mockito.when(message.getHeader(ServiceBusSpanDecorator.CORRELATION_ID, String.class)).thenReturn(correlationId);
- Mockito.when(message.getHeader(ServiceBusSpanDecorator.DELIVERY_COUNT, Long.class)).thenReturn(deliveryCount);
- Mockito.when(message.getHeader(ServiceBusSpanDecorator.ENQUEUED_SEQUENCE_NUMBER, OffsetDateTime.class))
+ Mockito.when(message.getHeader(AzureServiceBusSpanDecorator.CONTENT_TYPE, String.class)).thenReturn(contentType);
+ Mockito.when(message.getHeader(AzureServiceBusSpanDecorator.CORRELATION_ID, String.class)).thenReturn(correlationId);
+ Mockito.when(message.getHeader(AzureServiceBusSpanDecorator.DELIVERY_COUNT, Long.class)).thenReturn(deliveryCount);
+ Mockito.when(message.getHeader(AzureServiceBusSpanDecorator.ENQUEUED_SEQUENCE_NUMBER, OffsetDateTime.class))
.thenReturn(enqueuedSequenceNumber);
- Mockito.when(message.getHeader(ServiceBusSpanDecorator.ENQUEUED_TIME, OffsetDateTime.class)).thenReturn(enqueuedTime);
- Mockito.when(message.getHeader(ServiceBusSpanDecorator.EXPIRES_AT, OffsetDateTime.class)).thenReturn(expiresAt);
- Mockito.when(message.getHeader(ServiceBusSpanDecorator.PARTITION_KEY, String.class)).thenReturn(partitionKey);
- Mockito.when(message.getHeader(ServiceBusSpanDecorator.REPLY_TO_SESSION_ID, String.class)).thenReturn(replyToSessionId);
- Mockito.when(message.getHeader(ServiceBusSpanDecorator.SESSION_ID, String.class)).thenReturn(sessionId);
- Mockito.when(message.getHeader(ServiceBusSpanDecorator.TIME_TO_LIVE, Duration.class)).thenReturn(ttl);
+ Mockito.when(message.getHeader(AzureServiceBusSpanDecorator.ENQUEUED_TIME, OffsetDateTime.class)).thenReturn(enqueuedTime);
+ Mockito.when(message.getHeader(AzureServiceBusSpanDecorator.EXPIRES_AT, OffsetDateTime.class)).thenReturn(expiresAt);
+ Mockito.when(message.getHeader(AzureServiceBusSpanDecorator.PARTITION_KEY, String.class)).thenReturn(partitionKey);
+ Mockito.when(message.getHeader(AzureServiceBusSpanDecorator.REPLY_TO_SESSION_ID, String.class)).thenReturn(replyToSessionId);
+ Mockito.when(message.getHeader(AzureServiceBusSpanDecorator.SESSION_ID, String.class)).thenReturn(sessionId);
+ Mockito.when(message.getHeader(AzureServiceBusSpanDecorator.TIME_TO_LIVE, Duration.class)).thenReturn(ttl);
- AbstractMessagingSpanDecorator decorator = new ServiceBusSpanDecorator();
+ AbstractMessagingSpanDecorator decorator = new AzureServiceBusSpanDecorator();
MockSpanAdapter span = new MockSpanAdapter();
decorator.pre(span, exchange, endpoint);
- assertEquals(contentType, span.tags().get(ServiceBusSpanDecorator.SERVICEBUS_CONTENT_TYPE));
- assertEquals(correlationId, span.tags().get(ServiceBusSpanDecorator.SERVICEBUS_CORRELATION_ID));
- assertEquals(deliveryCount, span.tags().get(ServiceBusSpanDecorator.SERVICEBUS_DELIVERY_COUNT));
+ assertEquals(contentType, span.tags().get(AzureServiceBusSpanDecorator.SERVICEBUS_CONTENT_TYPE));
+ assertEquals(correlationId, span.tags().get(AzureServiceBusSpanDecorator.SERVICEBUS_CORRELATION_ID));
+ assertEquals(deliveryCount, span.tags().get(AzureServiceBusSpanDecorator.SERVICEBUS_DELIVERY_COUNT));
assertEquals(enqueuedSequenceNumber.toString(),
- span.tags().get(ServiceBusSpanDecorator.SERVICEBUS_ENQUEUED_SEQUENCE_NUMBER));
- assertEquals(enqueuedTime.toString(), span.tags().get(ServiceBusSpanDecorator.SERVICEBUS_ENQUEUED_TIME));
- assertEquals(expiresAt.toString(), span.tags().get(ServiceBusSpanDecorator.SERVICEBUS_EXPIRES_AT));
- assertEquals(partitionKey, span.tags().get(ServiceBusSpanDecorator.SERVICEBUS_PARTITION_KEY));
- assertEquals(replyToSessionId, span.tags().get(ServiceBusSpanDecorator.SERVICEBUS_REPLY_TO_SESSION_ID));
- assertEquals(sessionId, span.tags().get(ServiceBusSpanDecorator.SERVICEBUS_SESSION_ID));
- assertEquals(ttl.toString(), span.tags().get(ServiceBusSpanDecorator.SERVICEBUS_TIME_TO_LIVE));
+ span.tags().get(AzureServiceBusSpanDecorator.SERVICEBUS_ENQUEUED_SEQUENCE_NUMBER));
+ assertEquals(enqueuedTime.toString(), span.tags().get(AzureServiceBusSpanDecorator.SERVICEBUS_ENQUEUED_TIME));
+ assertEquals(expiresAt.toString(), span.tags().get(AzureServiceBusSpanDecorator.SERVICEBUS_EXPIRES_AT));
+ assertEquals(partitionKey, span.tags().get(AzureServiceBusSpanDecorator.SERVICEBUS_PARTITION_KEY));
+ assertEquals(replyToSessionId, span.tags().get(AzureServiceBusSpanDecorator.SERVICEBUS_REPLY_TO_SESSION_ID));
+ assertEquals(sessionId, span.tags().get(AzureServiceBusSpanDecorator.SERVICEBUS_SESSION_ID));
+ assertEquals(ttl.toString(), span.tags().get(AzureServiceBusSpanDecorator.SERVICEBUS_TIME_TO_LIVE));
}
}
[camel] 05/05: fix formatting
Posted by bv...@apache.org.
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
commit a7c6d85f447cd25f6a31de0d1fcdf7602ccdf00b
Author: Babak Vahdat <bv...@apache.org>
AuthorDate: Fri May 6 06:52:54 2022 +0200
fix formatting
---
.../camel/tracing/decorators/AzureServiceBusSpanDecoratorTest.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/AzureServiceBusSpanDecoratorTest.java b/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/AzureServiceBusSpanDecoratorTest.java
index 84898700b51..8bc262333d6 100644
--- a/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/AzureServiceBusSpanDecoratorTest.java
+++ b/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/AzureServiceBusSpanDecoratorTest.java
@@ -68,10 +68,12 @@ public class AzureServiceBusSpanDecoratorTest {
Mockito.when(message.getHeader(AzureServiceBusSpanDecorator.DELIVERY_COUNT, Long.class)).thenReturn(deliveryCount);
Mockito.when(message.getHeader(AzureServiceBusSpanDecorator.ENQUEUED_SEQUENCE_NUMBER, OffsetDateTime.class))
.thenReturn(enqueuedSequenceNumber);
- Mockito.when(message.getHeader(AzureServiceBusSpanDecorator.ENQUEUED_TIME, OffsetDateTime.class)).thenReturn(enqueuedTime);
+ Mockito.when(message.getHeader(AzureServiceBusSpanDecorator.ENQUEUED_TIME, OffsetDateTime.class))
+ .thenReturn(enqueuedTime);
Mockito.when(message.getHeader(AzureServiceBusSpanDecorator.EXPIRES_AT, OffsetDateTime.class)).thenReturn(expiresAt);
Mockito.when(message.getHeader(AzureServiceBusSpanDecorator.PARTITION_KEY, String.class)).thenReturn(partitionKey);
- Mockito.when(message.getHeader(AzureServiceBusSpanDecorator.REPLY_TO_SESSION_ID, String.class)).thenReturn(replyToSessionId);
+ Mockito.when(message.getHeader(AzureServiceBusSpanDecorator.REPLY_TO_SESSION_ID, String.class))
+ .thenReturn(replyToSessionId);
Mockito.when(message.getHeader(AzureServiceBusSpanDecorator.SESSION_ID, String.class)).thenReturn(sessionId);
Mockito.when(message.getHeader(AzureServiceBusSpanDecorator.TIME_TO_LIVE, Duration.class)).thenReturn(ttl);