Skip to content

Commit 5549ab1

Browse files
authored
chore(boto): add timeouts to all boto tests (#5525)
This PR builds on #5518 by adding timeouts to all boto test cases. ## Checklist - [x] Change(s) are motivated and described in the PR description. - [x] Testing strategy is described if automated tests are not included in the PR. - [x] Risk is outlined (performance impact, potential for breakage, maintainability, etc). - [x] Change is maintainable (easy to change, telemetry, documentation). - [x] [Library release note guidelines](https://ddtrace.readthedocs.io/en/stable/contributing.html#Release-Note-Guidelines) are followed. - [x] Documentation is included (in-code, generated user docs, [public corp docs](https://github.com/DataDog/documentation/)). - [x] PR description includes explicit acknowledgement/acceptance of the performance implications of this PR as reported in the benchmarks PR comment. ## Reviewer Checklist - [x] Title is accurate. - [x] No unnecessary changes are introduced. - [x] Description motivates each change. - [x] Avoids breaking [API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces) changes unless absolutely necessary. - [x] Testing strategy adequately addresses listed risk(s). - [x] Change is maintainable (easy to change, telemetry, documentation). - [x] Release note makes sense to a user of the library. - [x] Reviewer has explicitly acknowledged and discussed the performance implications of this PR as reported in the benchmarks PR comment.
1 parent 9c7bbe3 commit 5549ab1

File tree

1 file changed

+51
-12
lines changed

1 file changed

+51
-12
lines changed

tests/contrib/botocore/test.py

Lines changed: 51 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,11 @@ def test_sqs_send_message_trace_injection_with_no_message_attributes(self):
339339
trace_data_injected = json.loads(trace_json)
340340
assert trace_data_injected[HTTP_HEADER_TRACE_ID] == str(span.trace_id)
341341
assert trace_data_injected[HTTP_HEADER_PARENT_ID] == str(span.span_id)
342-
response = sqs.receive_message(QueueUrl=queue["QueueUrl"], MessageAttributeNames=["_datadog"])
342+
response = sqs.receive_message(
343+
QueueUrl=queue["QueueUrl"],
344+
MessageAttributeNames=["_datadog"],
345+
WaitTimeSeconds=2,
346+
)
343347
assert len(response["Messages"]) == 1
344348
trace_json_message = response["Messages"][0]["MessageAttributes"]["_datadog"]["StringValue"]
345349
sqs.delete_queue(QueueUrl=queue["QueueUrl"])
@@ -370,8 +374,11 @@ def test_sqs_send_message_distributed_tracing_off(self):
370374
assert span.service == "test-botocore-tracing.sqs"
371375
assert span.resource == "sqs.sendmessage"
372376
assert span.get_tag("params.MessageAttributes._datadog.StringValue") is None
373-
374-
response = sqs.receive_message(QueueUrl=queue["QueueUrl"], MessageAttributeNames=["_datadog"])
377+
response = sqs.receive_message(
378+
QueueUrl=queue["QueueUrl"],
379+
MessageAttributeNames=["_datadog"],
380+
WaitTimeSeconds=2,
381+
)
375382
assert len(response["Messages"]) == 1
376383
trace_in_message = "MessageAttributes" in response["Messages"][0]
377384
assert trace_in_message is False
@@ -413,7 +420,11 @@ def test_sqs_send_message_trace_injection_with_message_attributes(self):
413420
trace_data_injected = json.loads(trace_json)
414421
assert trace_data_injected[HTTP_HEADER_TRACE_ID] == str(span.trace_id)
415422
assert trace_data_injected[HTTP_HEADER_PARENT_ID] == str(span.span_id)
416-
response = sqs.receive_message(QueueUrl=queue["QueueUrl"], MessageAttributeNames=["_datadog"])
423+
response = sqs.receive_message(
424+
QueueUrl=queue["QueueUrl"],
425+
MessageAttributeNames=["_datadog"],
426+
WaitTimeSeconds=2,
427+
)
417428
assert len(response["Messages"]) == 1
418429
trace_json_message = response["Messages"][0]["MessageAttributes"]["_datadog"]["StringValue"]
419430
trace_data_in_message = json.loads(trace_json_message)
@@ -456,7 +467,11 @@ def test_sqs_send_message_trace_injection_with_max_message_attributes(self):
456467
assert span.resource == "sqs.sendmessage"
457468
trace_json = span.get_tag("params.MessageAttributes._datadog.StringValue")
458469
assert trace_json is None
459-
response = sqs.receive_message(QueueUrl=queue["QueueUrl"], MessageAttributeNames=["_datadog"])
470+
response = sqs.receive_message(
471+
QueueUrl=queue["QueueUrl"],
472+
MessageAttributeNames=["_datadog"],
473+
WaitTimeSeconds=2,
474+
)
460475
assert len(response["Messages"]) == 1
461476
trace_in_message = "MessageAttributes" in response["Messages"][0]
462477
assert trace_in_message is False
@@ -489,7 +504,11 @@ def test_sqs_send_message_batch_trace_injection_with_no_message_attributes(self)
489504
assert_span_http_status_code(span, 200)
490505
assert span.service == "test-botocore-tracing.sqs"
491506
assert span.resource == "sqs.sendmessagebatch"
492-
response = sqs.receive_message(QueueUrl=queue["QueueUrl"], MessageAttributeNames=["_datadog"])
507+
response = sqs.receive_message(
508+
QueueUrl=queue["QueueUrl"],
509+
MessageAttributeNames=["_datadog"],
510+
WaitTimeSeconds=2,
511+
)
493512
assert len(response["Messages"]) == 1
494513
trace_json_message = response["Messages"][0]["MessageAttributes"]["_datadog"]["StringValue"]
495514
trace_data_in_message = json.loads(trace_json_message)
@@ -536,7 +555,11 @@ def test_sqs_send_message_batch_trace_injection_with_message_attributes(self):
536555
assert_span_http_status_code(span, 200)
537556
assert span.service == "test-botocore-tracing.sqs"
538557
assert span.resource == "sqs.sendmessagebatch"
539-
response = sqs.receive_message(QueueUrl=queue["QueueUrl"], MessageAttributeNames=["_datadog"])
558+
response = sqs.receive_message(
559+
QueueUrl=queue["QueueUrl"],
560+
MessageAttributeNames=["_datadog"],
561+
WaitTimeSeconds=2,
562+
)
540563
assert len(response["Messages"]) == 1
541564
trace_json_message = response["Messages"][0]["MessageAttributes"]["_datadog"]["StringValue"]
542565
trace_data_in_message = json.loads(trace_json_message)
@@ -582,7 +605,11 @@ def test_sqs_send_message_batch_trace_injection_with_max_message_attributes(self
582605
assert_span_http_status_code(span, 200)
583606
assert span.service == "test-botocore-tracing.sqs"
584607
assert span.resource == "sqs.sendmessagebatch"
585-
response = sqs.receive_message(QueueUrl=queue["QueueUrl"], MessageAttributeNames=["_datadog"])
608+
response = sqs.receive_message(
609+
QueueUrl=queue["QueueUrl"],
610+
MessageAttributeNames=["_datadog"],
611+
WaitTimeSeconds=2,
612+
)
586613
assert len(response["Messages"]) == 1
587614
trace_in_message = "MessageAttributes" in response["Messages"][0]
588615
assert trace_in_message is False
@@ -1314,7 +1341,11 @@ def test_sns_send_message_trace_injection_with_message_attributes(self):
13141341
spans = self.get_spans()
13151342

13161343
# get SNS messages via SQS
1317-
response = sqs.receive_message(QueueUrl=queue["QueueUrl"], MessageAttributeNames=["_datadog"])
1344+
response = sqs.receive_message(
1345+
QueueUrl=queue["QueueUrl"],
1346+
MessageAttributeNames=["_datadog"],
1347+
WaitTimeSeconds=2,
1348+
)
13181349

13191350
# clean up resources
13201351
sqs.delete_queue(QueueUrl=sqs_url)
@@ -1458,7 +1489,11 @@ def test_sns_send_message_batch_trace_injection_with_no_message_attributes(self)
14581489
spans = self.get_spans()
14591490

14601491
# get SNS messages via SQS
1461-
response = sqs.receive_message(QueueUrl=queue["QueueUrl"], MessageAttributeNames=["_datadog"])
1492+
response = sqs.receive_message(
1493+
QueueUrl=queue["QueueUrl"],
1494+
MessageAttributeNames=["_datadog"],
1495+
WaitTimeSeconds=2,
1496+
)
14621497

14631498
# clean up resources
14641499
sqs.delete_queue(QueueUrl=sqs_url)
@@ -1531,7 +1566,11 @@ def test_sns_send_message_batch_trace_injection_with_message_attributes(self):
15311566
spans = self.get_spans()
15321567

15331568
# get SNS messages via SQS
1534-
response = sqs.receive_message(QueueUrl=queue["QueueUrl"], MessageAttributeNames=["_datadog"])
1569+
response = sqs.receive_message(
1570+
QueueUrl=queue["QueueUrl"],
1571+
MessageAttributeNames=["_datadog"],
1572+
WaitTimeSeconds=2,
1573+
)
15351574

15361575
# clean up resources
15371576
sqs.delete_queue(QueueUrl=sqs_url)
@@ -1608,7 +1647,7 @@ def test_sns_send_message_batch_trace_injection_with_max_message_attributes(self
16081647
response = sqs.receive_message(
16091648
QueueUrl=queue["QueueUrl"],
16101649
MessageAttributeNames=["_datadog"],
1611-
WaitTimeSeconds=10,
1650+
WaitTimeSeconds=2,
16121651
)
16131652

16141653
# clean up resources

0 commit comments

Comments
 (0)