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 b8749028c3c CAMEL-18055: enqueuedSequenceNumber is of type long b8749028c3c is described below commit b8749028c3c370bd91a9548862b80cb78954506d Author: Babak Vahdat <bvah...@apache.org> AuthorDate: Sat May 7 11:11:18 2022 +0200 CAMEL-18055: enqueuedSequenceNumber is of type long --- .../camel/tracing/decorators/AzureServiceBusSpanDecorator.java | 4 ++-- .../camel/tracing/decorators/AzureServiceBusSpanDecoratorTest.java | 7 +++---- 2 files changed, 5 insertions(+), 6 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 504dbe6fc9e..b9f45415384 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 @@ -80,9 +80,9 @@ public class AzureServiceBusSpanDecorator extends AbstractMessagingSpanDecorator span.setTag(SERVICEBUS_DELIVERY_COUNT, deliveryCount); } - OffsetDateTime enqueuedSequenceNumber = exchange.getIn().getHeader(ENQUEUED_SEQUENCE_NUMBER, OffsetDateTime.class); + Long enqueuedSequenceNumber = exchange.getIn().getHeader(ENQUEUED_SEQUENCE_NUMBER, Long.class); if (enqueuedSequenceNumber != null) { - span.setTag(SERVICEBUS_ENQUEUED_SEQUENCE_NUMBER, enqueuedSequenceNumber.toString()); + span.setTag(SERVICEBUS_ENQUEUED_SEQUENCE_NUMBER, enqueuedSequenceNumber); } OffsetDateTime enqueuedTime = exchange.getIn().getHeader(ENQUEUED_TIME, OffsetDateTime.class); 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 8bc262333d6..9594bd2cb47 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 @@ -49,7 +49,7 @@ public class AzureServiceBusSpanDecoratorTest { String contentType = "application/json"; String correlationId = "1234"; Long deliveryCount = 27L; - OffsetDateTime enqueuedSequenceNumber = OffsetDateTime.now(); + Long enqueuedSequenceNumber = 1L; OffsetDateTime enqueuedTime = OffsetDateTime.now(); OffsetDateTime expiresAt = OffsetDateTime.now(); String partitionKey = "MyPartitionKey"; @@ -66,7 +66,7 @@ public class AzureServiceBusSpanDecoratorTest { 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)) + Mockito.when(message.getHeader(AzureServiceBusSpanDecorator.ENQUEUED_SEQUENCE_NUMBER, Long.class)) .thenReturn(enqueuedSequenceNumber); Mockito.when(message.getHeader(AzureServiceBusSpanDecorator.ENQUEUED_TIME, OffsetDateTime.class)) .thenReturn(enqueuedTime); @@ -86,8 +86,7 @@ public class AzureServiceBusSpanDecoratorTest { 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(AzureServiceBusSpanDecorator.SERVICEBUS_ENQUEUED_SEQUENCE_NUMBER)); + assertEquals(enqueuedSequenceNumber, 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));