Merge branch '1.x' into yunkim/release-notes-documentation

.circleci/config.yml

@@ -672,8 +672,8 @@ jobs:
       - image: *ddtrace_dev_image
       - image: *consul_image
     steps:
-      - run_tox_scenario:
-          pattern: '^consul_contrib-'
+      - run_test:
+          pattern: 'consul'
 
   dogpile_cache:
     <<: *contrib_job

riotfile.py

@@ -2220,5 +2220,18 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION):
                 ),
             ],
         ),
+        Venv(
+            name="consul",
+            pys=select_pys(),
+            command="pytest {cmdargs} tests/contrib/consul",
+            pkgs={
+                "python-consul": [
+                    ">=0.7,<1.0",
+                    ">=1.0,<1.1",
+                    ">=1.1,<1.2",
+                    latest,
+                ],
+            },
+        ),
     ],
 )

tests/profiling/collector/test_stack.py

@@ -1,6 +1,7 @@
 # -*- encoding: utf-8 -*-
 import collections
 import os
+import sys
 import threading
 import time
 import timeit
@@ -129,6 +130,7 @@ def sleep_instance(self):
         assert SomeClass.sleep_class()
 
 
+@pytest.mark.skipif(sys.platform == "win32", reason="FIXME: this test is flaky on Windows")
 def test_collect_once_with_class_not_right_type():
     # type: (...) -> None
     r = recorder.Recorder()

tox.ini

@@ -28,7 +28,6 @@ envlist =
     algoliasearch_contrib-py{27,35,36,37,38,39,310,311}-algoliasearch{1,2,}
     bottle_contrib{,_autopatch}-py{27,35,36,37,38,39}-bottle{11,12,}-webtest
     bottle_contrib{,_autopatch}-py{310,311}-bottle-webtest
-    consul_contrib-py{27,35,36,37,38,39,310,311}-consul{07,10,11,}
     gevent_contrib-py27-gevent{11,12,13}-greenlet1-sslmodules
     gevent_contrib-py{35,36}-gevent{11,12,13}-greenlet1-sslmodules3-sslmodules
     gevent_contrib-py{37,38}-gevent{13,14}-greenlet1-sslmodules3-sslmodules
@@ -149,10 +148,6 @@ deps =
     bottle: bottle
     bottle11: bottle>=0.11,<0.12
     bottle12: bottle>=0.12,<0.13
-    consul: python-consul
-    consul07: python-consul>=0.7,<1.0
-    consul10: python-consul>=1.0,<1.1
-    consul11: python-consul>=1.1,<1.2
     futures: futures
     futures30: futures>=3.0,<3.1
     futures31: futures>=3.1,<3.2
@@ -249,7 +244,6 @@ commands =
     algoliasearch_contrib: python -m pytest {posargs} tests/contrib/algoliasearch
     bottle_contrib: python -m pytest {posargs} --ignore="tests/contrib/bottle/test_autopatch.py" tests/contrib/bottle/
     bottle_contrib_autopatch: python tests/ddtrace_run.py pytest {posargs} tests/contrib/bottle/test_autopatch.py
-    consul_contrib: python -m pytest {posargs} tests/contrib/consul
     gevent_contrib: python -m pytest {posargs} tests/contrib/gevent
     molten_contrib: python -m pytest {posargs} tests/contrib/molten
     mysql_contrib: python -m pytest {posargs} tests/contrib/mysql