Merge branch 'master' into gh_actions_unit_tests

Author: srprash

.github/workflows/IntegrationTesting.yaml

@@ -140,7 +140,7 @@ jobs:
   cleanup:
     name: Resource tear down
     needs: test_WebApp
-    if: true
+    if: always()
     runs-on: ubuntu-latest
 
     steps:
@@ -163,7 +163,7 @@ jobs:
         run: terraform init
 
       - name: set permissions to terraform plugins
-        run: chmod -R a+x .terraform/plugins/registry.terraform.io/hashicorp/aws/3.5.0/linux_amd64/*
+        run: chmod -R a+x .terraform/*
 
       - name: Destroy resources
         run: terraform destroy -state="terraform.tfstate" -var-file="fixtures.us-west-2.tfvars" -auto-approve

aws_xray_sdk/core/async_recorder.py

@@ -53,7 +53,7 @@ def capture_async(self, name=None):
 
     def in_segment_async(self, name=None, **segment_kwargs):
         """
-        Return a segment async context manger.
+        Return a segment async context manager.
 
         :param str name: the name of the segment
         :param dict segment_kwargs: remaining arguments passed directly to `begin_segment`
@@ -62,7 +62,7 @@ def in_segment_async(self, name=None, **segment_kwargs):
 
     def in_subsegment_async(self, name=None, **subsegment_kwargs):
         """
-        Return a subsegment async context manger.
+        Return a subsegment async context manager.
 
         :param str name: the name of the segment
         :param dict segment_kwargs: remaining arguments passed directly to `begin_segment`

aws_xray_sdk/core/plugins/ec2_plugin.py

@@ -1,10 +1,10 @@
 import json
 import logging
 from future.standard_library import install_aliases
-from urllib.request import urlopen, Request
-
 install_aliases()
 
+from urllib.request import urlopen, Request
+
 log = logging.getLogger(__name__)
 
 SERVICE_NAME = 'ec2'

aws_xray_sdk/core/recorder.py

@@ -184,7 +184,7 @@ class to have your own implementation of the streaming process.
 
     def in_segment(self, name=None, **segment_kwargs):
         """
-        Return a segment context manger.
+        Return a segment context manager.
 
         :param str name: the name of the segment
         :param dict segment_kwargs: remaining arguments passed directly to `begin_segment`
@@ -193,7 +193,7 @@ def in_segment(self, name=None, **segment_kwargs):
 
     def in_subsegment(self, name=None, **subsegment_kwargs):
         """
-        Return a subsegment context manger.
+        Return a subsegment context manager.
 
         :param str name: the name of the subsegment
         :param dict subsegment_kwargs: remaining arguments passed directly to `begin_subsegment`

aws_xray_sdk/ext/django/apps.py

@@ -30,6 +30,7 @@ def ready(self):
             daemon_address=settings.AWS_XRAY_DAEMON_ADDRESS,
             sampling=settings.SAMPLING,
             sampling_rules=settings.SAMPLING_RULES,
+            sampler=settings.SAMPLER,
             context_missing=settings.AWS_XRAY_CONTEXT_MISSING,
             plugins=settings.PLUGINS,
             service=settings.AWS_XRAY_TRACING_NAME,

aws_xray_sdk/ext/django/conf.py

@@ -10,6 +10,7 @@
     'PLUGINS': (),
     'SAMPLING': True,
     'SAMPLING_RULES': None,
+    'SAMPLER': None,
     'AWS_XRAY_TRACING_NAME': None,
     'DYNAMIC_NAMING': None,
     'STREAMING_THRESHOLD': None,

tests/ext/django/app/settings.py

@@ -2,6 +2,7 @@
 Config file for a django app used by django testing client
 """
 import os
+from aws_xray_sdk.core.sampling.sampler import LocalSampler
 
 
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
@@ -60,6 +61,7 @@
 XRAY_RECORDER = {
     'AWS_XRAY_TRACING_NAME': 'django',
     'SAMPLING': False,
+    'SAMPLER': LocalSampler(),
 }
 
 LANGUAGE_CODE = 'en-us'

tests/ext/django/test_settings.py

@@ -0,0 +1,16 @@
+from unittest import mock
+
+import django
+from aws_xray_sdk import global_sdk_config
+from django.test import TestCase, override_settings
+from django.conf import settings
+from django.apps import apps
+
+from aws_xray_sdk.core import xray_recorder
+from aws_xray_sdk.core.sampling.sampler import LocalSampler
+
+
+class XRayConfigurationTestCase(TestCase):
+    def test_sampler_can_be_configured(self):
+        assert isinstance(settings.XRAY_RECORDER['SAMPLER'], LocalSampler)
+        assert isinstance(xray_recorder.sampler, LocalSampler)