open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix api misuse in vert.x reactive tests (#4815)

This commit is contained in:
Lauri Tulmin 2021-12-06 19:26:43 +02:00 committed by GitHub
parent f203ec9837
commit 7b26133815
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 8 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
instrumentation/vertx-reactive-3.5/javaagent/src/latestDepTest/groovy/client/VertxRxCircuitBreakerWebClientTest.groovy
View File

@ -40,7 +40,7 @@ class VertxRxCircuitBreakerWebClientTest extends HttpClientTest<HttpRequest<?>>
@Override @Override
HttpRequest<?> buildRequest(String method, URI uri, Map<String, String> headers) { HttpRequest<?> buildRequest(String method, URI uri, Map<String, String> headers) {
def request = client.request(HttpMethod.valueOf(method), getPort(uri), uri.host, "$uri") def request = client.requestAbs(HttpMethod.valueOf(method), "$uri")
headers.each { request.putHeader(it.key, it.value) } headers.each { request.putHeader(it.key, it.value) }
return request return request
} }

2
instrumentation/vertx-reactive-3.5/javaagent/src/latestDepTest/groovy/client/VertxRxWebClientTest.groovy
View File

@ -31,7 +31,7 @@ class VertxRxWebClientTest extends HttpClientTest<HttpRequest<Buffer>> implement
@Override @Override
HttpRequest<Buffer> buildRequest(String method, URI uri, Map<String, String> headers) { HttpRequest<Buffer> buildRequest(String method, URI uri, Map<String, String> headers) {
def request = client.request(HttpMethod.valueOf(method), getPort(uri), uri.host, "$uri") def request = client.requestAbs(HttpMethod.valueOf(method), "$uri")
headers.each { request.putHeader(it.key, it.value) } headers.each { request.putHeader(it.key, it.value) }
return request return request
} }

14
instrumentation/vertx-reactive-3.5/javaagent/src/latestDepTest/java/client/VertxRxSingleConnection.java
View File

@ -14,11 +14,8 @@ import io.vertx.reactivex.core.buffer.Buffer;
import io.vertx.reactivex.ext.web.client.HttpRequest; import io.vertx.reactivex.ext.web.client.HttpRequest;
import io.vertx.reactivex.ext.web.client.HttpResponse; import io.vertx.reactivex.ext.web.client.HttpResponse;
import io.vertx.reactivex.ext.web.client.WebClient; import io.vertx.reactivex.ext.web.client.WebClient;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
import java.util.concurrent.ExecutionException;
public class VertxRxSingleConnection implements SingleConnection { public class VertxRxSingleConnection implements SingleConnection {
private final WebClient webClient; private final WebClient webClient;
@ -41,17 +38,10 @@ public class VertxRxSingleConnection implements SingleConnection {
} }
@Override @Override
public int doRequest(String path, Map<String, String> headers) throws ExecutionException { public int doRequest(String path, Map<String, String> headers) {
String requestId = Objects.requireNonNull(headers.get(REQUEST_ID_HEADER)); String requestId = Objects.requireNonNull(headers.get(REQUEST_ID_HEADER));
String url; HttpRequest<Buffer> request = webClient.request(HttpMethod.GET, port, host, path);
try {
url = new URL("http", host, port, path).toString();
} catch (MalformedURLException e) {
throw new ExecutionException(e);
}
HttpRequest<Buffer> request = webClient.request(HttpMethod.GET, port, host, url);
headers.forEach(request::putHeader); headers.forEach(request::putHeader);
HttpResponse<?> response = fetchResponse(request); HttpResponse<?> response = fetchResponse(request);

2
instrumentation/vertx-reactive-3.5/javaagent/src/version35Test/groovy/client/VertxRxCircuitBreakerWebClientTest.groovy
View File

@ -41,7 +41,7 @@ class VertxRxCircuitBreakerWebClientTest extends HttpClientTest<HttpRequest<?>>
@Override @Override
HttpRequest<?> buildRequest(String method, URI uri, Map<String, String> headers) { HttpRequest<?> buildRequest(String method, URI uri, Map<String, String> headers) {
def request = client.request(HttpMethod.valueOf(method), getPort(uri), uri.host, "$uri") def request = client.requestAbs(HttpMethod.valueOf(method), "$uri")
headers.each { request.putHeader(it.key, it.value) } headers.each { request.putHeader(it.key, it.value) }
return request return request
} }

2
instrumentation/vertx-reactive-3.5/javaagent/src/version35Test/groovy/client/VertxRxWebClientTest.groovy
View File

@ -32,7 +32,7 @@ class VertxRxWebClientTest extends HttpClientTest<HttpRequest<Buffer>> implement
@Override @Override
HttpRequest<Buffer> buildRequest(String method, URI uri, Map<String, String> headers) { HttpRequest<Buffer> buildRequest(String method, URI uri, Map<String, String> headers) {
def request = client.request(HttpMethod.valueOf(method), getPort(uri), uri.host, "$uri") def request = client.requestAbs(HttpMethod.valueOf(method), "$uri")
headers.each { request.putHeader(it.key, it.value) } headers.each { request.putHeader(it.key, it.value) }
return request return request
} }

14
instrumentation/vertx-reactive-3.5/javaagent/src/version35Test/java/client/VertxRxSingleConnection.java
View File

@ -14,11 +14,8 @@ import io.vertx.reactivex.core.buffer.Buffer;
import io.vertx.reactivex.ext.web.client.HttpRequest; import io.vertx.reactivex.ext.web.client.HttpRequest;
import io.vertx.reactivex.ext.web.client.HttpResponse; import io.vertx.reactivex.ext.web.client.HttpResponse;
import io.vertx.reactivex.ext.web.client.WebClient; import io.vertx.reactivex.ext.web.client.WebClient;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
import java.util.concurrent.ExecutionException;
public class VertxRxSingleConnection implements SingleConnection { public class VertxRxSingleConnection implements SingleConnection {
private final WebClient webClient; private final WebClient webClient;
@ -41,17 +38,10 @@ public class VertxRxSingleConnection implements SingleConnection {
} }
@Override @Override
public int doRequest(String path, Map<String, String> headers) throws ExecutionException { public int doRequest(String path, Map<String, String> headers) {
String requestId = Objects.requireNonNull(headers.get(REQUEST_ID_HEADER)); String requestId = Objects.requireNonNull(headers.get(REQUEST_ID_HEADER));
String url; HttpRequest<Buffer> request = webClient.request(HttpMethod.GET, port, host, path);
try {
url = new URL("http", host, port, path).toString();
} catch (MalformedURLException e) {
throw new ExecutionException(e);
}
HttpRequest<Buffer> request = webClient.request(HttpMethod.GET, port, host, url);
headers.forEach(request::putHeader); headers.forEach(request::putHeader);
HttpResponse<?> response = fetchResponse(request); HttpResponse<?> response = fetchResponse(request);