diff --git a/pom.xml b/pom.xml index 6f1de51877..3b59b93676 100644 --- a/pom.xml +++ b/pom.xml @@ -89,7 +89,7 @@ 4.2.0 - 2.28.1 + 2.29.0 1.40.0 3.19.1 diff --git a/smallrye-reactive-messaging-rabbitmq/src/main/java/io/smallrye/reactive/messaging/rabbitmq/tracing/RabbitMQOpenTelemetryInstrumenter.java b/smallrye-reactive-messaging-rabbitmq/src/main/java/io/smallrye/reactive/messaging/rabbitmq/tracing/RabbitMQOpenTelemetryInstrumenter.java index a21dc8d863..f36db92cf8 100644 --- a/smallrye-reactive-messaging-rabbitmq/src/main/java/io/smallrye/reactive/messaging/rabbitmq/tracing/RabbitMQOpenTelemetryInstrumenter.java +++ b/smallrye-reactive-messaging-rabbitmq/src/main/java/io/smallrye/reactive/messaging/rabbitmq/tracing/RabbitMQOpenTelemetryInstrumenter.java @@ -1,10 +1,10 @@ package io.smallrye.reactive.messaging.rabbitmq.tracing; -import io.smallrye.reactive.messaging.rabbitmq.RabbitMQConnectorCommonConfiguration; -import jakarta.enterprise.inject.Instance; - import java.util.Arrays; import java.util.stream.Collectors; + +import jakarta.enterprise.inject.Instance; + import org.eclipse.microprofile.reactive.messaging.Message; import io.opentelemetry.api.OpenTelemetry; @@ -14,6 +14,7 @@ import io.opentelemetry.instrumentation.api.incubator.semconv.messaging.MessagingSpanNameExtractor; import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; import io.opentelemetry.instrumentation.api.instrumenter.InstrumenterBuilder; +import io.smallrye.reactive.messaging.rabbitmq.RabbitMQConnectorCommonConfiguration; import io.smallrye.reactive.messaging.tracing.TracingUtils; public class RabbitMQOpenTelemetryInstrumenter { diff --git a/smallrye-reactive-messaging-rabbitmq/src/main/java/io/smallrye/reactive/messaging/rabbitmq/tracing/RabbitMQTraceAttributesExtractor.java b/smallrye-reactive-messaging-rabbitmq/src/main/java/io/smallrye/reactive/messaging/rabbitmq/tracing/RabbitMQTraceAttributesExtractor.java index cf631b0651..17a0f3bfde 100644 --- a/smallrye-reactive-messaging-rabbitmq/src/main/java/io/smallrye/reactive/messaging/rabbitmq/tracing/RabbitMQTraceAttributesExtractor.java +++ b/smallrye-reactive-messaging-rabbitmq/src/main/java/io/smallrye/reactive/messaging/rabbitmq/tracing/RabbitMQTraceAttributesExtractor.java @@ -4,13 +4,13 @@ import java.util.Collections; import java.util.List; +import java.util.Map; +import java.util.Set; import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.incubator.semconv.messaging.MessagingAttributesGetter; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; -import java.util.Map; -import java.util.Set; public class RabbitMQTraceAttributesExtractor implements AttributesExtractor { private final MessagingAttributesGetter messagingAttributesGetter; diff --git a/smallrye-reactive-messaging-rabbitmq/src/test/java/io/smallrye/reactive/messaging/rabbitmq/TracingTest.java b/smallrye-reactive-messaging-rabbitmq/src/test/java/io/smallrye/reactive/messaging/rabbitmq/TracingTest.java index 8d452d390a..fe2414a71e 100644 --- a/smallrye-reactive-messaging-rabbitmq/src/test/java/io/smallrye/reactive/messaging/rabbitmq/TracingTest.java +++ b/smallrye-reactive-messaging-rabbitmq/src/test/java/io/smallrye/reactive/messaging/rabbitmq/TracingTest.java @@ -13,7 +13,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; -import io.opentelemetry.api.common.AttributeKey; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -34,6 +33,7 @@ import com.rabbitmq.client.AMQP; import io.opentelemetry.api.GlobalOpenTelemetry; +import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.trace.Span; import io.opentelemetry.api.trace.SpanId; import io.opentelemetry.api.trace.SpanKind;