DataDog
diff --git a/‎.circleci/config.yml‎
Lines changed: 12 additions & 0 deletions b/‎.circleci/config.yml‎
Lines changed: 12 additions & 0 deletions
diff --git a/‎.github/ISSUE_TEMPLATE.md‎
Lines changed: 4 additions & 0 deletions b/‎.github/ISSUE_TEMPLATE.md‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎.github/workflows/django.yml‎
Lines changed: 46 additions & 0 deletions b/‎.github/workflows/django.yml‎
Lines changed: 46 additions & 0 deletions
diff --git a/‎.github/workflows/flask.yml‎
Lines changed: 35 additions & 0 deletions b/‎.github/workflows/flask.yml‎
Lines changed: 35 additions & 0 deletions
diff --git a/‎.gitlab-ci.yml‎
Lines changed: 10 additions & 20 deletions b/‎.gitlab-ci.yml‎
Lines changed: 10 additions & 20 deletions
diff --git a/‎ddtrace/_worker.py‎
Lines changed: 7 additions & 20 deletions b/‎ddtrace/_worker.py‎
Lines changed: 7 additions & 20 deletions
diff --git a/‎ddtrace/commands/ddtrace_run.py‎
Lines changed: 5 additions & 3 deletions b/‎ddtrace/commands/ddtrace_run.py‎
Lines changed: 5 additions & 3 deletions
diff --git a/‎ddtrace/compat.py‎
Lines changed: 1 addition & 0 deletions b/‎ddtrace/compat.py‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎ddtrace/contrib/aiohttp/middlewares.py‎
Lines changed: 1 addition & 7 deletions b/‎ddtrace/contrib/aiohttp/middlewares.py‎
Lines changed: 1 addition & 7 deletions
diff --git a/‎ddtrace/contrib/asgi/middleware.py‎
Lines changed: 3 additions & 5 deletions b/‎ddtrace/contrib/asgi/middleware.py‎
Lines changed: 3 additions & 5 deletions
@@ -928,6 +928,16 @@ jobs:
           wait: rediscluster
           pattern: '^rediscluster_contrib-'
 
+  urllib3:
+    <<: *contrib_job
+    docker:
+      - image: *ddtrace_dev_image
+      - *httpbin_local
+    resource_class: *resource_class
+    steps:
+      - run_test:
+          pattern: 'urllib3'
+
   vertica:
     <<: *contrib_job
     docker:
@@ -1106,6 +1116,7 @@ requires_tests: &requires_tests
     - test_logging
     - tracer
     - tornado
+    - urllib3
     - vertica
     - wsgi
     - build-docker-ci-image
@@ -1209,6 +1220,7 @@ workflows:
       - test_logging: *requires_pre_test
       - tornado: *requires_pre_test
       - tracer: *requires_pre_test
+      - urllib3: *requires_pre_test
       - vertica: *requires_pre_test
       - wsgi: *requires_pre_test
       - build-docker-ci-image: *requires_pre_test
 
@@ -8,6 +8,10 @@ library.
 
 ### Which version of dd-trace-py are you using?
 
+### Which version of pip are you using?
+
+_ddtrace requires pip>=18 to install one of our pre-built wheels_
+
 ### Which version of the libraries are you using?
 
 You can copy/paste the output of `pip freeze` here.
 
