Skip to content

Commit 0e26e4e

Browse files
ozangunalpozangunalp
authored
Merge pull request #2109 from ozangunalp/bump-otel-1-23_3.x
Upgrade to OTel 1.23
2 parents 4fd7603 + 04d0df7 commit 0e26e4e

File tree

4 files changed

+15
-17
lines changed

4 files changed

+15
-17
lines changed

‎pom.xml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090

9191
<kafka.version>3.3.2</kafka.version>
9292

93-
<opentelemetry.version>1.22.1-alpha</opentelemetry.version>
93+
<opentelemetry.version>1.23.0-alpha</opentelemetry.version>
9494

9595
<smallrye-vertx-mutiny-clients.version>2.26.0</smallrye-vertx-mutiny-clients.version>
9696
<smallrye-reactive-converters.version>2.6.0</smallrye-reactive-converters.version>
@@ -118,6 +118,8 @@
118118
<revapi-reporter-json.version>0.5.0</revapi-reporter-json.version>
119119
<revapi-reporter-text.version>0.15.0</revapi-reporter-text.version>
120120
<revapi.skip>true</revapi.skip>
121+
122+
<version.impsort.plugin>1.8.0</version.impsort.plugin>
121123
</properties>
122124

123125
<modules>

‎smallrye-reactive-messaging-amqp/src/test/java/io/smallrye/reactive/messaging/amqp/TracingAmqpToAppToAmqpTest.java‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,9 @@
22

33
import static io.opentelemetry.api.trace.SpanKind.CONSUMER;
44
import static io.opentelemetry.api.trace.SpanKind.PRODUCER;
5-
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.MESSAGING_DESTINATION;
65
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.MESSAGING_DESTINATION_KIND;
6+
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.MESSAGING_DESTINATION_NAME;
77
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.MESSAGING_OPERATION;
8-
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.MESSAGING_PROTOCOL;
9-
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.MESSAGING_PROTOCOL_VERSION;
108
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.MESSAGING_SYSTEM;
119
import static java.util.stream.Collectors.toList;
1210
import static org.assertj.core.api.Assertions.assertThat;
@@ -130,18 +128,16 @@ public void testFromAmqpToAppToAmqp() {
130128
SpanData consumer = parentSpans.get(0);
131129
assertEquals(CONSUMER, consumer.getKind());
132130
assertEquals("AMQP 1.0", consumer.getAttributes().get(MESSAGING_SYSTEM));
133-
assertEquals("AMQP", consumer.getAttributes().get(MESSAGING_PROTOCOL));
134-
assertEquals("1.0", consumer.getAttributes().get(MESSAGING_PROTOCOL_VERSION));
135131
assertEquals("queue", consumer.getAttributes().get(MESSAGING_DESTINATION_KIND));
136-
assertEquals("parent-topic", consumer.getAttributes().get(MESSAGING_DESTINATION));
132+
assertEquals("parent-topic", consumer.getAttributes().get(MESSAGING_DESTINATION_NAME));
137133
assertEquals("parent-topic receive", consumer.getName());
138134
assertEquals("receive", consumer.getAttributes().get(MESSAGING_OPERATION));
139135

140136
SpanData producer = spans.stream().filter(span -> span.getParentSpanId().equals(consumer.getSpanId())).findFirst()
141137
.get();
142138
assertEquals(PRODUCER, producer.getKind());
143139
assertEquals("queue", producer.getAttributes().get(MESSAGING_DESTINATION_KIND));
144-
assertEquals("result-topic", producer.getAttributes().get(MESSAGING_DESTINATION));
140+
assertEquals("result-topic", producer.getAttributes().get(MESSAGING_DESTINATION_NAME));
145141
assertEquals("result-topic send", producer.getName());
146142
assertNull(producer.getAttributes().get(MESSAGING_OPERATION));
147143
});

‎smallrye-reactive-messaging-kafka/src/test/java/io/smallrye/reactive/messaging/kafka/tracing/TracingPropagationTest.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package io.smallrye.reactive.messaging.kafka.tracing;
22

