cleanups

Author: jaydeluca

instrumentation/ratpack/ratpack-1.7/library/src/test/java/io/opentelemetry/instrumentation/ratpack/v1_7/client/InstrumentedHttpClientTest.java

@@ -123,9 +123,7 @@ void testPropagateTraceWithHttpCalls() throws Exception {
                             equalTo(HTTP_RESPONSE_STATUS_CODE, 200L),
                             satisfies(SERVER_PORT, v -> v.isInstanceOf(Long.class)),
                             equalTo(SERVER_ADDRESS, "localhost"),
-                            equalTo(
-                                URL_FULL,
-                                "http://localhost:" + otherApp.getServer().getBindPort() + "/bar")),
+                            equalTo(URL_FULL, otherApp.getAddress() + "/bar")),
                 span ->
                     span.hasName("GET /bar")
                         .hasParent(trace.getSpan(1))
@@ -214,9 +212,7 @@ void testAddSpansForMultipleConcurrentClientCalls() throws Exception {
                             equalTo(HTTP_RESPONSE_STATUS_CODE, 200L),
                             satisfies(SERVER_PORT, v -> v.isInstanceOf(Long.class)),
                             equalTo(SERVER_ADDRESS, "localhost"),
-                            equalTo(
-                                URL_FULL,
-                                "http://localhost:" + otherApp.getServer().getBindPort() + "/foo")),
+                            equalTo(URL_FULL, otherApp.getAddress() + "/foo")),
                 span ->
                     span.hasName("GET")
                         .hasParent(trace.getSpan(0))
@@ -227,11 +223,7 @@ void testAddSpansForMultipleConcurrentClientCalls() throws Exception {
                             equalTo(HTTP_RESPONSE_STATUS_CODE, 200L),
                             satisfies(SERVER_PORT, v -> v.isInstanceOf(Long.class)),
                             equalTo(SERVER_ADDRESS, "localhost"),
-                            equalTo(
-                                URL_FULL,
-                                "http://localhost:"
-                                    + otherApp.getServer().getBindPort()
-                                    + "/bar"))));
+                            equalTo(URL_FULL, otherApp.getAddress() + "/bar"))));
   }
 
   @Test
@@ -306,11 +298,7 @@ void testHandlingExceptionErrorsInHttpClient() throws Exception {
                             equalTo(ERROR_TYPE, HttpClientReadTimeoutException.class.getName()),
                             satisfies(SERVER_PORT, v -> v.isInstanceOf(Long.class)),
                             equalTo(SERVER_ADDRESS, "localhost"),
-                            equalTo(
-                                URL_FULL,
-                                "http://localhost:"
-                                    + otherApp.getServer().getBindPort()
-                                    + "/foo"))));
+                            equalTo(URL_FULL, otherApp.getAddress() + "/foo"))));
   }
 
   private static Stream<Arguments> provideArguments() {
@@ -363,9 +351,7 @@ void propagateHttpTraceInRatpackServicesWithForkExecutions(
                             equalTo(HTTP_RESPONSE_STATUS_CODE, 200L),
                             satisfies(SERVER_PORT, v -> v.isInstanceOf(Long.class)),
                             equalTo(SERVER_ADDRESS, "localhost"),
-                            equalTo(
-                                URL_FULL,
-                                "http://localhost:" + otherApp.getServer().getBindPort() + "/foo")),
+                            equalTo(URL_FULL, otherApp.getAddress() + "foo")),
                 span ->
                     span.hasName("GET")
                         .hasKind(SpanKind.CLIENT)
@@ -376,10 +362,6 @@ void propagateHttpTraceInRatpackServicesWithForkExecutions(
                             equalTo(HTTP_RESPONSE_STATUS_CODE, 200L),
                             satisfies(SERVER_PORT, v -> v.isInstanceOf(Long.class)),
                             equalTo(SERVER_ADDRESS, "localhost"),
-                            equalTo(
-                                URL_FULL,
-                                "http://localhost:"
-                                    + otherApp.getServer().getBindPort()
-                                    + "/foo"))));
+                            equalTo(URL_FULL, otherApp.getAddress() + "foo"))));
   }
 }