From de7eaa0fe6d198b644ca8721de05aad8e60349a4 Mon Sep 17 00:00:00 2001 From: Lauri Tulmin Date: Sat, 12 Jun 2021 03:16:34 +0300 Subject: [PATCH] Enable https tests (#3258) --- .../test/groovy/AsyncHttpClientTest.groovy | 5 -- .../test/groovy/AsyncHttpClientTest.groovy | 5 -- .../HttpClientRequestTracingHandler.java | 3 +- .../v4_0/client/NettyHttpClientTracer.java | 26 ++++---- .../v4_0/client/NettyRequestWrapper.java | 62 +++++++++++++++++++ .../src/test/groovy/Netty40ClientTest.groovy | 10 ++- .../HttpClientRequestTracingHandler.java | 3 +- .../v4_1/client/NettyHttpClientTracer.java | 19 +++--- .../v4_1/client/NettyRequestWrapper.java | 62 +++++++++++++++++++ .../src/test/groovy/Netty41ClientTest.groovy | 43 +++++++++---- .../groovy/Netty41NativeClientTest.groovy | 4 +- .../groovy/client/PlayWsClientTest.groovy | 5 -- .../client/RatpackHttpClientTest.groovy | 5 -- .../AbstractReactorNettyHttpClientTest.groovy | 5 -- .../AbstractReactorNettyHttpClientTest.groovy | 5 -- 15 files changed, 191 insertions(+), 71 deletions(-) create mode 100644 instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/NettyRequestWrapper.java create mode 100644 instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/client/NettyRequestWrapper.java diff --git a/instrumentation/async-http-client/async-http-client-1.9/javaagent/src/test/groovy/AsyncHttpClientTest.groovy b/instrumentation/async-http-client/async-http-client-1.9/javaagent/src/test/groovy/AsyncHttpClientTest.groovy index f80a1c0f14..2364940161 100644 --- a/instrumentation/async-http-client/async-http-client-1.9/javaagent/src/test/groovy/AsyncHttpClientTest.groovy +++ b/instrumentation/async-http-client/async-http-client-1.9/javaagent/src/test/groovy/AsyncHttpClientTest.groovy @@ -60,11 +60,6 @@ class AsyncHttpClientTest extends HttpClientTest implements AgentTestTr false } - @Override - boolean testHttps() { - false - } - @Override SingleConnection createSingleConnection(String host, int port) { // AsyncHttpClient does not support HTTP 1.1 pipelining nor waiting for connection pool slots to diff --git a/instrumentation/async-http-client/async-http-client-2.0/javaagent/src/test/groovy/AsyncHttpClientTest.groovy b/instrumentation/async-http-client/async-http-client-2.0/javaagent/src/test/groovy/AsyncHttpClientTest.groovy index fa114293f7..d1fb9d1d60 100644 --- a/instrumentation/async-http-client/async-http-client-2.0/javaagent/src/test/groovy/AsyncHttpClientTest.groovy +++ b/instrumentation/async-http-client/async-http-client-2.0/javaagent/src/test/groovy/AsyncHttpClientTest.groovy @@ -66,11 +66,6 @@ class AsyncHttpClientTest extends HttpClientTest implements AgentTestTr false } - @Override - boolean testHttps() { - false - } - @Override Set> httpAttributes(URI uri) { Set> extra = [ diff --git a/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/HttpClientRequestTracingHandler.java b/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/HttpClientRequestTracingHandler.java index ce66360c80..c2ade479a3 100644 --- a/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/HttpClientRequestTracingHandler.java +++ b/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/HttpClientRequestTracingHandler.java @@ -34,7 +34,8 @@ public class HttpClientRequestTracingHandler extends ChannelOutboundHandlerAdapt return; } - Context context = tracer().startSpan(parentContext, ctx, (HttpRequest) msg); + NettyRequestWrapper requestWrapper = new NettyRequestWrapper((HttpRequest) msg, ctx); + Context context = tracer().startSpan(parentContext, ctx, requestWrapper); ctx.channel().attr(AttributeKeys.CLIENT_CONTEXT).set(context); ctx.channel().attr(AttributeKeys.CLIENT_PARENT_CONTEXT).set(parentContext); diff --git a/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/NettyHttpClientTracer.java b/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/NettyHttpClientTracer.java index 872b45bb9e..994f361a7a 100644 --- a/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/NettyHttpClientTracer.java +++ b/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/NettyHttpClientTracer.java @@ -15,7 +15,6 @@ import io.netty.channel.Channel; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.socket.DatagramChannel; import io.netty.handler.codec.http.HttpHeaders; -import io.netty.handler.codec.http.HttpRequest; import io.netty.handler.codec.http.HttpResponse; import io.opentelemetry.api.trace.SpanBuilder; import io.opentelemetry.context.Context; @@ -29,7 +28,7 @@ import java.net.URISyntaxException; import org.checkerframework.checker.nullness.qual.Nullable; public class NettyHttpClientTracer - extends HttpClientTracer { + extends HttpClientTracer { private static final NettyHttpClientTracer TRACER = new NettyHttpClientTracer(); private NettyHttpClientTracer() { @@ -40,7 +39,8 @@ public class NettyHttpClientTracer return TRACER; } - public Context startSpan(Context parentContext, ChannelHandlerContext ctx, HttpRequest request) { + public Context startSpan( + Context parentContext, ChannelHandlerContext ctx, NettyRequestWrapper request) { SpanBuilder spanBuilder = spanBuilder(parentContext, spanNameForRequest(request), CLIENT); onRequest(spanBuilder, request); NetPeerAttributes.INSTANCE.setNetPeer( @@ -62,24 +62,24 @@ public class NettyHttpClientTracer } @Override - protected String method(HttpRequest httpRequest) { - return httpRequest.getMethod().name(); + protected String method(NettyRequestWrapper httpRequest) { + return httpRequest.method().name(); } @Override @Nullable - protected String flavor(HttpRequest httpRequest) { - return httpRequest.getProtocolVersion().text(); + protected String flavor(NettyRequestWrapper httpRequest) { + return httpRequest.protocolVersion().text(); } @Override - protected URI url(HttpRequest request) throws URISyntaxException { - URI uri = new URI(request.getUri()); + protected URI url(NettyRequestWrapper request) throws URISyntaxException { + URI uri = new URI(request.uri()); if ((uri.getHost() == null || uri.getHost().equals("")) && request.headers().contains(HOST)) { - return new URI("http://" + request.headers().get(HOST) + request.getUri()); - } else { - return uri; + String protocol = request.isHttps() ? "https://" : "http://"; + uri = new URI(protocol + request.headers().get(HOST) + request.uri()); } + return uri; } @Override @@ -88,7 +88,7 @@ public class NettyHttpClientTracer } @Override - protected String requestHeader(HttpRequest httpRequest, String name) { + protected String requestHeader(NettyRequestWrapper httpRequest, String name) { return httpRequest.headers().get(name); } diff --git a/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/NettyRequestWrapper.java b/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/NettyRequestWrapper.java new file mode 100644 index 0000000000..17a2ca51c3 --- /dev/null +++ b/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/NettyRequestWrapper.java @@ -0,0 +1,62 @@ +/* + * Copyright The OpenTelemetry Authors + * SPDX-License-Identifier: Apache-2.0 + */ + +package io.opentelemetry.javaagent.instrumentation.netty.v4_0.client; + +import io.netty.channel.ChannelHandler; +import io.netty.channel.ChannelHandlerContext; +import io.netty.handler.codec.http.HttpHeaders; +import io.netty.handler.codec.http.HttpMethod; +import io.netty.handler.codec.http.HttpRequest; +import io.netty.handler.codec.http.HttpVersion; + +public class NettyRequestWrapper { + private static final Class sslHandlerClass = getSslHandlerClass(); + + @SuppressWarnings("unchecked") + private static Class getSslHandlerClass() { + try { + return (Class) + Class.forName( + "io.netty.handler.ssl.SslHandler", + false, + HttpClientRequestTracingHandler.class.getClassLoader()); + } catch (ClassNotFoundException exception) { + return null; + } + } + + private final HttpRequest request; + private final ChannelHandlerContext ctx; + + public NettyRequestWrapper(HttpRequest request, ChannelHandlerContext ctx) { + this.request = request; + this.ctx = ctx; + } + + public HttpRequest request() { + return request; + } + + public boolean isHttps() { + return sslHandlerClass != null && ctx.pipeline().get(sslHandlerClass) != null; + } + + public HttpHeaders headers() { + return request.headers(); + } + + public HttpVersion protocolVersion() { + return request.getProtocolVersion(); + } + + public String uri() { + return request.getUri(); + } + + public HttpMethod method() { + return request().getMethod(); + } +} diff --git a/instrumentation/netty/netty-4.0/javaagent/src/test/groovy/Netty40ClientTest.groovy b/instrumentation/netty/netty-4.0/javaagent/src/test/groovy/Netty40ClientTest.groovy index 3b5a74d813..7fca4ea226 100644 --- a/instrumentation/netty/netty-4.0/javaagent/src/test/groovy/Netty40ClientTest.groovy +++ b/instrumentation/netty/netty-4.0/javaagent/src/test/groovy/Netty40ClientTest.groovy @@ -27,13 +27,15 @@ import spock.lang.Shared class Netty40ClientTest extends HttpClientTest implements AgentTestTrait { + @Shared + private EventLoopGroup eventLoopGroup = new NioEventLoopGroup() + @Shared private Bootstrap bootstrap def setupSpec() { - EventLoopGroup group = new NioEventLoopGroup() bootstrap = new Bootstrap() - bootstrap.group(group) + bootstrap.group(eventLoopGroup) .channel(NioSocketChannel) .option(ChannelOption.CONNECT_TIMEOUT_MILLIS, CONNECT_TIMEOUT_MS) .handler(new ChannelInitializer() { @@ -45,6 +47,10 @@ class Netty40ClientTest extends HttpClientTest implement }) } + def cleanupSpec() { + eventLoopGroup?.shutdownGracefully() + } + @Override DefaultFullHttpRequest buildRequest(String method, URI uri, Map headers) { def request = new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.valueOf(method), uri.toString(), Unpooled.EMPTY_BUFFER) diff --git a/instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/client/HttpClientRequestTracingHandler.java b/instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/client/HttpClientRequestTracingHandler.java index b5efc9587c..b5dd850025 100644 --- a/instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/client/HttpClientRequestTracingHandler.java +++ b/instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/client/HttpClientRequestTracingHandler.java @@ -35,7 +35,8 @@ public class HttpClientRequestTracingHandler extends ChannelOutboundHandlerAdapt return; } - Context context = tracer().startSpan(parentContext, ctx, (HttpRequest) msg); + NettyRequestWrapper requestWrapper = new NettyRequestWrapper((HttpRequest) msg, ctx); + Context context = tracer().startSpan(parentContext, ctx, requestWrapper); Attribute clientContextAttr = ctx.channel().attr(AttributeKeys.CLIENT_CONTEXT); Attribute parentContextAttr = ctx.channel().attr(AttributeKeys.CLIENT_PARENT_CONTEXT); diff --git a/instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/client/NettyHttpClientTracer.java b/instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/client/NettyHttpClientTracer.java index 34b2de3882..c08c9078a1 100644 --- a/instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/client/NettyHttpClientTracer.java +++ b/instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/client/NettyHttpClientTracer.java @@ -29,7 +29,7 @@ import java.net.URISyntaxException; import org.checkerframework.checker.nullness.qual.Nullable; public class NettyHttpClientTracer - extends HttpClientTracer { + extends HttpClientTracer { private static final NettyHttpClientTracer TRACER = new NettyHttpClientTracer(); private NettyHttpClientTracer() { @@ -40,7 +40,8 @@ public class NettyHttpClientTracer return TRACER; } - public Context startSpan(Context parentContext, ChannelHandlerContext ctx, HttpRequest request) { + public Context startSpan( + Context parentContext, ChannelHandlerContext ctx, NettyRequestWrapper request) { SpanBuilder spanBuilder = spanBuilder(parentContext, spanNameForRequest(request), CLIENT); onRequest(spanBuilder, request); NetPeerAttributes.INSTANCE.setNetPeer( @@ -62,24 +63,24 @@ public class NettyHttpClientTracer } @Override - protected String method(HttpRequest httpRequest) { + protected String method(NettyRequestWrapper httpRequest) { return httpRequest.method().name(); } @Override @Nullable - protected String flavor(HttpRequest httpRequest) { + protected String flavor(NettyRequestWrapper httpRequest) { return httpRequest.protocolVersion().text(); } @Override - protected URI url(HttpRequest request) throws URISyntaxException { + protected URI url(NettyRequestWrapper request) throws URISyntaxException { URI uri = new URI(request.uri()); if ((uri.getHost() == null || uri.getHost().equals("")) && request.headers().contains(HOST)) { - return new URI("http://" + request.headers().get(HOST) + request.uri()); - } else { - return uri; + String protocol = request.isHttps() ? "https://" : "http://"; + uri = new URI(protocol + request.headers().get(HOST) + request.uri()); } + return uri; } @Override @@ -88,7 +89,7 @@ public class NettyHttpClientTracer } @Override - protected String requestHeader(HttpRequest httpRequest, String name) { + protected String requestHeader(NettyRequestWrapper httpRequest, String name) { return httpRequest.headers().get(name); } diff --git a/instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/client/NettyRequestWrapper.java b/instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/client/NettyRequestWrapper.java new file mode 100644 index 0000000000..584d065f45 --- /dev/null +++ b/instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/client/NettyRequestWrapper.java @@ -0,0 +1,62 @@ +/* + * Copyright The OpenTelemetry Authors + * SPDX-License-Identifier: Apache-2.0 + */ + +package io.opentelemetry.javaagent.instrumentation.netty.v4_1.client; + +import io.netty.channel.ChannelHandler; +import io.netty.channel.ChannelHandlerContext; +import io.netty.handler.codec.http.HttpHeaders; +import io.netty.handler.codec.http.HttpMethod; +import io.netty.handler.codec.http.HttpRequest; +import io.netty.handler.codec.http.HttpVersion; + +public class NettyRequestWrapper { + private static final Class sslHandlerClass = getSslHandlerClass(); + + @SuppressWarnings("unchecked") + private static Class getSslHandlerClass() { + try { + return (Class) + Class.forName( + "io.netty.handler.ssl.SslHandler", + false, + HttpClientRequestTracingHandler.class.getClassLoader()); + } catch (ClassNotFoundException exception) { + return null; + } + } + + private final HttpRequest request; + private final ChannelHandlerContext ctx; + + public NettyRequestWrapper(HttpRequest request, ChannelHandlerContext ctx) { + this.request = request; + this.ctx = ctx; + } + + public HttpRequest request() { + return request; + } + + public boolean isHttps() { + return sslHandlerClass != null && ctx.pipeline().get(sslHandlerClass) != null; + } + + public HttpHeaders headers() { + return request.headers(); + } + + public HttpVersion protocolVersion() { + return request.protocolVersion(); + } + + public String uri() { + return request.uri(); + } + + public HttpMethod method() { + return request().method(); + } +} diff --git a/instrumentation/netty/netty-4.1/javaagent/src/test/groovy/Netty41ClientTest.groovy b/instrumentation/netty/netty-4.1/javaagent/src/test/groovy/Netty41ClientTest.groovy index 503a6c1baa..6f4f89dad9 100644 --- a/instrumentation/netty/netty-4.1/javaagent/src/test/groovy/Netty41ClientTest.groovy +++ b/instrumentation/netty/netty-4.1/javaagent/src/test/groovy/Netty41ClientTest.groovy @@ -25,6 +25,9 @@ import io.netty.handler.codec.http.HttpClientCodec import io.netty.handler.codec.http.HttpHeaderNames import io.netty.handler.codec.http.HttpMethod import io.netty.handler.codec.http.HttpVersion +import io.netty.handler.ssl.SslContext +import io.netty.handler.ssl.SslContextBuilder +import io.netty.handler.ssl.util.InsecureTrustManagerFactory import io.opentelemetry.api.common.AttributeKey import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.base.HttpClientTest @@ -39,24 +42,39 @@ import spock.lang.Unroll class Netty41ClientTest extends HttpClientTest implements AgentTestTrait { @Shared - private Bootstrap bootstrap + private EventLoopGroup eventLoopGroup = buildEventLoopGroup() - def setupSpec() { - EventLoopGroup group = getEventLoopGroup() - bootstrap = new Bootstrap() - bootstrap.group(group) + @Shared + private Bootstrap bootstrap = buildBootstrap(false) + + @Shared + private Bootstrap httpsBootstrap = buildBootstrap(true) + + def cleanupSpec() { + eventLoopGroup?.shutdownGracefully() + } + + Bootstrap buildBootstrap(boolean https) { + Bootstrap bootstrap = new Bootstrap() + bootstrap.group(eventLoopGroup) .channel(getChannelClass()) .option(ChannelOption.CONNECT_TIMEOUT_MILLIS, CONNECT_TIMEOUT_MS) .handler(new ChannelInitializer() { @Override protected void initChannel(SocketChannel socketChannel) throws Exception { ChannelPipeline pipeline = socketChannel.pipeline() + if (https) { + SslContext sslContext = SslContextBuilder.forClient().trustManager(InsecureTrustManagerFactory.INSTANCE).build() + pipeline.addLast(sslContext.newHandler(socketChannel.alloc())) + } pipeline.addLast(new HttpClientCodec()) } }) + + return bootstrap } - EventLoopGroup getEventLoopGroup() { + EventLoopGroup buildEventLoopGroup() { return new NioEventLoopGroup() } @@ -64,6 +82,10 @@ class Netty41ClientTest extends HttpClientTest implement return NioSocketChannel } + Bootstrap getBootstrap(URI uri) { + return uri.getScheme() == "https" ? httpsBootstrap : bootstrap + } + @Override DefaultFullHttpRequest buildRequest(String method, URI uri, Map headers) { def request = new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.valueOf(method), uri.toString(), Unpooled.EMPTY_BUFFER) @@ -74,7 +96,7 @@ class Netty41ClientTest extends HttpClientTest implement @Override int sendRequest(DefaultFullHttpRequest request, String method, URI uri, Map headers) { - def channel = bootstrap.connect(uri.host, getPort(uri)).sync().channel() + def channel = getBootstrap(uri).connect(uri.host, getPort(uri)).sync().channel() def result = new CompletableFuture() channel.pipeline().addLast(new ClientHandler(result)) channel.writeAndFlush(request).get() @@ -85,7 +107,7 @@ class Netty41ClientTest extends HttpClientTest implement void sendRequestWithCallback(DefaultFullHttpRequest request, String method, URI uri, Map headers, RequestResult requestResult) { Channel ch try { - ch = bootstrap.connect(uri.host, getPort(uri)).sync().channel() + ch = getBootstrap(uri).connect(uri.host, getPort(uri)).sync().channel() } catch (Exception exception) { requestResult.complete(exception) return @@ -124,11 +146,6 @@ class Netty41ClientTest extends HttpClientTest implement false } - @Override - boolean testHttps() { - false - } - def "test connection reuse and second request with lazy execute"() { setup: //Create a simple Netty pipeline diff --git a/instrumentation/netty/netty-4.1/javaagent/src/test/groovy/Netty41NativeClientTest.groovy b/instrumentation/netty/netty-4.1/javaagent/src/test/groovy/Netty41NativeClientTest.groovy index f94d1a10b9..7ac92ec3ea 100644 --- a/instrumentation/netty/netty-4.1/javaagent/src/test/groovy/Netty41NativeClientTest.groovy +++ b/instrumentation/netty/netty-4.1/javaagent/src/test/groovy/Netty41NativeClientTest.groovy @@ -16,7 +16,7 @@ import org.junit.Assume // netty client test with epoll/kqueue native library class Netty41NativeClientTest extends Netty41ClientTest { - EventLoopGroup getEventLoopGroup() { + EventLoopGroup buildEventLoopGroup() { // linux if (Epoll.isAvailable()) { return new EpollEventLoopGroup() @@ -28,7 +28,7 @@ class Netty41NativeClientTest extends Netty41ClientTest { // skip test when native library was not found Assume.assumeTrue("Native library was not found", false) - return super.getEventLoopGroup() + return super.buildEventLoopGroup() } @Override diff --git a/instrumentation/play/play-2.4/javaagent/src/test/groovy/client/PlayWsClientTest.groovy b/instrumentation/play/play-2.4/javaagent/src/test/groovy/client/PlayWsClientTest.groovy index e1d7f7ed6e..c7733116a4 100644 --- a/instrumentation/play/play-2.4/javaagent/src/test/groovy/client/PlayWsClientTest.groovy +++ b/instrumentation/play/play-2.4/javaagent/src/test/groovy/client/PlayWsClientTest.groovy @@ -62,11 +62,6 @@ class PlayWsClientTest extends HttpClientTest implements AgentTestTra false } - @Override - boolean testHttps() { - false - } - @Override Set> httpAttributes(URI uri) { Set> extra = [ diff --git a/instrumentation/ratpack-1.4/javaagent/src/test/groovy/client/RatpackHttpClientTest.groovy b/instrumentation/ratpack-1.4/javaagent/src/test/groovy/client/RatpackHttpClientTest.groovy index 8bab828832..e7cf9a36ab 100644 --- a/instrumentation/ratpack-1.4/javaagent/src/test/groovy/client/RatpackHttpClientTest.groovy +++ b/instrumentation/ratpack-1.4/javaagent/src/test/groovy/client/RatpackHttpClientTest.groovy @@ -148,9 +148,4 @@ class RatpackHttpClientTest extends HttpClientTest implements AgentTestTra // these tests will pass, but they don't really test anything since REQUEST is Void false } - - @Override - boolean testHttps() { - false - } } diff --git a/instrumentation/reactor-netty/reactor-netty-0.9/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/AbstractReactorNettyHttpClientTest.groovy b/instrumentation/reactor-netty/reactor-netty-0.9/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/AbstractReactorNettyHttpClientTest.groovy index 778fb0dce7..ff28f319fa 100644 --- a/instrumentation/reactor-netty/reactor-netty-0.9/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/AbstractReactorNettyHttpClientTest.groovy +++ b/instrumentation/reactor-netty/reactor-netty-0.9/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/AbstractReactorNettyHttpClientTest.groovy @@ -27,11 +27,6 @@ abstract class AbstractReactorNettyHttpClientTest extends HttpClientTest