Skip to content

Commit 897031c

Browse files
lauritlaurit
authored
Fix aws sdk latest dep tests again (#8431)
1 parent 4711661 commit 897031c

File tree

2 files changed

+34
-117
lines changed

2 files changed

+34
-117
lines changed

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

Lines changed: 34 additions & 113 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,9 @@ package io.opentelemetry.instrumentation.awssdk.v2_2
77

88
import io.opentelemetry.instrumentation.test.InstrumentationSpecification
99
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes
10-
import io.opentelemetry.testing.internal.armeria.common.HttpData
1110
import io.opentelemetry.testing.internal.armeria.common.HttpResponse
1211
import io.opentelemetry.testing.internal.armeria.common.HttpStatus
1312
import io.opentelemetry.testing.internal.armeria.common.MediaType
14-
import io.opentelemetry.testing.internal.armeria.common.ResponseHeaders
1513
import io.opentelemetry.testing.internal.armeria.testing.junit5.server.mock.MockWebServerExtension
1614
import software.amazon.awssdk.auth.credentials.AwsBasicCredentials
1715
import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider
@@ -54,7 +52,6 @@ import software.amazon.awssdk.services.sqs.model.SendMessageRequest
5452
import spock.lang.Shared
5553
import spock.lang.Unroll
5654

57-
import java.nio.charset.StandardCharsets
5855
import java.time.Duration
5956
import java.util.concurrent.Future
6057

@@ -329,13 +326,7 @@ abstract class AbstractAws2ClientTest extends InstrumentationSpecification {
329326
.region(Region.AP_NORTHEAST_1)
330327
.credentialsProvider(CREDENTIALS_PROVIDER)
331328
.build()
332-
333-
if (body instanceof Closure) {
334-
server.enqueue(body.call())
335-
} else {
336-
server.enqueue(HttpResponse.of(HttpStatus.OK, MediaType.PLAIN_TEXT_UTF_8, body))
337-
}
338-
329+
server.enqueue(HttpResponse.of(HttpStatus.OK, MediaType.PLAIN_TEXT_UTF_8, body))
339330
def response = call.call(client)
340331

341332
if (response instanceof Future) {
@@ -388,54 +379,22 @@ abstract class AbstractAws2ClientTest extends InstrumentationSpecification {
388379
"S3" | "CreateBucket" | "PUT" | path("somebucket") | "UNKNOWN" | S3Client.builder() | { c -> c.createBucket(CreateBucketRequest.builder().bucket("somebucket").build()) } | ""
389380
"S3" | "GetObject" | "GET" | path("somebucket", "somekey") | "UNKNOWN" | S3Client.builder() | { c -> c.getObject(GetObjectRequest.builder().bucket("somebucket").key("somekey").build()) } | ""
390381
"Kinesis" | "DeleteStream" | "POST" | "" | "UNKNOWN" | KinesisClient.builder() | { c -> c.deleteStream(DeleteStreamRequest.builder().streamName("somestream").build()) } | ""
391-
"Sqs" | "CreateQueue" | "POST" | "" | "7a62c49f-347e-4fc4-9331-6e8e7a96aa73" | SqsClient.builder() | { c -> c.createQueue(CreateQueueRequest.builder().queueName("somequeue").build()) } | {
392-
if (!Boolean.getBoolean("testLatestDeps")) {
393-
def content = """
394-
<CreateQueueResponse>
395-
<CreateQueueResult><QueueUrl>https://queue.amazonaws.com/123456789012/MyQueue</QueueUrl></CreateQueueResult>
396-
<ResponseMetadata><RequestId>7a62c49f-347e-4fc4-9331-6e8e7a96aa73</RequestId></ResponseMetadata>
397-
</CreateQueueResponse>
398-
"""
399-
return HttpResponse.of(HttpStatus.OK, MediaType.PLAIN_TEXT_UTF_8, content)
400-
}
401-
def content = """
402-
{
403-
"QueueUrl":"https://queue.amazonaws.com/123456789012/MyQueue"
404-
}
405-
"""
406-
ResponseHeaders headers = ResponseHeaders.builder(HttpStatus.OK)
407-
.contentType(MediaType.PLAIN_TEXT_UTF_8)
408-
.add("x-amzn-RequestId", "7a62c49f-347e-4fc4-9331-6e8e7a96aa73")
409-
.build()
410-
return HttpResponse.of(headers, HttpData.of(StandardCharsets.UTF_8, content))
411-
}
412-
"Sqs" | "SendMessage" | "POST" | "" | "27daac76-34dd-47df-bd01-1f6e873584a0" | SqsClient.builder() | { c -> c.sendMessage(SendMessageRequest.builder().queueUrl("someurl").messageBody("").build()) } | {
413-
if (!Boolean.getBoolean("testLatestDeps")) {
414-
def content = """
415-
<SendMessageResponse>
416-
<SendMessageResult>
417-
<MD5OfMessageBody>d41d8cd98f00b204e9800998ecf8427e</MD5OfMessageBody>
418-
<MD5OfMessageAttributes>3ae8f24a165a8cedc005670c81a27295</MD5OfMessageAttributes>
419-
<MessageId>5fea7756-0ea4-451a-a703-a558b933e274</MessageId>
420-
</SendMessageResult>
421-
<ResponseMetadata><RequestId>27daac76-34dd-47df-bd01-1f6e873584a0</RequestId></ResponseMetadata>
422-
</SendMessageResponse>
423-
"""
424-
return HttpResponse.of(HttpStatus.OK, MediaType.PLAIN_TEXT_UTF_8, content)
425-
}
426-
def content = """
427-
{
428-
"MD5OfMessageBody":"d41d8cd98f00b204e9800998ecf8427e",
429-
"MD5OfMessageAttributes":"3ae8f24a165a8cedc005670c81a27295",
430-
"MessageId":"5fea7756-0ea4-451a-a703-a558b933e274"
431-
}
432-
"""
433-
ResponseHeaders headers = ResponseHeaders.builder(HttpStatus.OK)
434-
.contentType(MediaType.PLAIN_TEXT_UTF_8)
435-
.add("x-amzn-RequestId", "27daac76-34dd-47df-bd01-1f6e873584a0")
436-
.build()
437-
return HttpResponse.of(headers, HttpData.of(StandardCharsets.UTF_8, content))
438-
}
382+
"Sqs" | "CreateQueue" | "POST" | "" | "7a62c49f-347e-4fc4-9331-6e8e7a96aa73" | SqsClient.builder() | { c -> c.createQueue(CreateQueueRequest.builder().queueName("somequeue").build()) } | """
383+
<CreateQueueResponse>
384+
<CreateQueueResult><QueueUrl>https://queue.amazonaws.com/123456789012/MyQueue</QueueUrl></CreateQueueResult>
385+
<ResponseMetadata><RequestId>7a62c49f-347e-4fc4-9331-6e8e7a96aa73</RequestId></ResponseMetadata>
386+
</CreateQueueResponse>
387+
"""
388+
"Sqs" | "SendMessage" | "POST" | "" | "27daac76-34dd-47df-bd01-1f6e873584a0" | SqsClient.builder() | { c -> c.sendMessage(SendMessageRequest.builder().queueUrl("someurl").messageBody("").build()) } | """
389+
<SendMessageResponse>
390+
<SendMessageResult>
391+
<MD5OfMessageBody>d41d8cd98f00b204e9800998ecf8427e</MD5OfMessageBody>
392+
<MD5OfMessageAttributes>3ae8f24a165a8cedc005670c81a27295</MD5OfMessageAttributes>
393+
<MessageId>5fea7756-0ea4-451a-a703-a558b933e274</MessageId>
394+
</SendMessageResult>
395+
<ResponseMetadata><RequestId>27daac76-34dd-47df-bd01-1f6e873584a0</RequestId></ResponseMetadata>
396+
</SendMessageResponse>
397+
"""
439398
"Ec2" | "AllocateAddress" | "POST" | "" | "59dbff89-35bd-4eac-99ed-be587EXAMPLE" | Ec2Client.builder() | { c -> c.allocateAddress() } | """
440399
<AllocateAddressResponse xmlns="http://ec2.amazonaws.com/doc/2016-11-15/">
441400
<requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>
@@ -458,13 +417,7 @@ abstract class AbstractAws2ClientTest extends InstrumentationSpecification {
458417
.region(Region.AP_NORTHEAST_1)
459418
.credentialsProvider(CREDENTIALS_PROVIDER)
460419
.build()
461-
462-
if (body instanceof Closure) {
463-
server.enqueue(body.call())
464-
} else {
465-
server.enqueue(HttpResponse.of(HttpStatus.OK, MediaType.PLAIN_TEXT_UTF_8, body))
466-
}
467-
420+
server.enqueue(HttpResponse.of(HttpStatus.OK, MediaType.PLAIN_TEXT_UTF_8, body))
468421
def response = call.call(client)
469422

470423
if (response instanceof Future) {
@@ -517,54 +470,22 @@ abstract class AbstractAws2ClientTest extends InstrumentationSpecification {
517470
"S3" | "GetObject" | "GET" | path("somebucket", "somekey") | "UNKNOWN" | S3AsyncClient.builder() | { c -> c.getObject(GetObjectRequest.builder().bucket("somebucket").key("somekey").build(), AsyncResponseTransformer.toBytes()) } | "1234567890"
518471
// Kinesis seems to expect an http2 response which is incompatible with our test server.
519472
// "Kinesis" | "DeleteStream" | "POST" | "/" | "UNKNOWN" | KinesisAsyncClient.builder() | { c -> c.deleteStream(DeleteStreamRequest.builder().streamName("somestream").build()) } | ""
520-
"Sqs" | "CreateQueue" | "POST" | "" | "7a62c49f-347e-4fc4-9331-6e8e7a96aa73" | SqsAsyncClient.builder() | { c -> c.createQueue(CreateQueueRequest.builder().queueName("somequeue").build()) } | {
521-
if (!Boolean.getBoolean("testLatestDeps")) {
522-
def content = """
523-
<CreateQueueResponse>
524-
<CreateQueueResult><QueueUrl>https://queue.amazonaws.com/123456789012/MyQueue</QueueUrl></CreateQueueResult>
525-
<ResponseMetadata><RequestId>7a62c49f-347e-4fc4-9331-6e8e7a96aa73</RequestId></ResponseMetadata>
526-
</CreateQueueResponse>
527-
"""
528-
return HttpResponse.of(HttpStatus.OK, MediaType.PLAIN_TEXT_UTF_8, content)
529-
}
530-
def content = """
531-
{
532-
"QueueUrl":"https://queue.amazonaws.com/123456789012/MyQueue"
533-
}
534-
"""
535-
ResponseHeaders headers = ResponseHeaders.builder(HttpStatus.OK)
536-
.contentType(MediaType.PLAIN_TEXT_UTF_8)
537-
.add("x-amzn-RequestId", "7a62c49f-347e-4fc4-9331-6e8e7a96aa73")
538-
.build()
539-
return HttpResponse.of(headers, HttpData.of(StandardCharsets.UTF_8, content))
540-
}
541-
"Sqs" | "SendMessage" | "POST" | "" | "27daac76-34dd-47df-bd01-1f6e873584a0" | SqsAsyncClient.builder() | { c -> c.sendMessage(SendMessageRequest.builder().queueUrl("someurl").messageBody("").build()) } | {
542-
if (!Boolean.getBoolean("testLatestDeps")) {
543-
def content = """
544-
<SendMessageResponse>
545-
<SendMessageResult>
546-
<MD5OfMessageBody>d41d8cd98f00b204e9800998ecf8427e</MD5OfMessageBody>
547-
<MD5OfMessageAttributes>3ae8f24a165a8cedc005670c81a27295</MD5OfMessageAttributes>
548-
<MessageId>5fea7756-0ea4-451a-a703-a558b933e274</MessageId>
549-
</SendMessageResult>
550-
<ResponseMetadata><RequestId>27daac76-34dd-47df-bd01-1f6e873584a0</RequestId></ResponseMetadata>
551-
</SendMessageResponse>
552-
"""
553-
return HttpResponse.of(HttpStatus.OK, MediaType.PLAIN_TEXT_UTF_8, content)
554-
}
555-
def content = """
556-
{
557-
"MD5OfMessageBody":"d41d8cd98f00b204e9800998ecf8427e",
558-
"MD5OfMessageAttributes":"3ae8f24a165a8cedc005670c81a27295",
559-
"MessageId":"5fea7756-0ea4-451a-a703-a558b933e274"
560-
}
561-
"""
562-
ResponseHeaders headers = ResponseHeaders.builder(HttpStatus.OK)
563-
.contentType(MediaType.PLAIN_TEXT_UTF_8)
564-
.add("x-amzn-RequestId", "27daac76-34dd-47df-bd01-1f6e873584a0")
565-
.build()
566-
return HttpResponse.of(headers, HttpData.of(StandardCharsets.UTF_8, content))
567-
}
473+
"Sqs" | "CreateQueue" | "POST" | "" | "7a62c49f-347e-4fc4-9331-6e8e7a96aa73" | SqsAsyncClient.builder() | { c -> c.createQueue(CreateQueueRequest.builder().queueName("somequeue").build()) } | """
474+
<CreateQueueResponse>
475+
<CreateQueueResult><QueueUrl>https://queue.amazonaws.com/123456789012/MyQueue</QueueUrl></CreateQueueResult>
476+
<ResponseMetadata><RequestId>7a62c49f-347e-4fc4-9331-6e8e7a96aa73</RequestId></ResponseMetadata>
477+
</CreateQueueResponse>
478+
"""
479+
"Sqs" | "SendMessage" | "POST" | "" | "27daac76-34dd-47df-bd01-1f6e873584a0" | SqsAsyncClient.builder() | { c -> c.sendMessage(SendMessageRequest.builder().queueUrl("someurl").messageBody("").build()) } | """
480+
<SendMessageResponse>
481+
<SendMessageResult>
482+
<MD5OfMessageBody>d41d8cd98f00b204e9800998ecf8427e</MD5OfMessageBody>
483+
<MD5OfMessageAttributes>3ae8f24a165a8cedc005670c81a27295</MD5OfMessageAttributes>
484+
<MessageId>5fea7756-0ea4-451a-a703-a558b933e274</MessageId>
485+
</SendMessageResult>
486+
<ResponseMetadata><RequestId>27daac76-34dd-47df-bd01-1f6e873584a0</RequestId></ResponseMetadata>
487+
</SendMessageResponse>
488+
"""
568489
"Ec2" | "AllocateAddress" | "POST" | "" | "59dbff89-35bd-4eac-99ed-be587EXAMPLE" | Ec2AsyncClient.builder() | { c -> c.allocateAddress() } | """
569490
<AllocateAddressResponse xmlns="http://ec2.amazonaws.com/doc/2016-11-15/">
570491
<requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>

‎instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2SqsTracingTest.groovy

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import io.opentelemetry.instrumentation.test.InstrumentationSpecification
99
import io.opentelemetry.instrumentation.test.utils.PortUtils
1010
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes
1111
import org.elasticmq.rest.sqs.SQSRestServerBuilder
12-
import org.junit.Assume
1312
import software.amazon.awssdk.auth.credentials.AwsBasicCredentials
1413
import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider
1514
import software.amazon.awssdk.core.client.builder.SdkClientBuilder
@@ -65,9 +64,6 @@ abstract class AbstractAws2SqsTracingTest extends InstrumentationSpecification {
6564
}
6665

6766
def "simple sqs producer-consumer services"() {
68-
// sqs implementation used for testing does not work with the latest aws sqs client
69-
Assume.assumeFalse(Boolean.getBoolean("testLatestDeps"))
70-
7167
setup:
7268
CreateQueueRequest createQueueRequest = CreateQueueRequest.builder()
7369
.queueName("testSdkSqs")

0 commit comments

Comments
 (0)