Merge pull request #2671 from ozangunalp/opentelemetry_version_1.32

OTel upgrade to 1.32.0
smallrye · Jul 2, 2024 · ce97c67 · ce97c67
2 parents 60d365f + 2bd2b54
commit ce97c67
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -90,7 +90,7 @@
 
     <kafka.version>3.7.0</kafka.version>
 
-    <opentelemetry.version>1.31.0-alpha</opentelemetry.version>
+    <opentelemetry.version>1.32.0-alpha</opentelemetry.version>
     <opentelemetry-semconv.version>1.21.0-alpha</opentelemetry-semconv.version>
 
     <smallrye-vertx-mutiny-clients.version>3.13.0</smallrye-vertx-mutiny-clients.version>

diff --git a/...ng-amqp/src/test/java/io/smallrye/reactive/messaging/amqp/TracingAmqpToAppToAmqpTest.java b/...ng-amqp/src/test/java/io/smallrye/reactive/messaging/amqp/TracingAmqpToAppToAmqpTest.java
@@ -148,7 +148,7 @@ public void testFromAmqpToAppToAmqp() {
             assertEquals(PRODUCER, producer.getKind());
             assertEquals("result-topic", producer.getAttributes().get(MESSAGING_DESTINATION_NAME));
             assertEquals("result-topic publish", producer.getName());
-            assertNull(producer.getAttributes().get(MESSAGING_OPERATION));
+            assertEquals("publish", producer.getAttributes().get(MESSAGING_OPERATION));
         });
     }
 

diff --git a/...ka/src/test/java/io/smallrye/reactive/messaging/kafka/tracing/TracingPropagationTest.java b/...ka/src/test/java/io/smallrye/reactive/messaging/kafka/tracing/TracingPropagationTest.java
@@ -113,8 +113,9 @@ public void testFromAppToKafka() {
 
             SpanData span = spans.get(0);
             assertEquals(SpanKind.PRODUCER, span.getKind());
-            assertEquals(4, span.getAttributes().size());
+            assertEquals(5, span.getAttributes().size());
             assertEquals("kafka", span.getAttributes().get(MESSAGING_SYSTEM));
+            assertEquals("publish", span.getAttributes().get(MESSAGING_OPERATION));
             assertEquals(topic, span.getAttributes().get(MESSAGING_DESTINATION_NAME));
             assertEquals("kafka-producer-kafka", span.getAttributes().get(MESSAGING_KAFKA_CLIENT_ID));
             assertEquals(0, span.getAttributes().get(MESSAGING_KAFKA_MESSAGE_OFFSET));
@@ -150,8 +151,9 @@ public void testFromAppToKafkaWithStructuredCloudEvents() {
 
             SpanData span = spans.get(0);
             assertEquals(SpanKind.PRODUCER, span.getKind());
-            assertEquals(4, span.getAttributes().size());
+            assertEquals(5, span.getAttributes().size());
             assertEquals("kafka", span.getAttributes().get(MESSAGING_SYSTEM));
+            assertEquals("publish", span.getAttributes().get(MESSAGING_OPERATION));
             assertEquals(topic, span.getAttributes().get(MESSAGING_DESTINATION_NAME));
             assertEquals("kafka-producer-kafka", span.getAttributes().get(MESSAGING_KAFKA_CLIENT_ID));
             assertEquals(0, span.getAttributes().get(MESSAGING_KAFKA_MESSAGE_OFFSET));
@@ -186,8 +188,9 @@ public void testFromAppToKafkaWithBinaryCloudEvents() {
 
             SpanData span = spans.get(0);
             assertEquals(SpanKind.PRODUCER, span.getKind());
-            assertEquals(4, span.getAttributes().size());
+            assertEquals(5, span.getAttributes().size());
             assertEquals("kafka", span.getAttributes().get(MESSAGING_SYSTEM));
+            assertEquals("publish", span.getAttributes().get(MESSAGING_OPERATION));
             assertEquals(topic, span.getAttributes().get(MESSAGING_DESTINATION_NAME));
             assertEquals("kafka-producer-kafka", span.getAttributes().get(MESSAGING_KAFKA_CLIENT_ID));
             assertEquals(0, span.getAttributes().get(MESSAGING_KAFKA_MESSAGE_OFFSET));
@@ -242,8 +245,9 @@ public void testFromKafkaToAppToKafka() {
             SpanData producer = spans.stream().filter(spanData -> spanData.getParentSpanId().equals(consumer.getSpanId()))
                     .findFirst().get();
             assertEquals(SpanKind.PRODUCER, producer.getKind());
-            assertEquals(4, producer.getAttributes().size());
+            assertEquals(5, producer.getAttributes().size());
             assertEquals("kafka", producer.getAttributes().get(MESSAGING_SYSTEM));
+            assertEquals("publish", producer.getAttributes().get(MESSAGING_OPERATION));
             assertEquals(resultTopic, producer.getAttributes().get(MESSAGING_DESTINATION_NAME));
             assertEquals("kafka-producer-kafka", producer.getAttributes().get(MESSAGING_KAFKA_CLIENT_ID));
             assertEquals(0, producer.getAttributes().get(MESSAGING_KAFKA_MESSAGE_OFFSET));