Skip to content

Commit 8982d17

Browse files
brunobatbrunobat
authored
Merge pull request #31356 from brunobat/bump-otel-1-23
Upgrade to OpenTelemetry v1.23.1 and smallrye-reactive-messaging to v4.4.0
2 parents 0676bb9 + 56f5296 commit 8982d17

File tree

24 files changed

+119
-118
lines changed

24 files changed

+119
-118
lines changed

‎bom/application/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@
3636
<opentracing-jdbc.version>0.2.4</opentracing-jdbc.version>
3737
<opentracing-kafka.version>0.1.15</opentracing-kafka.version>
3838
<opentracing-mongo.version>0.1.5</opentracing-mongo.version>
39-
<opentelemetry.version>1.22.0</opentelemetry.version>
40-
<opentelemetry-alpha.version>1.22.0-alpha</opentelemetry-alpha.version>
41-
<opentelemetry-aws.contrib.version>1.22.0-alpha</opentelemetry-aws.contrib.version>
42-
<opentelemetry-aws-xray.contrib.version>1.22.0</opentelemetry-aws-xray.contrib.version>
39+
<opentelemetry.version>1.23.1</opentelemetry.version>
40+
<opentelemetry-alpha.version>1.23.0-alpha</opentelemetry-alpha.version>
41+
<opentelemetry-aws.contrib.version>1.23.0-alpha</opentelemetry-aws.contrib.version>
42+
<opentelemetry-aws-xray.contrib.version>1.23.0</opentelemetry-aws-xray.contrib.version>
4343
<jaeger.version>1.8.1</jaeger.version>
4444
<quarkus-http.version>5.0.1.Final</quarkus-http.version>
4545
<micrometer.version>1.10.4</micrometer.version><!-- keep in sync with hdrhistogram -->
@@ -67,7 +67,7 @@
6767
<smallrye-reactive-streams-operators.version>1.0.13</smallrye-reactive-streams-operators.version>
6868
<smallrye-reactive-types-converter.version>3.0.0</smallrye-reactive-types-converter.version>
6969
<smallrye-mutiny-vertx-binding.version>3.2.0</smallrye-mutiny-vertx-binding.version>
70-
<smallrye-reactive-messaging.version>4.3.0</smallrye-reactive-messaging.version>
70+
<smallrye-reactive-messaging.version>4.4.0</smallrye-reactive-messaging.version>
7171
<smallrye-stork.version>1.4.1</smallrye-stork.version>
7272
<jakarta.activation.version>2.1.1</jakarta.activation.version>
7373
<jakarta.annotation-api.version>2.1.1</jakarta.annotation-api.version>

