Enable DT on all span tests

Author: TimPansino

tests/external_botocore/test_boto3_iam.py

@@ -17,7 +17,7 @@
 
 import boto3
 import moto
-from testing_support.fixtures import override_application_settings
+from testing_support.fixtures import dt_enabled
 from testing_support.validators.validate_span_events import validate_span_events
 from testing_support.validators.validate_transaction_metrics import (
     validate_transaction_metrics,
@@ -53,7 +53,7 @@
 ]
 
 
-@override_application_settings({"distributed_tracing.enabled": True})
+@dt_enabled
 @validate_span_events(exact_agents={"http.url": "https://iam.amazonaws.com/"}, count=3)
 @validate_span_events(expected_agents=("aws.requestId",), count=3)
 @validate_span_events(exact_agents={"aws.operation": "CreateUser"}, count=1)

tests/external_botocore/test_boto3_s3.py

@@ -18,7 +18,7 @@
 import boto3
 import botocore
 import moto
-from testing_support.fixtures import override_application_settings
+from testing_support.fixtures import dt_enabled
 from testing_support.validators.validate_span_events import validate_span_events
 from testing_support.validators.validate_transaction_metrics import (
     validate_transaction_metrics,
@@ -73,7 +73,7 @@
 ]
 
 
-@override_application_settings({"distributed_tracing.enabled": True})
+@dt_enabled
 @validate_span_events(exact_agents={"aws.operation": "CreateBucket"}, count=1)
 @validate_span_events(exact_agents={"aws.operation": "PutObject"}, count=1)
 @validate_span_events(exact_agents={"aws.operation": "ListObjects"}, count=1)

tests/external_botocore/test_boto3_sns.py

@@ -17,7 +17,7 @@
 import boto3
 import moto
 import pytest
-from testing_support.fixtures import override_application_settings
+from testing_support.fixtures import dt_enabled
 from testing_support.validators.validate_span_events import validate_span_events
 from testing_support.validators.validate_transaction_metrics import (
     validate_transaction_metrics,
@@ -45,7 +45,7 @@
 sns_metrics_phone = [("MessageBroker/SNS/Topic" "/Produce/Named/PhoneNumber", 1)]
 
 
-@override_application_settings({"distributed_tracing.enabled": True})
+@dt_enabled
 @validate_span_events(expected_agents=("aws.requestId",), count=2)
 @validate_span_events(exact_agents={"aws.operation": "CreateTopic"}, count=1)
 @validate_span_events(exact_agents={"aws.operation": "Publish"}, count=1)
@@ -74,7 +74,7 @@ def test_publish_to_sns_topic(topic_argument):
     assert "MessageId" in published_message
 
 
-@override_application_settings({"distributed_tracing.enabled": True})
+@dt_enabled
 @validate_span_events(expected_agents=("aws.requestId",), count=3)
 @validate_span_events(exact_agents={"aws.operation": "CreateTopic"}, count=1)
 @validate_span_events(exact_agents={"aws.operation": "Subscribe"}, count=1)

tests/external_botocore/test_botocore_dynamodb.py

@@ -17,7 +17,7 @@
 
 import botocore.session
 import moto
-from testing_support.fixtures import override_application_settings
+from testing_support.fixtures import dt_enabled
 from testing_support.validators.validate_span_events import validate_span_events
 from testing_support.validators.validate_transaction_metrics import (
     validate_transaction_metrics,
@@ -63,7 +63,7 @@
 ]
 
 
-@override_application_settings({"distributed_tracing.enabled": True})
+@dt_enabled
 @validate_span_events(expected_agents=("aws.requestId",), count=8)
 @validate_span_events(exact_agents={"aws.operation": "PutItem"}, count=1)
 @validate_span_events(exact_agents={"aws.operation": "GetItem"}, count=1)

tests/external_botocore/test_botocore_ec2.py

@@ -17,7 +17,7 @@
 
 import botocore.session
 import moto
-from testing_support.fixtures import override_application_settings
+from testing_support.fixtures import dt_enabled
 from testing_support.validators.validate_span_events import validate_span_events
 from testing_support.validators.validate_transaction_metrics import (
     validate_transaction_metrics,
@@ -55,7 +55,7 @@
 ]
 
 
-@override_application_settings({"distributed_tracing.enabled": True})
+@dt_enabled
 @validate_span_events(expected_agents=("aws.requestId",), count=3)
 @validate_span_events(exact_agents={"aws.operation": "RunInstances"}, count=1)
 @validate_span_events(exact_agents={"aws.operation": "DescribeInstances"}, count=1)

tests/external_botocore/test_botocore_s3.py

@@ -18,7 +18,7 @@
 import botocore
 import botocore.session
 import moto
-from testing_support.fixtures import override_application_settings
+from testing_support.fixtures import dt_enabled
 from testing_support.validators.validate_span_events import validate_span_events
 from testing_support.validators.validate_transaction_metrics import (
     validate_transaction_metrics,
@@ -67,7 +67,7 @@
 ]
 
 
-@override_application_settings({"distributed_tracing.enabled": True})
+@dt_enabled
 @validate_span_events(exact_agents={"aws.operation": "CreateBucket"}, count=1)
 @validate_span_events(exact_agents={"aws.operation": "PutObject"}, count=1)
 @validate_span_events(exact_agents={"aws.operation": "ListObjects"}, count=1)

tests/external_botocore/test_botocore_sqs.py

@@ -18,7 +18,7 @@
 import botocore.session
 import moto
 import pytest
-from testing_support.fixtures import override_application_settings
+from testing_support.fixtures import dt_enabled
 from testing_support.validators.validate_span_events import validate_span_events
 from testing_support.validators.validate_transaction_metrics import (
     validate_transaction_metrics,
@@ -70,7 +70,7 @@
 ]
 
 
-@override_application_settings({"distributed_tracing.enabled": True})
+@dt_enabled
 @validate_span_events(exact_agents={"aws.operation": "CreateQueue"}, count=1)
 @validate_span_events(exact_agents={"aws.operation": "SendMessage"}, count=1)
 @validate_span_events(exact_agents={"aws.operation": "ReceiveMessage"}, count=1)
@@ -124,7 +124,7 @@ def test_sqs():
     assert resp["ResponseMetadata"]["HTTPStatusCode"] == 200
 
 
-@override_application_settings({"distributed_tracing.enabled": True})
+@dt_enabled
 @validate_transaction_metrics(
     "test_botocore_sqs:test_sqs_malformed",
     scoped_metrics=_sqs_scoped_metrics_malformed,