Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump 2.16 branch to OTel 1.23 and SR reactive messaging 3.24 #31840

Closed
wants to merge 2 commits into from
Closed

Bump 2.16 branch to OTel 1.23 and SR reactive messaging 3.24 #31840

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ca3a7c7
Bump otel 1.23 on 2.16 branch
brunobat Mar 14, 2023
718b181
Bump Reactive Messaging version to 3.24.0
ozangunalp Mar 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions bom/application/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@
<opentracing-jdbc.version>0.2.4</opentracing-jdbc.version>
<opentracing-kafka.version>0.1.15</opentracing-kafka.version>
<opentracing-mongo.version>0.1.5</opentracing-mongo.version>
<opentelemetry.version>1.21.0</opentelemetry.version>
<opentelemetry-alpha.version>1.21.0-alpha</opentelemetry-alpha.version>
<opentelemetry-aws.contrib.version>1.20.1-alpha</opentelemetry-aws.contrib.version>
<opentelemetry-aws-xray.contrib.version>1.20.1</opentelemetry-aws-xray.contrib.version>
<opentelemetry.version>1.23.1</opentelemetry.version>
<opentelemetry-alpha.version>1.23.0-alpha</opentelemetry-alpha.version>
<opentelemetry-aws.contrib.version>1.23.0-alpha</opentelemetry-aws.contrib.version>
<opentelemetry-aws-xray.contrib.version>1.23.0</opentelemetry-aws-xray.contrib.version>
<jaeger.version>1.8.1</jaeger.version>
<quarkus-http.version>4.2.1</quarkus-http.version>
<micrometer.version>1.10.2</micrometer.version><!-- keep in sync with hdrhistogram -->
Expand Down Expand Up @@ -55,7 +55,7 @@
<smallrye-reactive-streams-operators.version>1.0.13</smallrye-reactive-streams-operators.version>
<smallrye-reactive-types-converter.version>2.7.0</smallrye-reactive-types-converter.version>
<smallrye-mutiny-vertx-binding.version>2.30.1</smallrye-mutiny-vertx-binding.version>
<smallrye-reactive-messaging.version>3.22.1</smallrye-reactive-messaging.version>
<smallrye-reactive-messaging.version>3.24.0</smallrye-reactive-messaging.version>
<smallrye-stork.version>1.4.2</smallrye-stork.version>
<jakarta.activation.version>1.2.1</jakarta.activation.version>
<jakarta.annotation-api.version>1.3.5</jakarta.annotation-api.version>
Expand Down
2 changes: 1 addition & 1 deletion ...eployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryDevModeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ void testDevMode() {
//and the hot replacement stuff is not messing things up
RestAssured.when().get("/hello").then()
.statusCode(200)
.body(is("HTTP GET"));
.body(is("GET"));

RestAssured.when().get("/tracer").then()
.statusCode(200)
Expand Down
4 changes: 2 additions & 2 deletions ...ent/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryHttpCDILegacyTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ void telemetry() {
List<SpanData> spans = spanExporter.getFinishedSpanItems(2);

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

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

final SpanData internalFromBean = getSpanByKindAndParentId(spans, INTERNAL, server.getSpanId());
assertEquals("withSpan", internalFromBean.getName());
Expand Down
4 changes: 2 additions & 2 deletions ...eployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryHttpCDITest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ void telemetry() {
List<SpanData> spans = spanExporter.getFinishedSpanItems(2);

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

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

final SpanData withSpan = getSpanByKindAndParentId(spans, INTERNAL, server.getSpanId());
assertEquals("withSpan", withSpan.getName());
Expand Down
2 changes: 1 addition & 1 deletion ...ry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryMDCTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ void vertx() {
List<MdcEntry> expectedMdcEntries = getExpectedMDCEntries(spans);

final SpanData server = getSpanByKindAndParentId(spans, SERVER, "0000000000000000");
assertEquals("/hello", server.getName());
assertEquals("GET /hello", server.getName());

final SpanData programmatic = getSpanByKindAndParentId(spans, INTERNAL, server.getSpanId());
assertEquals("something", programmatic.getName());
Expand Down
2 changes: 1 addition & 1 deletion ...ployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryResourceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ void resource() {
List<SpanData> spans = spanExporter.getFinishedSpanItems(1);

final SpanData server = getSpanByKindAndParentId(spans, SERVER, "0000000000000000");
assertEquals("/hello", server.getName());
assertEquals("GET /hello", server.getName());
assertEquals("authservice", server.getResource().getAttribute(AttributeKey.stringKey("service.name")));
assertEquals(config.getRawValue("quarkus.uuid"),
server.getResource().getAttribute(AttributeKey.stringKey("service.instance.id")));
Expand Down
12 changes: 6 additions & 6 deletions ...java/io/quarkus/opentelemetry/deployment/instrumentation/RestClientOpenTelemetryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,13 @@ void client() {
List<SpanData> spans = spanExporter.getFinishedSpanItems(2);

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

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

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

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

SpanData client = getSpanByKindAndParentId(spans, CLIENT, "0000000000000000");
assertEquals(CLIENT, client.getKind());
assertEquals("HTTP GET", client.getName());
assertEquals("GET", client.getName());
assertEquals(HTTP_OK, client.getAttributes().get(HTTP_STATUS_CODE));
assertEquals(HttpMethod.GET, client.getAttributes().get(HTTP_METHOD));
assertEquals(uri.toString() + "hello/another", client.getAttributes().get(HTTP_URL));

SpanData server = getSpanByKindAndParentId(spans, SERVER, client.getSpanId());
assertEquals(SERVER, server.getKind());
assertEquals("/hello/{path}", server.getName());
assertEquals("GET /hello/{path}", server.getName());
assertEquals(HTTP_OK, server.getAttributes().get(HTTP_STATUS_CODE));
assertEquals(HttpMethod.GET, server.getAttributes().get(HTTP_METHOD));
assertEquals("/hello/{path}", server.getAttributes().get(HTTP_ROUTE));
Expand Down
8 changes: 4 additions & 4 deletions ...ava/io/quarkus/opentelemetry/deployment/instrumentation/VertxClientOpenTelemetryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,14 +69,14 @@ void client() throws Exception {
List<SpanData> spans = spanExporter.getFinishedSpanItems(2);

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

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

SpanData client = getSpanByKindAndParentId(spans, CLIENT, "0000000000000000");
assertEquals(CLIENT, client.getKind());
assertEquals("HTTP GET", client.getName());
assertEquals("GET", client.getName());
assertEquals(HTTP_OK, client.getAttributes().get(HTTP_STATUS_CODE));
assertEquals(HttpMethod.GET, client.getAttributes().get(HTTP_METHOD));
assertEquals(uri.toString() + "hello/naruto", client.getAttributes().get(HTTP_URL));

SpanData server = getSpanByKindAndParentId(spans, SERVER, client.getSpanId());
assertEquals(SERVER, server.getKind());
assertEquals("/hello/:name", server.getName());
assertEquals("GET /hello/:name", server.getName());
assertEquals(HTTP_OK, server.getAttributes().get(HTTP_STATUS_CODE));
assertEquals(HttpMethod.GET, server.getAttributes().get(HTTP_METHOD));
assertEquals("/hello/:name", server.getAttributes().get(HTTP_ROUTE));
Expand Down
8 changes: 4 additions & 4 deletions ...test/java/io/quarkus/opentelemetry/deployment/instrumentation/VertxOpenTelemetryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ void spanNameWithoutQueryString() {
List<SpanData> spans = spanExporter.getFinishedSpanItems(2);

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

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

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

assertEquals("/hello/:name", spans.get(0).getName());
assertEquals("GET /hello/:name", spans.get(0).getName());
assertEquals(HTTP_NOT_FOUND, spans.get(0).getAttributes().get(HTTP_STATUS_CODE));
assertEquals(GET.toString(), spans.get(0).getAttributes().get(HTTP_METHOD));
assertEquals("/hello/:name", spans.get(0).getAttributes().get(HTTP_ROUTE));
Expand Down
6 changes: 3 additions & 3 deletions ...va/io/quarkus/opentelemetry/runtime/tracing/intrumentation/grpc/GrpcAttributesGetter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@ enum GrpcAttributesGetter implements RpcAttributesGetter<GrpcRequest> {
INSTANCE;

@Override
public String system(final GrpcRequest grpcRequest) {
public String getSystem(final GrpcRequest grpcRequest) {
return "grpc";
}

@Override
public String service(final GrpcRequest grpcRequest) {
public String getService(final GrpcRequest grpcRequest) {
return grpcRequest.getMethodDescriptor().getServiceName();
}

@Override
public String method(final GrpcRequest grpcRequest) {
public String getMethod(final GrpcRequest grpcRequest) {
return grpcRequest.getMethodDescriptor().getBareMethodName();
}
}
6 changes: 3 additions & 3 deletions ...arkus/opentelemetry/runtime/tracing/intrumentation/grpc/GrpcTracingServerInterceptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,17 +66,17 @@ public <ReqT, RespT> ServerCall.Listener<ReqT> interceptCall(

private static class GrpcServerNetServerAttributesGetter extends InetSocketAddressNetServerAttributesGetter<GrpcRequest> {
@Override
public String transport(final GrpcRequest grpcRequest) {
public String getTransport(final GrpcRequest grpcRequest) {
return SemanticAttributes.NetTransportValues.IP_TCP;
}

@Override
public String hostName(GrpcRequest grpcRequest) {
public String getHostName(GrpcRequest grpcRequest) {
return null;
}

@Override
public Integer hostPort(GrpcRequest grpcRequest) {
public Integer getHostPort(GrpcRequest grpcRequest) {
return null;
}

Expand Down
12 changes: 6 additions & 6 deletions ...us/opentelemetry/runtime/tracing/intrumentation/restclient/OpenTelemetryClientFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ private static class ClientAttributesExtractor
implements HttpClientAttributesGetter<ClientRequestContext, ClientResponseContext> {

@Override
public String url(final ClientRequestContext request) {
public String getUrl(final ClientRequestContext request) {
URI uri = request.getUri();
if (uri.getUserInfo() != null) {
return UriBuilder.fromUri(uri).userInfo(null).build().toString();
Expand All @@ -152,28 +152,28 @@ public String url(final ClientRequestContext request) {
}

@Override
public String flavor(final ClientRequestContext request, final ClientResponseContext response) {
public String getFlavor(final ClientRequestContext request, final ClientResponseContext response) {
return null;
}

@Override
public String method(final ClientRequestContext request) {
public String getMethod(final ClientRequestContext request) {
return request.getMethod();
}

@Override
public List<String> requestHeader(final ClientRequestContext request, final String name) {
public List<String> getRequestHeader(final ClientRequestContext request, final String name) {
return request.getStringHeaders().getOrDefault(name, emptyList());
}

@Override
public Integer statusCode(ClientRequestContext clientRequestContext,
public Integer getStatusCode(ClientRequestContext clientRequestContext,
ClientResponseContext clientResponseContext, Throwable error) {
return clientResponseContext.getStatus();
}

@Override
public List<String> responseHeader(final ClientRequestContext request, final ClientResponseContext response,
public List<String> getResponseHeader(final ClientRequestContext request, final ClientResponseContext response,
final String name) {
return response.getHeaders().getOrDefault(name, emptyList());
}
Expand Down
22 changes: 11 additions & 11 deletions ...s/opentelemetry/runtime/tracing/intrumentation/vertx/EventBusInstrumenterVertxTracer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,57 +90,57 @@ private enum EventBusAttributesGetter implements MessagingAttributesGetter<Messa
INSTANCE;

@Override
public String system(final Message message) {
public String getSystem(final Message message) {
return "vert.x";
}

@Override
public String destinationKind(final Message message) {
public String getDestinationKind(final Message message) {
return message.isSend() ? "queue" : "topic";
}

@Override
public String destination(final Message message) {
public String getDestination(final Message message) {
return message.address();
}

@Override
public boolean temporaryDestination(final Message message) {
public boolean isTemporaryDestination(final Message message) {
return false;
}

@Override
public String protocol(final Message message) {
public String getProtocol(final Message message) {
return null;
}

@Override
public String protocolVersion(final Message message) {
public String getProtocolVersion(final Message message) {
return "4.0";
}

@Override
public String url(final Message message) {
public String getUrl(final Message message) {
return null;
}

@Override
public String conversationId(final Message message) {
public String getConversationId(final Message message) {
return message.replyAddress();
}

@Override
public Long messagePayloadSize(final Message message) {
public Long getMessagePayloadSize(final Message message) {
return null;
}

@Override
public Long messagePayloadCompressedSize(final Message message) {
public Long getMessagePayloadCompressedSize(final Message message) {
return null;
}

@Override
public String messageId(final Message message, final Message message2) {
public String getMessageId(final Message message, final Message message2) {
return null;
}
}
Expand Down
Loading