Bump Smallrye RM from 4.15.0 to 4.16.0

Rollback the Reactive Messaging OTel tracing change in fb79c7c
quarkusio · Jan 23, 2024 · bc61268 · bc61268
1 parent e369f29
commit bc61268
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 65 deletions.
diff --git a/bom/application/pom.xml b/bom/application/pom.xml
@@ -62,7 +62,7 @@
         <smallrye-reactive-streams-operators.version>1.0.13</smallrye-reactive-streams-operators.version>
         <smallrye-reactive-types-converter.version>3.0.1</smallrye-reactive-types-converter.version>
         <smallrye-mutiny-vertx-binding.version>3.8.0</smallrye-mutiny-vertx-binding.version>
-        <smallrye-reactive-messaging.version>4.15.0</smallrye-reactive-messaging.version>
+        <smallrye-reactive-messaging.version>4.16.0</smallrye-reactive-messaging.version>
         <smallrye-stork.version>2.5.0</smallrye-stork.version>
         <jakarta.activation.version>2.1.2</jakarta.activation.version>
         <jakarta.annotation-api.version>2.1.1</jakarta.annotation-api.version>

diff --git a/...io/quarkus/opentelemetry/deployment/tracing/instrumentation/InstrumentationProcessor.java b/...io/quarkus/opentelemetry/deployment/tracing/instrumentation/InstrumentationProcessor.java
@@ -24,7 +24,6 @@
 import io.quarkus.opentelemetry.runtime.tracing.intrumentation.InstrumentationRecorder;
 import io.quarkus.opentelemetry.runtime.tracing.intrumentation.grpc.GrpcTracingClientInterceptor;
 import io.quarkus.opentelemetry.runtime.tracing.intrumentation.grpc.GrpcTracingServerInterceptor;
-import io.quarkus.opentelemetry.runtime.tracing.intrumentation.reactivemessaging.ReactiveMessagingTracingEmitterDecorator;
 import io.quarkus.opentelemetry.runtime.tracing.intrumentation.reactivemessaging.ReactiveMessagingTracingIncomingDecorator;
 import io.quarkus.opentelemetry.runtime.tracing.intrumentation.reactivemessaging.ReactiveMessagingTracingOutgoingDecorator;
 import io.quarkus.opentelemetry.runtime.tracing.intrumentation.restclient.OpenTelemetryClientFilter;
@@ -100,7 +99,6 @@ void registerReactiveMessagingMessageDecorator(
         if (capabilities.isPresent(Capability.SMALLRYE_REACTIVE_MESSAGING) && config.instrument().reactiveMessaging()) {
             additionalBeans.produce(new AdditionalBeanBuildItem(ReactiveMessagingTracingOutgoingDecorator.class));
             additionalBeans.produce(new AdditionalBeanBuildItem(ReactiveMessagingTracingIncomingDecorator.class));
-            additionalBeans.produce(new AdditionalBeanBuildItem(ReactiveMessagingTracingEmitterDecorator.class));
         }
     }
 

diff --git a/...me/tracing/intrumentation/reactivemessaging/ReactiveMessagingTracingEmitterDecorator.java b/...me/tracing/intrumentation/reactivemessaging/ReactiveMessagingTracingEmitterDecorator.java
diff --git a/...e/tracing/intrumentation/reactivemessaging/ReactiveMessagingTracingOutgoingDecorator.java b/...e/tracing/intrumentation/reactivemessaging/ReactiveMessagingTracingOutgoingDecorator.java
@@ -31,20 +31,16 @@ public Multi<? extends Message<?>> decorate(Multi<? extends Message<?>> toBeSubs
         Multi<? extends Message<?>> multi = toBeSubscribed;
         if (isConnector) {
             // add TracingMetadata to the outgoing message if it doesn't exist already
-            multi = decorateOutgoing(multi);
+            multi = multi.map(m -> {
+                Message<?> message = m;
+                if (m.getMetadata(TracingMetadata.class).isEmpty()) {
+                    var otelContext = QuarkusContextStorage.INSTANCE.current();
+                    message = m.addMetadata(TracingMetadata.withCurrent(otelContext));
+                }
+                return message;
+            });
         }
         return multi;
     }
 
-    static Multi<? extends Message<?>> decorateOutgoing(Multi<? extends Message<?>> multi) {
-        return multi.map(m -> {
-            Message<?> message = m;
-            if (m.getMetadata(TracingMetadata.class).isEmpty()) {
-                var otelContext = QuarkusContextStorage.INSTANCE.current();
-                message = m.addMetadata(TracingMetadata.withCurrent(otelContext));
-            }
-            return message;
-        });
-    }
-
 }