@@ -0,0 +1,46 @@
+name: django-testsuite
+on:
+  push:
+    branches: [master]
+  pull_request:
+jobs:
+  django-testsuite-3_1_7:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: django
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          path: ddtrace
+      - uses: actions/checkout@v2
+        with:
+          repository: django/django
+          ref: 3.1.7
+          path: django
+      - uses: actions/setup-python@v2
+        with:
+          python-version: "3.8"
+      - name: Install pylibmc's libmemcached package
+        # Django-specific: pylibmc in Ubuntu requires libmemcached package
+        run: sudo apt install libmemcached-dev zlib1g
+      - name: Install dependencies
+        # Django-specific: separate dependencies for tests
+        run: pip install -r tests/requirements/py3.txt
+      - name: Install ddtrace
+        run: pip install ../ddtrace
+      - name: Install django
+        run: pip install ../django
+      - name: Set Pythonpath
+        run: echo "PYTHONPATH=." >> $GITHUB_ENV
+      - name: Disable unsupported tests
+        run: |
+          # Note: test_supports_json_field_operational_error will fail with the tracer
+          # DEV: Insert @skipUnless before the test definition
+          # DEV: We need to escape the space indenting
+          sed -i'' '/def test_supports_json_field_operational_error/i \ \ \ \ @skipUnless(False, "test not supported by dd-trace-py")' tests/backends/sqlite/test_features.py
+      - name: Run tests
+        # django.tests.requests module interferes with requests library patching in the tracer -> disable requests patch
+        run: DD_TRACE_REQUESTS_ENABLED=0 ddtrace-run tests/runtests.py
+
+
@@ -0,0 +1,35 @@
+name: flask-testsuite
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+jobs:
+  flask-testsuite-1_1_2:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: flask
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          path: ddtrace
+      - uses: actions/checkout@v2
+        with:
+          repository: pallets/flask
+          ref: 1.1.2
+          path: flask
+      - uses: actions/setup-python@v2
+        with:
+          python-version: '3.8'
+      - name: Install tox
+        run: pip install tox
+      - name: Create tox env
+        run: tox -e py38 --notest
+      - name: Inject ddtrace
+        run: .tox/py38/bin/pip install ../ddtrace
+      - name: Add pytest configuration for ddtrace
+        run: echo -e "[pytest]\nddtrace-patch-all = 1" > pytest.ini
+      - name: Run tests
+        # test_exception_propagation is broken upstream
+        run: tox -e py38 -- -k 'not test_exception_propagation'
@@ -1,27 +1,17 @@
 stages:
   - deploy
 
-variables:
-  INDEX_FILE: index.txt
-
 .common: &common
   tags: [ "runner:main", "size:large" ]
 
-copy_to_s3:
-  <<: *common
+deploy_to_reliability_env:
   stage: deploy
-  image: registry.gitlab.com/gitlab-org/cloud-deploy/aws-base:latest
-  rules:
-    - if: '$CI_COMMIT_BRANCH == "master"'
-      when: on_success
-    - if: '$CI_COMMIT_BRANCH == "staging"'
-      when: on_success
-  script:
-    - export ACCESS_KEY_ID=$(aws ssm get-parameter --region us-east-1 --name ci.dd-trace-py.secret_key_id --with-decryption --query "Parameter.Value" --out text)
-    - export SECRET_ACCESS_KEY=$(aws ssm get-parameter --region us-east-1 --name ci.dd-trace-py.secret_sec_key_id --with-decryption --query "Parameter.Value" --out text)
-    - export AWS_ACCESS_KEY_ID=$ACCESS_KEY_ID
-    - export AWS_SECRET_ACCESS_KEY=$SECRET_ACCESS_KEY
-    - echo $CI_COMMIT_REF_NAME >> $INDEX_FILE
-    - echo $CI_COMMIT_SHA >> $INDEX_FILE
-    - echo $GITLAB_USER_NAME >> $INDEX_FILE
-    - aws s3 cp $INDEX_FILE s3://datadog-reliability-env/python/$INDEX_FILE
+  when: on_success
+  trigger:
+    project: DataDog/datadog-reliability-env
+  variables:
+    UPSTREAM_BRANCH: $CI_COMMIT_REF_NAME
+    UPSTREAM_PROJECT_ID: $CI_PROJECT_ID
+    UPSTREAM_PROJECT_NAME: $CI_PROJECT_NAME
+    UPSTREAM_COMMIT_SHA: $CI_COMMIT_SHA
+    FORCE_TRIGGER: $FORCE_TRIGGER
@@ -1,6 +1,6 @@
-import threading
 from typing import Optional
 
+from .internal import periodic
 from .internal.logger import get_logger
 
 
