backport CI fixes to 0.48 (#2350)

* fix(ci): pass environment through riot (#2283)

* fix(ci): pass environment through riot

riot 0.5 fixed environment variables which actually exposed a
misconfiguration we had.

* fix django test case

(cherry picked from commit a21a627)

* Bump rediscluster docker images to 6.2 (#2306)

The version being used as well as a bunch of others have been removed
from dockerhub for some reason: https://github.com/Grokzen/docker-redis-cluster#redis-major-version-support-and-dockerhub-availability

(cherry picked from commit 660fcf4)

* fix: avoid latest release of mysql-connector-python (#2336)

The latest release of mysql-connector-python seems to introduce a
regressin on Python 2.7 so we temporarily prenvet tox from installing
it.

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>

Co-authored-by: Kyle Verhoog <[email protected]>
Co-authored-by: Kyle Verhoog <[email protected]>
Co-authored-by: Gabriele N. Tornetta <[email protected]>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>

Author: 3 people

.circleci/config.yml

@@ -15,7 +15,7 @@ python27_image: &python27_image circleci/python:2.7
 ddtrace_dev_image: &ddtrace_dev_image datadog/dd-trace-py:latest
 datadog_agent_image: &datadog_agent_image datadog/agent:latest
 redis_image: &redis_image redis:4.0-alpine
-rediscluster_image: &rediscluster_image grokzen/redis-cluster:4.0.9
+rediscluster_image: &rediscluster_image grokzen/redis-cluster:6.2.0
 memcached_image: &memcached_image memcached:1.5-alpine
 cassandra_image: &cassandra_image cassandra:3.11.7
 consul_image: &consul_image consul:1.6.0
@@ -164,7 +164,7 @@ commands:
             - run:
                 environment:
                   DD_TRACE_AGENT_URL: http://localhost:9126
-                command: "echo -p2.7,-p3.5,-p3.6,-p3.7,-p3.8,-p3.9 | tr ',' '\n' | circleci tests split | xargs ./scripts/ddtest riot -v run -s '<< parameters.pattern >>'"
+                command: "echo -p2.7,-p3.5,-p3.6,-p3.7,-p3.8,-p3.9 | tr ',' '\n' | circleci tests split | xargs ./scripts/ddtest riot -v run --pass-env -s '<< parameters.pattern >>'"
       - unless:
           condition:
               << parameters.snapshot >>

docker-compose.yml

@@ -39,7 +39,7 @@ services:
         ports:
             - "127.0.0.1:6379:6379"
     rediscluster:
-        image: grokzen/redis-cluster:4.0.9
+        image: grokzen/redis-cluster:6.2.0
         environment:
             - IP=0.0.0.0
         ports:

riotfile.py

@@ -493,7 +493,7 @@ def select_pys(min_version=min(SUPPORTED_PYTHON_VERSIONS), max_version=max(SUPPO
                     pkgs={
                         "sqlalchemy": ["~=1.0.0", "~=1.1.0", "~=1.2.0", "~=1.3.0", latest],
                         "psycopg2": ["~=2.8.0"],
-                        "mysql-connector-python": latest,
+                        "mysql-connector-python": [">=8,<8.0.24"],
                     },
                 ),
             ],

tests/utils.py

@@ -434,10 +434,10 @@ class DummyTracer(Tracer):
 
     def __init__(self):
         super(DummyTracer, self).__init__()
-        self._update_writer()
+        self._update_writer(getattr(self.writer, "agent_url", None))
 
-    def _update_writer(self):
-        self.writer = DummyWriter()
+    def _update_writer(self, agent_url):
+        self.writer = DummyWriter(agent_url)
 
     def pop(self):
         # type: () -> List[Span]
@@ -450,7 +450,7 @@ def pop_traces(self):
     def configure(self, *args, **kwargs):
         super(DummyTracer, self).configure(*args, **kwargs)
         # `.configure()` may reset the writer
-        self._update_writer()
+        self._update_writer(self.writer.agent_url)
 
 
 class TestSpan(Span):

tox.ini

@@ -249,8 +249,8 @@ deps =
     molten07: molten>=0.7,<0.8
     molten10: molten>=1.0,<1.1
     mongoengine: mongoengine
-    mysqlconnector: mysql-connector-python
-    mysqlconnector80: mysql-connector-python>=8.0,<8.1
+    mysqlconnector: mysql-connector-python<8.0.24
+    mysqlconnector80: mysql-connector-python>=8.0,<8.0.24
     mysqldb: mysql-python
     mysqldb12: mysql-python>=1.2,<1.3
     mysqlclient: mysqlclient