Retreive OpenTelemetry instance through CDI injection instead of rely…

…ing on GlobalOpenTelemetry.get

Still falls back to "GlobalOpenTelemetry.get"

Fixes #2539

(cherry picked from commit 30493b4)

smallrye-reactive-messaging-amqp/src/main/java/io/smallrye/reactive/messaging/amqp/AmqpConnector.java

@@ -33,6 +33,7 @@
 import org.eclipse.microprofile.reactive.messaging.Message;
 import org.eclipse.microprofile.reactive.messaging.spi.Connector;
 
+import io.opentelemetry.api.OpenTelemetry;
 import io.smallrye.mutiny.Multi;
 import io.smallrye.mutiny.Uni;
 import io.smallrye.mutiny.operators.multi.processors.BroadcastProcessor;
@@ -121,6 +122,9 @@ public class AmqpConnector implements InboundConnector, OutboundConnector, Healt
     @Any
     private Instance<SSLContext> clientSslContexts;
 
+    @Inject
+    private Instance<OpenTelemetry> openTelemetryInstance;
+
     private final List<AmqpClient> clients = new CopyOnWriteArrayList<>();
 
     /**
@@ -230,7 +234,7 @@ public Flow.Publisher<? extends Message<?>> getPublisher(Config config) {
         AmqpFailureHandler onNack = createFailureHandler(ic);
 
         if (tracing && amqpInstrumenter == null) {
-            amqpInstrumenter = AmqpOpenTelemetryInstrumenter.createForConnector();
+            amqpInstrumenter = AmqpOpenTelemetryInstrumenter.createForConnector(openTelemetryInstance);
         }
 
         Multi<? extends Message<?>> multi = holder.getOrEstablishConnection()
@@ -318,7 +322,8 @@ public Flow.Subscriber<? extends Message<?>> getSubscriber(Config config) {
                 this,
                 holder,
                 oc,
-                getSender);
+                getSender,
+                openTelemetryInstance);
         processors.put(oc.getChannel(), processor);
 
         return MultiUtils.via(processor, m -> m.onFailure().invoke(t -> {

smallrye-reactive-messaging-amqp/src/main/java/io/smallrye/reactive/messaging/amqp/AmqpCreditBasedSender.java

@@ -13,8 +13,11 @@
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.AtomicReference;
 
+import jakarta.enterprise.inject.Instance;
+
 import org.eclipse.microprofile.reactive.messaging.Message;
 
+import io.opentelemetry.api.OpenTelemetry;
 import io.smallrye.common.annotation.CheckReturnValue;
 import io.smallrye.mutiny.Uni;
 import io.smallrye.mutiny.helpers.Subscriptions;
@@ -57,7 +60,8 @@ public class AmqpCreditBasedSender implements Processor<Message<?>, Message<?>>,
     private volatile boolean creditRetrievalInProgress = false;
 
     public AmqpCreditBasedSender(AmqpConnector connector, ConnectionHolder holder,
-            AmqpConnectorOutgoingConfiguration configuration, Uni<AmqpSender> retrieveSender) {
+            AmqpConnectorOutgoingConfiguration configuration, Uni<AmqpSender> retrieveSender,
+            Instance<OpenTelemetry> openTelemetryInstance) {
         this.connector = connector;
         this.holder = holder;
         this.retrieveSender = retrieveSender;
@@ -75,7 +79,7 @@ public AmqpCreditBasedSender(AmqpConnector connector, ConnectionHolder holder,
         this.retryInterval = configuration.getReconnectInterval();
 
         if (tracingEnabled) {
-            amqpInstrumenter = AmqpOpenTelemetryInstrumenter.createForSender();
+            amqpInstrumenter = AmqpOpenTelemetryInstrumenter.createForSender(openTelemetryInstance);
         } else {
             amqpInstrumenter = null;
         }

smallrye-reactive-messaging-amqp/src/main/java/io/smallrye/reactive/messaging/amqp/tracing/AmqpOpenTelemetryInstrumenter.java

@@ -1,8 +1,10 @@
 package io.smallrye.reactive.messaging.amqp.tracing;
 
+import jakarta.enterprise.inject.Instance;
+
 import org.eclipse.microprofile.reactive.messaging.Message;
 
-import io.opentelemetry.api.GlobalOpenTelemetry;
+import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
 import io.opentelemetry.instrumentation.api.instrumenter.InstrumenterBuilder;
 import io.opentelemetry.instrumentation.api.instrumenter.messaging.MessageOperation;
@@ -19,20 +21,20 @@ private AmqpOpenTelemetryInstrumenter(Instrumenter<AmqpMessage<?>, Void> instrum
         this.instrumenter = instrumenter;
     }
 
-    public static AmqpOpenTelemetryInstrumenter createForConnector() {
-        return create(false);
+    public static AmqpOpenTelemetryInstrumenter createForConnector(Instance<OpenTelemetry> openTelemetryInstance) {
+        return create(TracingUtils.getOpenTelemetry(openTelemetryInstance), false);
     }
 
-    public static AmqpOpenTelemetryInstrumenter createForSender() {
-        return create(true);
+    public static AmqpOpenTelemetryInstrumenter createForSender(Instance<OpenTelemetry> openTelemetryInstance) {
+        return create(TracingUtils.getOpenTelemetry(openTelemetryInstance), true);
     }
 
-    private static AmqpOpenTelemetryInstrumenter create(boolean sender) {
+    private static AmqpOpenTelemetryInstrumenter create(OpenTelemetry openTelemetry, boolean sender) {
         MessageOperation messageOperation = sender ? MessageOperation.PUBLISH : MessageOperation.RECEIVE;
         AmqpAttributesExtractor amqpAttributesExtractor = new AmqpAttributesExtractor();
         MessagingAttributesGetter<AmqpMessage<?>, Void> messagingAttributesGetter = amqpAttributesExtractor
                 .getMessagingAttributesGetter();
-        InstrumenterBuilder<AmqpMessage<?>, Void> builder = Instrumenter.builder(GlobalOpenTelemetry.get(),
+        InstrumenterBuilder<AmqpMessage<?>, Void> builder = Instrumenter.builder(openTelemetry,
                 "io.smallrye.reactive.messaging",
                 MessagingSpanNameExtractor.create(messagingAttributesGetter, messageOperation));
 

smallrye-reactive-messaging-kafka/src/main/java/io/smallrye/reactive/messaging/kafka/KafkaConnector.java

@@ -24,6 +24,7 @@
 import org.eclipse.microprofile.reactive.messaging.Message;
 import org.eclipse.microprofile.reactive.messaging.spi.Connector;
 
+import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.api.trace.SpanBuilder;
 import io.opentelemetry.api.trace.Tracer;
 import io.smallrye.mutiny.Multi;
@@ -161,6 +162,9 @@ public SpanBuilder spanBuilder(final String spanName) {
     @Any
     Instance<KafkaFailureHandler.Factory> failureHandlerFactories;
 
+    @Inject
+    Instance<OpenTelemetry> openTelemetryInstance;
+
     @Inject
     KafkaCDIEvents kafkaCDIEvents;
 
@@ -209,7 +213,7 @@ public Flow.Publisher<? extends Message<?>> getPublisher(Config config) {
         });
 
         if (partitions == 1) {
-            KafkaSource<Object, Object> source = new KafkaSource<>(vertx, group, ic,
+            KafkaSource<Object, Object> source = new KafkaSource<>(vertx, group, ic, openTelemetryInstance,
                     commitHandlerFactories, failureHandlerFactories,
                     consumerRebalanceListeners,
                     kafkaCDIEvents, deserializationFailureHandlers, -1);
@@ -231,7 +235,7 @@ public Flow.Publisher<? extends Message<?>> getPublisher(Config config) {
         // create an instance of source per partitions.
         List<Publisher<? extends Message<?>>> streams = new ArrayList<>();
         for (int i = 0; i < partitions; i++) {
-            KafkaSource<Object, Object> source = new KafkaSource<>(vertx, group, ic,
+            KafkaSource<Object, Object> source = new KafkaSource<>(vertx, group, ic, openTelemetryInstance,
                     commitHandlerFactories, failureHandlerFactories,
                     consumerRebalanceListeners,
                     kafkaCDIEvents, deserializationFailureHandlers, i);
@@ -268,7 +272,8 @@ public Flow.Subscriber<? extends Message<?>> getSubscriber(Config config) {
         if (oc.getHealthReadinessTimeout().isPresent()) {
             log.deprecatedConfig("health-readiness-timeout", "health-topic-verification-timeout");
         }
-        KafkaSink sink = new KafkaSink(oc, kafkaCDIEvents, serializationFailureHandlers, producerInterceptors);
+        KafkaSink sink = new KafkaSink(oc, kafkaCDIEvents, openTelemetryInstance,
+                serializationFailureHandlers, producerInterceptors);
         sinks.add(sink);
         return sink.getSink();
     }

smallrye-reactive-messaging-kafka/src/main/java/io/smallrye/reactive/messaging/kafka/impl/KafkaSink.java

@@ -32,6 +32,7 @@
 import org.apache.kafka.common.serialization.StringSerializer;
 import org.eclipse.microprofile.reactive.messaging.Message;
 
+import io.opentelemetry.api.OpenTelemetry;
 import io.smallrye.mutiny.Uni;
 import io.smallrye.reactive.messaging.OutgoingMessageMetadata;
 import io.smallrye.reactive.messaging.ce.OutgoingCloudEventMetadata;
@@ -78,7 +79,9 @@ public class KafkaSink {
 
     private final KafkaOpenTelemetryInstrumenter kafkaInstrumenter;
 
-    public KafkaSink(KafkaConnectorOutgoingConfiguration config, KafkaCDIEvents kafkaCDIEvents,
+    public KafkaSink(KafkaConnectorOutgoingConfiguration config,
+            KafkaCDIEvents kafkaCDIEvents,
+            Instance<OpenTelemetry> openTelemetryInstance,
             Instance<SerializationFailureHandler<?>> serializationFailureHandlers,
             Instance<ProducerInterceptor<?, ?>> producerInterceptors) {
         this.isTracingEnabled = config.getTracingEnabled();
@@ -134,7 +137,7 @@ public KafkaSink(KafkaConnectorOutgoingConfiguration config, KafkaCDIEvents kafk
         }));
 
         if (isTracingEnabled) {
-            kafkaInstrumenter = KafkaOpenTelemetryInstrumenter.createForSink();
+            kafkaInstrumenter = KafkaOpenTelemetryInstrumenter.createForSink(openTelemetryInstance);
         } else {
             kafkaInstrumenter = null;
         }

smallrye-reactive-messaging-kafka/src/main/java/io/smallrye/reactive/messaging/kafka/impl/KafkaSource.java

@@ -21,6 +21,7 @@
 import org.apache.kafka.common.errors.RecordDeserializationException;
 import org.apache.kafka.common.header.Header;
 
+import io.opentelemetry.api.OpenTelemetry;
 import io.smallrye.common.annotation.Identifier;
 import io.smallrye.mutiny.Multi;
 import io.smallrye.mutiny.Uni;
@@ -73,6 +74,7 @@ public class KafkaSource<K, V> {
     public KafkaSource(Vertx vertx,
             String consumerGroup,
             KafkaConnectorIncomingConfiguration config,
+            Instance<OpenTelemetry> openTelemetryInstance,
             Instance<KafkaCommitHandler.Factory> commitHandlerFactories,
             Instance<KafkaFailureHandler.Factory> failureHandlerFactories,
             Instance<KafkaConsumerRebalanceListener> consumerRebalanceListeners,
@@ -227,7 +229,7 @@ public KafkaSource(Vertx vertx,
         }
 
         if (isTracingEnabled) {
-            kafkaInstrumenter = KafkaOpenTelemetryInstrumenter.createForSource();
+            kafkaInstrumenter = KafkaOpenTelemetryInstrumenter.createForSource(openTelemetryInstance);
         } else {
             kafkaInstrumenter = null;
         }

smallrye-reactive-messaging-kafka/src/main/java/io/smallrye/reactive/messaging/kafka/reply/KafkaRequestReplyFactory.java

@@ -15,6 +15,7 @@
 import org.eclipse.microprofile.config.Config;
 import org.eclipse.microprofile.reactive.messaging.Channel;
 
+import io.opentelemetry.api.OpenTelemetry;
 import io.smallrye.reactive.messaging.ChannelRegistry;
 import io.smallrye.reactive.messaging.EmitterConfiguration;
 import io.smallrye.reactive.messaging.EmitterFactory;
@@ -75,10 +76,13 @@ public class KafkaRequestReplyFactory implements EmitterFactory<KafkaRequestRepl
     @Any
     Instance<Map<String, Object>> configurations;
 
+    @Inject
+    Instance<OpenTelemetry> openTelemetryInstance;
+
     @Override
     public KafkaRequestReplyImpl<Object, Object> createEmitter(EmitterConfiguration configuration, long defaultBufferSize) {
         return new KafkaRequestReplyImpl<>(configuration, defaultBufferSize, config.get(), configurations, holder.vertx(),
-                kafkaCDIEvents, commitStrategyFactories, failureStrategyFactories, failureHandlers,
+                kafkaCDIEvents, openTelemetryInstance, commitStrategyFactories, failureStrategyFactories, failureHandlers,
                 correlationIdHandlers, replyFailureHandlers, rebalanceListeners);
     }
 

smallrye-reactive-messaging-kafka/src/main/java/io/smallrye/reactive/messaging/kafka/reply/KafkaRequestReplyImpl.java

@@ -26,6 +26,7 @@
 import org.eclipse.microprofile.config.Config;
 import org.eclipse.microprofile.reactive.messaging.Message;
 
+import io.opentelemetry.api.OpenTelemetry;
 import io.smallrye.common.annotation.Experimental;
 import io.smallrye.mutiny.Multi;
 import io.smallrye.mutiny.Uni;
@@ -80,6 +81,7 @@ public KafkaRequestReplyImpl(EmitterConfiguration config,
             Instance<Map<String, Object>> configurations,
             Vertx vertx,
             KafkaCDIEvents kafkaCDIEvents,
+            Instance<OpenTelemetry> openTelemetryInstance,
             Instance<KafkaCommitHandler.Factory> commitHandlerFactory,
             Instance<KafkaFailureHandler.Factory> failureHandlerFactories,
             Instance<DeserializationFailureHandler<?>> deserializationFailureHandlers,
@@ -116,7 +118,7 @@ public KafkaRequestReplyImpl(EmitterConfiguration config,
         String consumerGroup = consumerConfig.getGroupId().orElseGet(() -> UUID.randomUUID().toString());
         this.waitForPartitions = getWaitForPartitions(consumerConfig);
         this.gracefulShutdown = consumerConfig.getGracefulShutdown();
-        this.replySource = new KafkaSource<>(vertx, consumerGroup, consumerConfig,
+        this.replySource = new KafkaSource<>(vertx, consumerGroup, consumerConfig, openTelemetryInstance,
                 commitHandlerFactory, failureHandlerFactories, rebalanceListeners, kafkaCDIEvents,
                 deserializationFailureHandlers, -1);
 

smallrye-reactive-messaging-kafka/src/main/java/io/smallrye/reactive/messaging/kafka/tracing/KafkaOpenTelemetryInstrumenter.java

@@ -1,8 +1,10 @@
 package io.smallrye.reactive.messaging.kafka.tracing;
 
+import jakarta.enterprise.inject.Instance;
+
 import org.eclipse.microprofile.reactive.messaging.Message;
 
-import io.opentelemetry.api.GlobalOpenTelemetry;
+import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
 import io.opentelemetry.instrumentation.api.instrumenter.InstrumenterBuilder;
 import io.opentelemetry.instrumentation.api.instrumenter.messaging.MessageOperation;
@@ -23,22 +25,22 @@ private KafkaOpenTelemetryInstrumenter(Instrumenter<KafkaTrace, Void> instrument
         this.instrumenter = instrumenter;
     }
 
-    public static KafkaOpenTelemetryInstrumenter createForSource() {
-        return create(true);
+    public static KafkaOpenTelemetryInstrumenter createForSource(Instance<OpenTelemetry> openTelemetryInstance) {
+        return create(TracingUtils.getOpenTelemetry(openTelemetryInstance), true);
     }
 
-    public static KafkaOpenTelemetryInstrumenter createForSink() {
-        return create(false);
+    public static KafkaOpenTelemetryInstrumenter createForSink(Instance<OpenTelemetry> openTelemetryInstance) {
+        return create(TracingUtils.getOpenTelemetry(openTelemetryInstance), false);
     }
 
-    private static KafkaOpenTelemetryInstrumenter create(boolean source) {
+    private static KafkaOpenTelemetryInstrumenter create(OpenTelemetry openTelemetry, boolean source) {
 
         MessageOperation messageOperation = source ? MessageOperation.RECEIVE : MessageOperation.PUBLISH;
 
         KafkaAttributesExtractor kafkaAttributesExtractor = new KafkaAttributesExtractor();
         MessagingAttributesGetter<KafkaTrace, Void> messagingAttributesGetter = kafkaAttributesExtractor
                 .getMessagingAttributesGetter();
-        InstrumenterBuilder<KafkaTrace, Void> builder = Instrumenter.builder(GlobalOpenTelemetry.get(),
+        InstrumenterBuilder<KafkaTrace, Void> builder = Instrumenter.builder(openTelemetry,
                 "io.smallrye.reactive.messaging",
                 MessagingSpanNameExtractor.create(messagingAttributesGetter, messageOperation));
 

smallrye-reactive-messaging-kafka/src/test/java/io/smallrye/reactive/messaging/kafka/KafkaSinkTest.java

@@ -63,6 +63,7 @@ public void testSinkUsingInteger() {
                 .with("channel-name", "testSinkUsingInteger");
         KafkaConnectorOutgoingConfiguration oc = new KafkaConnectorOutgoingConfiguration(config);
         sink = new KafkaSink(oc, CountKafkaCdiEvents.noCdiEvents, UnsatisfiedInstance.instance(),
+                UnsatisfiedInstance.instance(),
                 UnsatisfiedInstance.instance());
 
         Flow.Subscriber<? extends Message<?>> subscriber = sink.getSink();
@@ -84,6 +85,7 @@ public void testSinkUsingIntegerAndChannelName() {
                 .with("partition", 0);
         KafkaConnectorOutgoingConfiguration oc = new KafkaConnectorOutgoingConfiguration(config);
         sink = new KafkaSink(oc, CountKafkaCdiEvents.noCdiEvents, UnsatisfiedInstance.instance(),
+                UnsatisfiedInstance.instance(),
                 UnsatisfiedInstance.instance());
 
         Flow.Subscriber<? extends Message<?>> subscriber = sink.getSink();
@@ -106,6 +108,7 @@ public void testSinkUsingString() {
                 .with("channel-name", "testSinkUsingString");
         KafkaConnectorOutgoingConfiguration oc = new KafkaConnectorOutgoingConfiguration(config);
         sink = new KafkaSink(oc, CountKafkaCdiEvents.noCdiEvents, UnsatisfiedInstance.instance(),
+                UnsatisfiedInstance.instance(),
                 UnsatisfiedInstance.instance());
 
         Flow.Subscriber<? extends Message<?>> subscriber = sink.getSink();
@@ -237,7 +240,8 @@ public void testInvalidPayloadType() {
                 .with("retries", 0L); // disable retry.
         KafkaConnectorOutgoingConfiguration oc = new KafkaConnectorOutgoingConfiguration(config);
         CountKafkaCdiEvents testCdiEvents = new CountKafkaCdiEvents();
-        sink = new KafkaSink(oc, testCdiEvents, UnsatisfiedInstance.instance(), UnsatisfiedInstance.instance());
+        sink = new KafkaSink(oc, testCdiEvents, UnsatisfiedInstance.instance(),
+                UnsatisfiedInstance.instance(), UnsatisfiedInstance.instance());
 
         await().until(() -> {
             HealthReport.HealthReportBuilder builder = HealthReport.builder();
@@ -286,8 +290,8 @@ public void testInvalidTypeWithDefaultInflightMessages() {
                 .with("retries", 0L)
                 .with("channel-name", "testInvalidTypeWithDefaultInflightMessages");
         KafkaConnectorOutgoingConfiguration oc = new KafkaConnectorOutgoingConfiguration(config);
-        sink = new KafkaSink(oc, CountKafkaCdiEvents.noCdiEvents, UnsatisfiedInstance.instance(),
-                UnsatisfiedInstance.instance());
+        sink = new KafkaSink(oc, CountKafkaCdiEvents.noCdiEvents,
+                UnsatisfiedInstance.instance(), UnsatisfiedInstance.instance(), UnsatisfiedInstance.instance());
 
         Flow.Subscriber subscriber = sink.getSink();
         Multi.createFrom().range(0, 5)