@@ -34,11 +34,11 @@ def __init__(
         :param daemon: Whether the worker should be a daemon.
         """
 
-        self._thread = threading.Thread(target=self._target, name=name)
+        self._thread = periodic.PeriodicThread(
+            interval, target=self.run_periodic, name=name, on_shutdown=self.on_shutdown
+        )
         self._thread.daemon = daemon
-        self._stop = threading.Event()
         self.started = False
-        self.interval = interval
 
     def start(self):
         # type: () -> None
@@ -51,7 +51,7 @@ def stop(self):
         # type: () -> None
         """Stop the worker."""
         _LOG.debug("Stopping %s thread", self._thread.name)
-        self._stop.set()
+        self._thread.stop()
 
     def is_alive(self):
         # type: () -> bool
@@ -61,25 +61,12 @@ def join(self, timeout=None):
         # type: (Optional[float]) -> None
         return self._thread.join(timeout)
 
-    def _target(self):
-        # type: () -> None
-        while not self._stop.wait(self.interval):
-            self.run_periodic()
-        self._on_shutdown()
-
     @staticmethod
     def run_periodic():
         # type: () -> None
         """Method executed every interval."""
-        pass
 
-    def _on_shutdown(self):
-        # type: () -> None
-        _LOG.debug("Shutting down %s thread", self._thread.name)
-        self.on_shutdown()
-
-    @staticmethod
-    def on_shutdown():
+    def on_shutdown(self):
         # type: () -> None
         """Method ran on worker shutdown."""
-        pass
+        _LOG.debug("Shutting down %s thread", self._thread.name)
@@ -107,11 +107,13 @@ def main():
     if os.path.basename(executable) == "uwsgi":
         print(
             (
-                "ddtrace-run is not supported with uwsgi. "
-                "See https://ddtrace.readthedocs.io/en/stable/advanced_usage.html#uwsgi for details."
+                "ddtrace-run has known compatibility issues with uWSGI where the "
+                "tracer is not started properly in uWSGI workers which can cause "
+                "broken behavior. It is recommended you remove ddtrace-run and "
+                "update your uWSGI configuration following "
+                "https://ddtrace.readthedocs.io/en/stable/advanced_usage.html#uwsgi."
             )
         )
-        sys.exit(1)
 
     try:
         # Raises OSError for permissions errors in Python 2
 
@@ -49,6 +49,7 @@
 reraise = six.reraise
 reload_module = six.moves.reload_module  # type: ignore[attr-defined]
 
+ensure_text = six.ensure_text
 stringify = six.text_type
 string_type = six.string_types[0]
 binary_type = six.binary_type
 
@@ -8,7 +8,6 @@
 from ...constants import SPAN_MEASURED_KEY
 from ...ext import SpanTypes
 from ...ext import http
-from ...propagation.http import HTTPPropagator
 from ..asyncio import context_provider
 
 
@@ -34,14 +33,9 @@ def attach_context(request):
         # application configs
         tracer = app[CONFIG_KEY]["tracer"]
         service = app[CONFIG_KEY]["service"]
-        distributed_tracing = app[CONFIG_KEY]["distributed_tracing_enabled"]
 
         # Create a new context based on the propagated information.
-        if distributed_tracing:
-            context = HTTPPropagator.extract(request.headers)
-            # Only need to active the new context if something was propagated
-            if context.trace_id:
-                tracer.context_provider.activate(context)
+        trace_utils.activate_distributed_headers(tracer, int_config=app[CONFIG_KEY], request_headers=request.headers)
 
         # trace the handler
         request_span = tracer.trace(
 
@@ -5,7 +5,6 @@
 from ddtrace.constants import ANALYTICS_SAMPLE_RATE_KEY
 from ddtrace.ext import SpanTypes
 from ddtrace.ext import http
-from ddtrace.propagation.http import HTTPPropagator
 
 from .. import trace_utils
 from ...compat import reraise
@@ -88,10 +87,9 @@ async def __call__(self, scope, receive, send):
 
         headers = _extract_headers(scope)
 
-        if self.integration_config.distributed_tracing:
-            context = HTTPPropagator.extract(headers)
-            if context.trace_id:
-                self.tracer.context_provider.activate(context)
+        trace_utils.activate_distributed_headers(
+            self.tracer, int_config=self.integration_config, request_headers=headers
+        )
 
         resource = "{} {}".format(scope["method"], scope["path"])
Original file line number	Diff line number	Diff line change
`@@ -107,11 +107,13 @@ def main():`
`107`	`107`	`if os.path.basename(executable) == "uwsgi":`
`108`	`108`	`print(`
`109`	`109`	`(`
`110`		`- "ddtrace-run is not supported with uwsgi. "`
`111`		`- "See https://ddtrace.readthedocs.io/en/stable/advanced_usage.html#uwsgi for details."`
	`110`	`+ "ddtrace-run has known compatibility issues with uWSGI where the "`
	`111`	`+ "tracer is not started properly in uWSGI workers which can cause "`
	`112`	`+ "broken behavior. It is recommended you remove ddtrace-run and "`
	`113`	`+ "update your uWSGI configuration following "`
	`114`	`+ "https://ddtrace.readthedocs.io/en/stable/advanced_usage.html#uwsgi."`
`112`	`115`	`)`
`113`	`116`	`)`
`114`		`- sys.exit(1)`
`115`	`117`
`116`	`118`	`try:`
`117`	`119`	`# Raises OSError for permissions errors in Python 2`