Skip to content

Commit 8c5074c

Browse files
committed
cleanup
1 parent 4f0e617 commit 8c5074c

File tree

1 file changed

+11
-20
lines changed

1 file changed

+11
-20
lines changed

instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientTest.java

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,8 @@ private static void assumeSupportedConfig(String operation) {
9494
}
9595

9696
// Force localhost instead of relying on mock server because using ip is yet another corner case
97-
// of the virtual
98-
// bucket changes introduced by aws sdk v2.18.0. When using IP, there is no way to prefix the
99-
// hostname with the
100-
// bucket name as label.
97+
// of the virtual bucket changes introduced by aws sdk v2.18.0. When using IP, there is no way to
98+
// prefix the hostname with the bucket name as label.
10199
URI clientUri = URI.create("http://localhost:" + server.httpPort());
102100

103101
private static final Callable<HttpResponse> sqsCreateQueueResponse =
@@ -195,14 +193,10 @@ private void clientAssertions(
195193
new ArrayList<>(
196194
asList(
197195
// Starting with AWS SDK V2 2.18.0, the s3 sdk will prefix the hostname with the
198-
// bucket name
199-
// in case the bucket name is a valid DNS label, even in the case that we are using
200-
// an
201-
// endpoint override. Previously the sdk was only doing that if endpoint had "s3" as
202-
// label in
203-
// the FQDN. Our test assert both cases so that we don't need to know what version
204-
// is being
205-
// tested.
196+
// bucket name in case the bucket name is a valid DNS label, even in the case that
197+
// we are using an endpoint override. Previously the sdk was only doing that if
198+
// endpoint had "s3" as label in the FQDN. Our test assert both cases so that we
199+
// don't need to know what version is being tested.
206200
satisfies(SERVER_ADDRESS, v -> v.matches("somebucket.localhost|localhost")),
207201
equalTo(SERVER_PORT, server.httpPort()),
208202
equalTo(HTTP_REQUEST_METHOD, method),
@@ -658,14 +652,11 @@ void testTimeoutAndRetryErrorsAreNotCaptured() throws Exception {
658652
.hasNoParent()
659653
.hasAttributesSatisfyingExactly(
660654
// Starting with AWS SDK V2 2.18.0, the s3 sdk will prefix the
661-
// hostname with the bucket name
662-
// in case the bucket name is a valid DNS label, even in the case
663-
// that we are using an
664-
// endpoint override. Previously the sdk was only doing that if
665-
// endpoint had "s3" as label in
666-
// the FQDN. Our test assert both cases so that we don't need to
667-
// know what version is being
668-
// tested.
655+
// hostname with the bucket name in case the bucket name is a valid
656+
// DNS label, even in the case that we are using an endpoint
657+
// override. Previously the sdk was only doing that if endpoint had
658+
// "s3" as label in the FQDN. Our test assert both cases so that we
659+
// don't need to know what version is being tested.
669660
satisfies(
670661
SERVER_ADDRESS,
671662
v -> v.matches("somebucket.localhost|localhost")),

0 commit comments

Comments
 (0)