Move integration tests to riot (#2967)

This was complicated slightly by a deprecation warning new in Python 3.10 as a result of some features wrapt is using which are slated for removal soon. An issue was created upstream to address since the fix didn't appear to be trivial.

Author: Kyle-Verhoog

.circleci/config.yml

@@ -4,7 +4,6 @@ default_resource_class: &default_resource_class medium
 cimg_base_image: &cimg_base_image cimg/base:stable
 python39_image: &python39_image cimg/python:3.9
 ddtrace_dev_image: &ddtrace_dev_image datadog/dd-trace-py:buster
-datadog_agent_image: &datadog_agent_image datadog/agent:latest
 redis_image: &redis_image redis:4.0-alpine
 memcached_image: &memcached_image memcached:1.5-alpine
 cassandra_image: &cassandra_image cassandra:3.11.7
@@ -243,15 +242,6 @@ httpbin_local: &httpbin_local
   image: *httpbin_image
   name: httpbin.org
 
-datadog_agent: &datadog_agent
-  image: *datadog_agent_image
-  environment:
-    DD_API_KEY: invalid_key_but_this_is_fine
-    DD_APM_ENABLED: true
-    DD_APM_RECEIVER_SOCKET: /tmp/ddagent/trace.sock
-    DD_BIND_HOST: 0.0.0.0
-    DD_LOG_LEVEL: DEBUG
-
 mysql_server: &mysql_server
   image: *mysql_image
   environment:
@@ -372,28 +362,38 @@ jobs:
   integration_agent5:
     <<: *machine_executor
     steps:
+      - attach_workspace:
+          at: .
       - checkout
       - run: docker-compose up -d ddagent5
       - run:
           command: docker-compose logs -f
           background: true
       - run:
-          command: ./scripts/ddtest scripts/run-tox-scenario '^py..-integration-v5'
+          command: |
+            mv .riot .ddriot
+            ./scripts/ddtest riot -v run --pass-env -s 'integration-v5'
 
   integration_agent:
     <<: *machine_executor
     steps:
+      - attach_workspace:
+          at: .
       - checkout
       - run: docker-compose up -d ddagent
       - run:
           command: docker-compose logs -f
           background: true
       - run:
-          command: ./scripts/ddtest scripts/run-tox-scenario '^py..-integration-latest'
+          command: |
+            mv .riot .ddriot
+            ./scripts/ddtest riot -v run --pass-env -s 'integration-latest'
 
   integration_testagent:
     <<: *machine_executor
     steps:
+      - attach_workspace:
+          at: .
       - checkout
       - run: SNAPSHOT_CI=1 docker-compose up -d testagent
       - run:
@@ -402,7 +402,9 @@ jobs:
       - run:
           environment:
             DD_TRACE_AGENT_URL: http://localhost:9126
-          command: ./scripts/ddtest scripts/run-tox-scenario '^py..-integration-snapshot'
+          command: |
+            mv .riot .ddriot
+            ./scripts/ddtest riot -v run --pass-env -s 'integration-snapshot'
 
   vendor:
     <<: *contrib_job_small

riotfile.py

@@ -207,6 +207,33 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION):
                 )
             ],
         ),
+        Venv(
+            name="integration",
+            pys=select_pys(),
+            command="pytest --no-cov {cmdargs} tests/integration/",
+            pkgs={"msgpack": [latest]},
+            venvs=[
+                Venv(
+                    name="integration-v5",
+                    env={
+                        "AGENT_VERSION": "v5",
+                    },
+                ),
+                Venv(
+                    name="integration-latest",
+                    env={
+                        "AGENT_VERSION": "latest",
+                    },
+                ),
+                Venv(
+                    name="integration-snapshot",
+                    env={
+                        "DD_TRACE_AGENT_URL": "http://localhost:9126",
+                        "AGENT_VERSION": "testagent",
+                    },
+                ),
+            ],
+        ),
         Venv(
             name="runtime",
             command="pytest {cmdargs} tests/runtime/",

tests/integration/test_integration.py

@@ -783,4 +783,17 @@ def test_no_warnings():
     env["DD_TRACE_SQLITE3_ENABLED"] = "false"
     out, err, status, pid = call_program("ddtrace-run", sys.executable, "-Wall", "-c", "'import ddtrace'", env=env)
     assert out == b"", out
-    assert err == b"", err
+
+    # Wrapt is using features deprecated in Python 3.10
+    # See https://github.com/GrahamDumpleton/wrapt/issues/200
+    if sys.version_info < (3, 10, 0):
+        assert err == b"", err
+    else:
+        assert (
+            err
+            == (
+                b"<frozen importlib._bootstrap>:914: ImportWarning: "
+                b"ImportHookFinder.find_spec() not found; falling back to find_module()\n"
+            )
+            * 75
+        ), err

tox.ini

@@ -20,7 +20,6 @@ envlist =
     wait
     {py27,py35,py36,py37,py38,py39,py310}-profile{,-gevent}
     {py27,py35,py36,py37,py38,py39,py310}-profile-minreqs{,-gevent}
-    py{27,35,36,37,38,39,310}-integration-{v5,latest,snapshot}
 # Integrations environments
     algoliasearch_contrib-py{27,35,36,37,38,39,310}-algoliasearch{1,2,}
     asyncio_contrib-py{35,36,37,38,39,310}
@@ -83,9 +82,6 @@ usedevelop = true
 setenv =
     DD_TESTING_RAISE=1
     profile-gevent: DD_PROFILE_TEST_GEVENT=1
-    integration-v5: AGENT_VERSION=v5
-    integration-latest: AGENT_VERSION=latest
-    integration-snapshot: AGENT_VERSION=testagent
     bottle_contrib_autopatch: DATADOG_SERVICE_NAME=bottle-app
 
 extras =
@@ -99,7 +95,6 @@ deps =
 # test dependencies installed in all envs
     mock
 # used to test our custom msgpack encoder
-    integration: msgpack
     profile: pytest-benchmark
     py{27,35,36,37,38,39}-profile: uwsgi
     py{27,35,36,37,38,39}-profile-minreqs: protobuf==3.0.0
@@ -253,7 +248,6 @@ commands =
     opentracer_asyncio: pytest {posargs} tests/opentracer/test_tracer_asyncio.py
     opentracer_tornado-tornado{40,41,42,43,44}: pytest {posargs} tests/opentracer/test_tracer_tornado.py
     opentracer_gevent: pytest {posargs} tests/opentracer/test_tracer_gevent.py
-    integration-{v5,latest,snapshot}: pytest --no-cov {posargs} tests/integration/
 # Contribs
     algoliasearch_contrib: pytest {posargs} tests/contrib/algoliasearch
     asyncio_contrib: pytest {posargs} tests/contrib/asyncio