This is an automated email from the ASF dual-hosted git repository.
bvahdat pushed a commit to branch CAMEL-18055
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/CAMEL-18055 by this push:
new 3f968415fc8 rename to AzureServiceBusSpanDecorator
3f968415fc8 is described below
commit 3f968415fc86625c16daff146be2f3e54a15f357
Author: Babak Vahdat <[email protected]>
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));
}
}