‎extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryDevModeTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ void testDevMode() {
2626
//and the hot replacement stuff is not messing things up
2727
RestAssured.when().get("/hello").then()
2828
.statusCode(200)
29-
.body(is("HTTP GET"));
29+
.body(is("GET"));
3030

3131
RestAssured.when().get("/tracer").then()
3232
.statusCode(200)

‎extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryHttpCDILegacyTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ void telemetry() {
5757
List<SpanData> spans = spanExporter.getFinishedSpanItems(2);
5858

5959
SpanData server = getSpanByKindAndParentId(spans, SERVER, "0000000000000000");
60-
assertEquals("/hello", server.getName());
60+
assertEquals("GET /hello", server.getName());
6161
assertEquals(SERVER, server.getKind());
6262
// verify that OpenTelemetryServerFilter took place
6363
assertStringAttribute(server, SemanticAttributes.CODE_NAMESPACE,
@@ -81,7 +81,7 @@ void withSpan() {
8181
List<SpanData> spans = spanExporter.getFinishedSpanItems(3);
8282

8383
final SpanData server = getSpanByKindAndParentId(spans, SERVER, "0000000000000000");
84-
assertEquals("/hello/withSpan", server.getName());
84+
assertEquals("GET /hello/withSpan", server.getName());
8585

8686
final SpanData internalFromBean = getSpanByKindAndParentId(spans, INTERNAL, server.getSpanId());
8787
assertEquals("withSpan", internalFromBean.getName());

‎extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryHttpCDITest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ void telemetry() {
5757
List<SpanData> spans = spanExporter.getFinishedSpanItems(2);
5858

5959
final SpanData server = getSpanByKindAndParentId(spans, SERVER, "0000000000000000");
60-
assertEquals("/hello", server.getName());
60+
assertEquals("GET /hello", server.getName());
6161
// verify that OpenTelemetryServerFilter took place
6262
assertStringAttribute(server, SemanticAttributes.CODE_NAMESPACE,
6363
"io.quarkus.opentelemetry.deployment.OpenTelemetryHttpCDITest$HelloResource");
@@ -79,7 +79,7 @@ void withSpan() {
7979
List<SpanData> spans = spanExporter.getFinishedSpanItems(3);
8080

8181
final SpanData server = getSpanByKindAndParentId(spans, SERVER, "0000000000000000");
82-
assertEquals("/hello/withSpan", server.getName());
82+
assertEquals("GET /hello/withSpan", server.getName());
8383

8484
final SpanData withSpan = getSpanByKindAndParentId(spans, INTERNAL, server.getSpanId());
8585
assertEquals("withSpan", withSpan.getName());

‎extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryMDCTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ void vertx() {
6565
List<MdcEntry> expectedMdcEntries = getExpectedMDCEntries(spans);
6666

6767
final SpanData server = getSpanByKindAndParentId(spans, SERVER, "0000000000000000");
68-
assertEquals("/hello", server.getName());
68+
assertEquals("GET /hello", server.getName());
6969

7070
final SpanData programmatic = getSpanByKindAndParentId(spans, INTERNAL, server.getSpanId());
7171
assertEquals("something", programmatic.getName());

‎extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryResourceTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ void resource() {
4545
List<SpanData> spans = spanExporter.getFinishedSpanItems(1);
4646

4747
final SpanData server = getSpanByKindAndParentId(spans, SERVER, "0000000000000000");
48-
assertEquals("/hello", server.getName());
48+
assertEquals("GET /hello", server.getName());
4949
assertEquals("authservice", server.getResource().getAttribute(AttributeKey.stringKey("service.name")));
5050
assertEquals(config.getRawValue("quarkus.uuid"),
5151
server.getResource().getAttribute(AttributeKey.stringKey("service.instance.id")));

‎extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/instrumentation/RestClientOpenTelemetryTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,13 @@ void client() {
6363
List<SpanData> spans = spanExporter.getFinishedSpanItems(2);
6464

6565
SpanData client = getSpanByKindAndParentId(spans, CLIENT, "0000000000000000");
66-
assertEquals("HTTP GET", client.getName());
66+
assertEquals("GET", client.getName());
6767
assertEquals(HTTP_OK, client.getAttributes().get(HTTP_STATUS_CODE));
6868
assertEquals(HttpMethod.GET, client.getAttributes().get(HTTP_METHOD));
6969
assertEquals(uri.toString() + "hello", client.getAttributes().get(HTTP_URL));
7070

7171
SpanData server = getSpanByKindAndParentId(spans, SERVER, client.getSpanId());
72-
assertEquals("/hello", server.getName());
72+
assertEquals("GET /hello", server.getName());
7373
assertEquals(HTTP_OK, server.getAttributes().get(HTTP_STATUS_CODE));
7474
assertEquals(HttpMethod.GET, server.getAttributes().get(HTTP_METHOD));
7575
assertEquals("/hello", server.getAttributes().get(HTTP_ROUTE));
@@ -88,7 +88,7 @@ void spanNameWithoutQueryString() {
8888

8989
SpanData client = getSpanByKindAndParentId(spans, CLIENT, "0000000000000000");
9090
assertEquals(CLIENT, client.getKind());
91-
assertEquals("HTTP GET", client.getName());
91+
assertEquals("GET", client.getName());
9292
assertEquals(HTTP_OK, client.getAttributes().get(HTTP_STATUS_CODE));
9393
assertEquals(HttpMethod.GET, client.getAttributes().get(HTTP_METHOD));
9494
assertEquals(uri.toString() + "hello?query=1", client.getAttributes().get(HTTP_URL));
@@ -107,7 +107,7 @@ void urlWithoutAuthentication() {
107107

108108
SpanData client = getSpanByKindAndParentId(spans, CLIENT, "0000000000000000");
109109
assertEquals(CLIENT, client.getKind());
110-
assertEquals("HTTP GET", client.getName());
110+
assertEquals("GET", client.getName());
111111
assertEquals(HTTP_OK, client.getAttributes().get(HTTP_STATUS_CODE));
112112
assertEquals(HttpMethod.GET, client.getAttributes().get(HTTP_METHOD));
113113
assertEquals(uri.toString() + "hello?query=1", client.getAttributes().get(HTTP_URL));
@@ -124,14 +124,14 @@ void path() {
124124

125125
SpanData client = getSpanByKindAndParentId(spans, CLIENT, "0000000000000000");
126126
assertEquals(CLIENT, client.getKind());
127-
assertEquals("HTTP GET", client.getName());
127+
assertEquals("GET", client.getName());
128128
assertEquals(HTTP_OK, client.getAttributes().get(HTTP_STATUS_CODE));
129129
assertEquals(HttpMethod.GET, client.getAttributes().get(HTTP_METHOD));
130130
assertEquals(uri.toString() + "hello/another", client.getAttributes().get(HTTP_URL));
131131

132132
SpanData server = getSpanByKindAndParentId(spans, SERVER, client.getSpanId());
133133
assertEquals(SERVER, server.getKind());
134-
assertEquals("/hello/{path}", server.getName());
134+
assertEquals("GET /hello/{path}", server.getName());
135135
assertEquals(HTTP_OK, server.getAttributes().get(HTTP_STATUS_CODE));
136136
assertEquals(HttpMethod.GET, server.getAttributes().get(HTTP_METHOD));
137137
assertEquals("/hello/{path}", server.getAttributes().get(HTTP_ROUTE));

‎extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/instrumentation/VertxClientOpenTelemetryTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,14 +69,14 @@ void client() throws Exception {
6969
List<SpanData> spans = spanExporter.getFinishedSpanItems(2);
7070

7171
SpanData client = getSpanByKindAndParentId(spans, CLIENT, "0000000000000000");
72-
assertEquals("HTTP GET", client.getName());
72+
assertEquals("GET", client.getName());
7373
assertEquals(HTTP_OK, client.getAttributes().get(HTTP_STATUS_CODE));
7474
assertEquals(HttpMethod.GET, client.getAttributes().get(HTTP_METHOD));
7575
assertEquals(uri.toString() + "hello", client.getAttributes().get(HTTP_URL));
7676

7777
SpanData server = getSpanByKindAndParentId(spans, SERVER, client.getSpanId());
7878
assertEquals(SERVER, server.getKind());
79-
assertEquals("/hello", server.getName());
79+
assertEquals("GET /hello", server.getName());
8080
assertEquals(HTTP_OK, server.getAttributes().get(HTTP_STATUS_CODE));
8181
assertEquals(HttpMethod.GET, server.getAttributes().get(HTTP_METHOD));
8282
assertEquals("/hello", server.getAttributes().get(HTTP_ROUTE));
@@ -101,14 +101,14 @@ void path() throws Exception {
101101

102102
SpanData client = getSpanByKindAndParentId(spans, CLIENT, "0000000000000000");
103103
assertEquals(CLIENT, client.getKind());
104-
assertEquals("HTTP GET", client.getName());
104+
assertEquals("GET", client.getName());
105105
assertEquals(HTTP_OK, client.getAttributes().get(HTTP_STATUS_CODE));
106106
assertEquals(HttpMethod.GET, client.getAttributes().get(HTTP_METHOD));
107107
assertEquals(uri.toString() + "hello/naruto", client.getAttributes().get(HTTP_URL));
108108

109109
SpanData server = getSpanByKindAndParentId(spans, SERVER, client.getSpanId());
110110
assertEquals(SERVER, server.getKind());
111-
assertEquals("/hello/:name", server.getName());
111+
assertEquals("GET /hello/:name", server.getName());
112112
assertEquals(HTTP_OK, server.getAttributes().get(HTTP_STATUS_CODE));
113113
assertEquals(HttpMethod.GET, server.getAttributes().get(HTTP_METHOD));
114114
assertEquals("/hello/:name", server.getAttributes().get(HTTP_ROUTE));

‎extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/instrumentation/VertxOpenTelemetryTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ void spanNameWithoutQueryString() {
107107
List<SpanData> spans = spanExporter.getFinishedSpanItems(2);
108108

109109
final SpanData server = getSpanByKindAndParentId(spans, SERVER, "0000000000000000");
110-
assertEquals("/tracer", server.getName());
110+
assertEquals("GET /tracer", server.getName());
111111
assertEquals(HTTP_OK, server.getAttributes().get(HTTP_STATUS_CODE));
112112
assertEquals("1.1", server.getAttributes().get(HTTP_FLAVOR));
113113
assertEquals("/tracer?id=1", server.getAttributes().get(HTTP_TARGET));
@@ -134,7 +134,7 @@ void spanPath() {
134134
List<SpanData> spans = spanExporter.getFinishedSpanItems(1);
135135
assertEquals(1, spans.size());
136136

137-
assertEquals("/hello/:name", spans.get(0).getName());
137+
assertEquals("GET /hello/:name", spans.get(0).getName());
138138
assertEquals(HTTP_OK, spans.get(0).getAttributes().get(HTTP_STATUS_CODE));
139139
assertEquals(GET.toString(), spans.get(0).getAttributes().get(HTTP_METHOD));
140140
assertEquals("/hello/:name", spans.get(0).getAttributes().get(HTTP_ROUTE));
@@ -147,7 +147,7 @@ void notFound() {
147147
List<SpanData> spans = spanExporter.getFinishedSpanItems(1);
148148
assertEquals(1, spans.size());
149149

150-
assertEquals("/*", spans.get(0).getName());
150+
assertEquals("GET /*", spans.get(0).getName());
151151
assertEquals("/*", spans.get(0).getAttributes().get(HTTP_ROUTE));
152152
assertEquals(HTTP_NOT_FOUND, spans.get(0).getAttributes().get(HTTP_STATUS_CODE));
153153
}
@@ -162,7 +162,7 @@ void notFoundPath() {
162162
List<SpanData> spans = spanExporter.getFinishedSpanItems(1);
163163
assertEquals(1, spans.size());
164164

165-
assertEquals("/hello/:name", spans.get(0).getName());
165+
assertEquals("GET /hello/:name", spans.get(0).getName());
166166
assertEquals(HTTP_NOT_FOUND, spans.get(0).getAttributes().get(HTTP_STATUS_CODE));
167167
assertEquals(GET.toString(), spans.get(0).getAttributes().get(HTTP_METHOD));
168168
assertEquals("/hello/:name", spans.get(0).getAttributes().get(HTTP_ROUTE));

‎extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/intrumentation/grpc/GrpcAttributesGetter.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@ enum GrpcAttributesGetter implements RpcAttributesGetter<GrpcRequest> {
66
INSTANCE;
77

88
@Override
9-
public String system(final GrpcRequest grpcRequest) {
9+
public String getSystem(final GrpcRequest grpcRequest) {
1010
return "grpc";
1111
}
1212

1313
@Override
14-
public String service(final GrpcRequest grpcRequest) {
14+
public String getService(final GrpcRequest grpcRequest) {
1515
return grpcRequest.getMethodDescriptor().getServiceName();
1616
}
1717

1818
@Override
19-
public String method(final GrpcRequest grpcRequest) {
19+
public String getMethod(final GrpcRequest grpcRequest) {
2020
return grpcRequest.getMethodDescriptor().getBareMethodName();
2121
}
2222
}

0 commit comments

Comments
 (0)