From e93ff4d419b1cf5d9af23b2b9223490febc235b5 Mon Sep 17 00:00:00 2001 From: Lauri Tulmin Date: Thu, 10 Jun 2021 16:21:11 +0300 Subject: [PATCH] Remove references to dropped request test (#3238) --- .../javaagent/src/test/groovy/Netty38ClientTest.groovy | 3 --- .../javaagent/src/test/groovy/Netty40ClientTest.groovy | 2 -- .../javaagent/src/test/groovy/Netty41ClientTest.groovy | 2 -- .../src/test/groovy/client/RatpackHttpClientTest.groovy | 3 --- .../v0_9/AbstractReactorNettyHttpClientTest.groovy | 3 --- .../v1_0/AbstractReactorNettyHttpClientTest.groovy | 3 --- .../src/test/groovy/client/SpringWebfluxHttpClientTest.groovy | 1 - .../src/test/groovy/client/VertxRxWebClientTest.groovy | 1 - 8 files changed, 18 deletions(-) diff --git a/instrumentation/netty/netty-3.8/javaagent/src/test/groovy/Netty38ClientTest.groovy b/instrumentation/netty/netty-3.8/javaagent/src/test/groovy/Netty38ClientTest.groovy index 87e3fa9eb6..46eb792188 100644 --- a/instrumentation/netty/netty-3.8/javaagent/src/test/groovy/Netty38ClientTest.groovy +++ b/instrumentation/netty/netty-3.8/javaagent/src/test/groovy/Netty38ClientTest.groovy @@ -87,7 +87,6 @@ class Netty38ClientTest extends HttpClientTest implements AgentTestTrai String expectedClientSpanName(URI uri, String method) { switch (uri.toString()) { case "http://localhost:61/": // unopened port - case "http://www.google.com:81/": // dropped request case "https://192.0.2.1/": // non routable address return "CONNECT" default: @@ -101,7 +100,6 @@ class Netty38ClientTest extends HttpClientTest implements AgentTestTrai case "http://localhost:61/": // unopened port exception = exception.getCause() != null ? exception.getCause() : new ConnectException("Connection refused: localhost/127.0.0.1:61") break - case "http://www.google.com:81/": // dropped request case "https://192.0.2.1/": // non routable address exception = exception.getCause() != null ? exception.getCause() : new ClosedChannelException() } @@ -112,7 +110,6 @@ class Netty38ClientTest extends HttpClientTest implements AgentTestTrai Set> httpAttributes(URI uri) { switch (uri.toString()) { case "http://localhost:61/": // unopened port - case "http://www.google.com:81/": // dropped request case "https://192.0.2.1/": // non routable address return [] } 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 11251a6156..3b5a74d813 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 @@ -84,7 +84,6 @@ class Netty40ClientTest extends HttpClientTest implement String expectedClientSpanName(URI uri, String method) { switch (uri.toString()) { case "http://localhost:61/": // unopened port - case "http://www.google.com:81/": // dropped request case "https://192.0.2.1/": // non routable address return "CONNECT" default: @@ -96,7 +95,6 @@ class Netty40ClientTest extends HttpClientTest implement Set> httpAttributes(URI uri) { switch (uri.toString()) { case "http://localhost:61/": // unopened port - case "http://www.google.com:81/": // dropped request case "https://192.0.2.1/": // non routable address return [] } 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 c42a900a87..503a6c1baa 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 @@ -102,7 +102,6 @@ class Netty41ClientTest extends HttpClientTest implement String expectedClientSpanName(URI uri, String method) { switch (uri.toString()) { case "http://localhost:61/": // unopened port - case "http://www.google.com:81/": // dropped request case "https://192.0.2.1/": // non routable address return "CONNECT" default: @@ -114,7 +113,6 @@ class Netty41ClientTest extends HttpClientTest implement Set> httpAttributes(URI uri) { switch (uri.toString()) { case "http://localhost:61/": // unopened port - case "http://www.google.com:81/": // dropped request case "https://192.0.2.1/": // non routable address return [] } 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 dacdee1937..4f9490d65e 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 @@ -111,7 +111,6 @@ class RatpackHttpClientTest extends HttpClientTest implements AgentTestTra String expectedClientSpanName(URI uri, String method) { switch (uri.toString()) { case "http://localhost:61/": // unopened port - case "http://www.google.com:81/": // dropped request case "https://192.0.2.1/": // non routable address return "CONNECT" default: @@ -122,7 +121,6 @@ class RatpackHttpClientTest extends HttpClientTest implements AgentTestTra @Override void assertClientSpanErrorEvent(SpanAssert spanAssert, URI uri, Throwable exception) { switch (uri.toString()) { - case "http://www.google.com:81/": // dropped request case "https://192.0.2.1/": // non routable address spanAssert.errorEvent(ConnectTimeoutException, ~/connection timed out:/) return @@ -134,7 +132,6 @@ class RatpackHttpClientTest extends HttpClientTest implements AgentTestTra Set> httpAttributes(URI uri) { switch (uri.toString()) { case "http://localhost:61/": // unopened port - case "http://www.google.com:81/": // dropped request case "https://192.0.2.1/": // non routable address return [] } 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 2f9af20683..778fb0dce7 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 @@ -73,7 +73,6 @@ abstract class AbstractReactorNettyHttpClientTest extends HttpClientTest> httpAttributes(URI uri) { switch (uri.toString()) { case "http://localhost:61/": // unopened port - case "http://www.google.com:81/": // dropped request case "https://192.0.2.1/": // non routable address return [] } diff --git a/instrumentation/reactor-netty/reactor-netty-1.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/AbstractReactorNettyHttpClientTest.groovy b/instrumentation/reactor-netty/reactor-netty-1.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/AbstractReactorNettyHttpClientTest.groovy index f239905259..0837399241 100644 --- a/instrumentation/reactor-netty/reactor-netty-1.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/AbstractReactorNettyHttpClientTest.groovy +++ b/instrumentation/reactor-netty/reactor-netty-1.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/AbstractReactorNettyHttpClientTest.groovy @@ -78,7 +78,6 @@ abstract class AbstractReactorNettyHttpClientTest extends HttpClientTest> httpAttributes(URI uri) { switch (uri.toString()) { case "http://localhost:61/": // unopened port - case "http://www.google.com:81/": // dropped request case "https://192.0.2.1/": // non routable address return [] } diff --git a/instrumentation/spring/spring-webflux-5.0/javaagent/src/test/groovy/client/SpringWebfluxHttpClientTest.groovy b/instrumentation/spring/spring-webflux-5.0/javaagent/src/test/groovy/client/SpringWebfluxHttpClientTest.groovy index 3399398e2b..4fe8e643ba 100644 --- a/instrumentation/spring/spring-webflux-5.0/javaagent/src/test/groovy/client/SpringWebfluxHttpClientTest.groovy +++ b/instrumentation/spring/spring-webflux-5.0/javaagent/src/test/groovy/client/SpringWebfluxHttpClientTest.groovy @@ -66,7 +66,6 @@ class SpringWebfluxHttpClientTest extends HttpClientTest> implement if (exception.class == RuntimeException) { switch (uri.toString()) { case "http://localhost:61/": // unopened port - case "http://www.google.com:81/": // dropped request case "https://192.0.2.1/": // non routable address exception = exception.getCause() }