3-
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.MESSAGING_DESTINATION;
43
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.MESSAGING_DESTINATION_KIND;
4+
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.MESSAGING_DESTINATION_NAME;
55
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.MESSAGING_SYSTEM;
66
import static io.smallrye.reactive.messaging.kafka.companion.RecordQualifiers.until;
77
import static java.util.stream.Collectors.toList;
@@ -113,7 +113,7 @@ public void testFromAppToKafka() {
113113
assertEquals(SpanKind.PRODUCER, span.getKind());
114114
assertEquals("kafka", span.getAttributes().get(MESSAGING_SYSTEM));
115115
assertEquals("topic", span.getAttributes().get(MESSAGING_DESTINATION_KIND));
116-
assertEquals(topic, span.getAttributes().get(MESSAGING_DESTINATION));
116+
assertEquals(topic, span.getAttributes().get(MESSAGING_DESTINATION_NAME));
117117
assertEquals(topic + " send", span.getName());
118118
});
119119
}
@@ -147,7 +147,7 @@ public void testFromAppToKafkaWithStructuredCloudEvents() {
147147
assertEquals(SpanKind.PRODUCER, span.getKind());
148148
assertEquals("kafka", span.getAttributes().get(MESSAGING_SYSTEM));
149149
assertEquals("topic", span.getAttributes().get(MESSAGING_DESTINATION_KIND));
150-
assertEquals(topic, span.getAttributes().get(MESSAGING_DESTINATION));
150+
assertEquals(topic, span.getAttributes().get(MESSAGING_DESTINATION_NAME));
151151
assertEquals(topic + " send", span.getName());
152152
});
153153
}
@@ -181,7 +181,7 @@ public void testFromAppToKafkaWithBinaryCloudEvents() {
181181
assertEquals(SpanKind.PRODUCER, span.getKind());
182182
assertEquals("kafka", span.getAttributes().get(MESSAGING_SYSTEM));
183183
assertEquals("topic", span.getAttributes().get(MESSAGING_DESTINATION_KIND));
184-
assertEquals(topic, span.getAttributes().get(MESSAGING_DESTINATION));
184+
assertEquals(topic, span.getAttributes().get(MESSAGING_DESTINATION_NAME));
185185
assertEquals(topic + " send", span.getName());
186186
});
187187
}
@@ -223,15 +223,15 @@ public void testFromKafkaToAppToKafka() {
223223
SpanData consumer = parentSpans.get(0);
224224
assertEquals(SpanKind.CONSUMER, consumer.getKind());
225225
assertEquals("topic", consumer.getAttributes().get(MESSAGING_DESTINATION_KIND));
226-
assertEquals(parentTopic, consumer.getAttributes().get(MESSAGING_DESTINATION));
226+
assertEquals(parentTopic, consumer.getAttributes().get(MESSAGING_DESTINATION_NAME));
227227
assertEquals(parentTopic + " receive", consumer.getName());
228228

229229
SpanData producer = spans.stream().filter(spanData -> spanData.getParentSpanId().equals(consumer.getSpanId()))
230230
.findFirst().get();
231231
assertEquals(SpanKind.PRODUCER, producer.getKind());
232232
assertEquals("kafka", producer.getAttributes().get(MESSAGING_SYSTEM));
233233
assertEquals("topic", producer.getAttributes().get(MESSAGING_DESTINATION_KIND));
234-
assertEquals(resultTopic, producer.getAttributes().get(MESSAGING_DESTINATION));
234+
assertEquals(resultTopic, producer.getAttributes().get(MESSAGING_DESTINATION_NAME));
235235
assertEquals(resultTopic + " send", producer.getName());
236236
});
237237
}
@@ -282,7 +282,7 @@ public void testFromKafkaToAppWithParentSpan() {
282282
.findFirst().get();
283283
assertEquals("kafka", consumer.getAttributes().get(MESSAGING_SYSTEM));
284284
assertEquals("topic", consumer.getAttributes().get(MESSAGING_DESTINATION_KIND));
285-
assertEquals(parentTopic, consumer.getAttributes().get(MESSAGING_DESTINATION));
285+
assertEquals(parentTopic, consumer.getAttributes().get(MESSAGING_DESTINATION_NAME));
286286
assertEquals(parentTopic + " receive", consumer.getName());
287287
});
288288
}

‎smallrye-reactive-messaging-rabbitmq/src/test/java/io/smallrye/reactive/messaging/rabbitmq/TracingTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package io.smallrye.reactive.messaging.rabbitmq;
22

3-
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.MESSAGING_DESTINATION;
43
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.MESSAGING_DESTINATION_KIND;
4+
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.MESSAGING_DESTINATION_NAME;
55
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.MESSAGING_PROTOCOL;
66
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.MESSAGING_PROTOCOL_VERSION;
77
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.MESSAGING_SYSTEM;
@@ -98,7 +98,7 @@ void incoming() {
9898
assertNull(consumer.getAttributes().get(MESSAGING_PROTOCOL));
9999
assertNull(consumer.getAttributes().get(MESSAGING_PROTOCOL_VERSION));
100100
assertEquals("queue", consumer.getAttributes().get(MESSAGING_DESTINATION_KIND));
101-
assertEquals(queue, consumer.getAttributes().get(MESSAGING_DESTINATION));
101+
assertEquals(queue, consumer.getAttributes().get(MESSAGING_DESTINATION_NAME));
102102
assertEquals(queue + " receive", consumer.getName());
103103
});
104104
}

0 commit comments

Comments
 (0)