dev/tooling: enable dd agent in github actions (#189)

* Fix fixture loading

* Regenerate client from commit 690ad2a of spec repo

* ddtrace install

Co-authored-by: Jiri Kuncar <[email protected]>
Co-authored-by: api-clients-generation-pipeline[bot] <54105614+api-clients-generation-pipeline[bot]@users.noreply.github.com>
Co-authored-by: ci.datadog-api-spec <[email protected]>

Author: 3 people

.apigentools-info

@@ -3,14 +3,14 @@
     "info_version": "2",
     "spec_versions": {
         "v1": {
-            "apigentools_version": "1.3.0",
-            "regenerated": "2020-12-14 17:30:32.158008",
-            "spec_repo_commit": "8276009"
+            "apigentools_version": "1.4.0",
+            "regenerated": "2020-12-15 12:13:29.100642",
+            "spec_repo_commit": "690ad2a"
         },
         "v2": {
-            "apigentools_version": "1.3.0",
-            "regenerated": "2020-12-14 17:30:41.733120",
-            "spec_repo_commit": "8276009"
+            "apigentools_version": "1.4.0",
+            "regenerated": "2020-12-15 12:13:39.491922",
+            "spec_repo_commit": "690ad2a"
         }
     }
 }

.azure-pipelines/all.yml

@@ -49,8 +49,8 @@ jobs:
     - script: |
         python -m pip install --upgrade pip setuptools
         python -m pip install cython
-        python -m pip install -e .[apm,tests]
-        python -m pip install -U --pre --find-links=https://s3.amazonaws.com/pypi.datadoghq.com/trace-dev/index.html ddtrace
+        python -m pip install -e .[tests]
+        python -m pip install --pre --find-links=https://s3.amazonaws.com/pypi.datadoghq.com/trace-dev/index.html ddtrace
       displayName: Install package
     - script: ./run-tests.sh
       displayName: Run integration tests

Dockerfile.test

@@ -1,6 +1,7 @@
-FROM python:3.8
+FROM python:3.9
 ENTRYPOINT [/datadog-api-client-python/run-tests.sh]
 
 COPY . /datadog-api-client-python
 WORKDIR /datadog-api-client-python/
-RUN pip install -e .[apm,tests]
+RUN pip install -U --pre --find-links=https://s3.amazonaws.com/pypi.datadoghq.com/trace-dev/index.html ddtrace && \
+    pip install -e .[tests]

docs/v1/README.md

@@ -18,9 +18,9 @@ Python >= 3.6
 If the python package is hosted on a repository, you can install directly using:
 
 ```sh
-pip install git+https://github.com/GIT_USER_ID/GIT_REPO_ID.git
+pip install git+https://github.com/DataDog/datadog-api-client-python.git
 ```
-(you may need to run `pip` with root permission: `sudo pip install git+https://github.com/GIT_USER_ID/GIT_REPO_ID.git`)
+(you may need to run `pip` with root permission: `sudo pip install git+https://github.com/DataDog/datadog-api-client-python.git`)
 
 Then import the package:
 ```python

docs/v2/README.md

@@ -18,9 +18,9 @@ Python >= 3.6
 If the python package is hosted on a repository, you can install directly using:
 
 ```sh
-pip install git+https://github.com/GIT_USER_ID/GIT_REPO_ID.git
+pip install git+https://github.com/DataDog/datadog-api-client-python.git
 ```
-(you may need to run `pip` with root permission: `sudo pip install git+https://github.com/GIT_USER_ID/GIT_REPO_ID.git`)
+(you may need to run `pip` with root permission: `sudo pip install git+https://github.com/DataDog/datadog-api-client-python.git`)
 
 Then import the package:
 ```python

run-tests.sh

@@ -3,10 +3,9 @@ set -e
 echo "Ensuring all dependencies are present in LICENSE-3rdparty.csv ..."
 ALL_DEPS="" # TODO
 DEPS_NOT_FOUND=""
-for one_dep in `echo $ALL_DEPS`; do
+for one_dep in $ALL_DEPS; do
     set +e
-    cat LICENSE-3rdparty.csv | grep "$one_dep" > /dev/null 2>&1
-    if [ $? -ne 0 ]; then
+    if grep "$one_dep" LICENSE-3rdparty.csv > /dev/null 2>&1; then
         DEPS_NOT_FOUND="${DEPS_NOT_FOUND}\n${one_dep}<LICENSE>,<COPYRIGHT>"
     fi
     set -e
@@ -18,14 +17,12 @@ else
     echo "LICENSE-3rdparty.csv is up to date"
 fi
 
-# Install test dependencies
-python -m pip install -e .
 # Run tests
 set +e
-python -m pytest
+python -m pytest -vvv
 RESULT=$?
-if [ "$RERECORD_FAILED_TESTS" == "true" -a "$RESULT" -ne 0 ]; then
-    RECORD=true python -m pytest --last-failed
+if [ "$RERECORD_FAILED_TESTS" == "true" ] && [ "$RESULT" -ne 0 ]; then
+    RECORD=true python -m pytest -vvv --last-failed
     RESULT=$?
 fi
 exit $RESULT

tests/conftest.py

@@ -5,18 +5,18 @@
 
 # First patch httplib
 tracer = None
-if "false" != os.getenv("RECORD", "false"):
-    try:
-        from ddtrace import config, patch, tracer
+try:
+    from ddtrace import config, patch, tracer
 
-        config.httplib["distributed_tracing"] = True
-        patch(httplib=True)
-    except ImportError:
-        pass
+    config.httplib["distributed_tracing"] = True
+    patch(httplib=True)
+except ImportError:
+    pass
 
 import importlib
 import json
 import logging
+import pathlib
 import re
 import sys
 import time
@@ -143,19 +143,17 @@ def __str__(self):
 
 
 @pytest.fixture
-def context(vcr_cassette, package_name, request, unique, unique_lower):
+def context(package_name, request, unique, unique_lower):
     """
     Return a mapping with all defined fixtures, all objects created by `given` steps,
     and the undo operations to perform after a test scenario.
     """
-    ctx = {"undo_operations": []}
-    for f in request.fixturenames:
-        if f == "context":
-            continue
-        try:
-            ctx[f] = request.getfixturevalue(f)
-        except Exception:
-            pass
+    ctx = {
+        "undo_operations": [],
+        "unique": unique,
+        "unique_lower": unique_lower,
+    }
+
     yield ctx
 
     exceptions = importlib.import_module(package_name + ".exceptions")
@@ -188,28 +186,23 @@ def record_mode(request):
 
 @pytest.fixture(scope="module")
 def vcr_config(record_mode):
-    def before_record_request(request):
-        if "Datadog-Meta-Tracer-Version" in request.headers:
-            return None
-        return request
-
     config = dict(
         filter_headers=("DD-API-KEY", "DD-APPLICATION-KEY"),
         filter_query_parameters=("api_key", "application_key"),
-        before_record_request=before_record_request,
     )
     return config
 
 
 @pytest.fixture
-def freezer(vcr_cassette_name, vcr_cassette, vcr):
+def freezer(vcr_cassette_name, record_mode, vcr):
     from freezegun import freeze_time
     from dateutil import parser
 
-    if vcr_cassette.record_mode != "none":
+    if record_mode != "false":
         tzinfo = datetime.now().astimezone().tzinfo
         freeze_at = datetime.now().replace(tzinfo=tzinfo).isoformat()
-        if vcr_cassette.record_mode == "all":
+        if record_mode == "true":
+            pathlib.Path(vcr.cassette_library_dir).mkdir(parents=True, exist_ok=True)
             with open(
                 os.path.join(vcr.cassette_library_dir, vcr_cassette_name + ".frozen"),
                 "w+",
@@ -273,9 +266,11 @@ def client(_package, configuration, record_mode, vcr_cassette):
         vcr_cassette.data.clear()
 
     with _package.ApiClient(configuration) as api_client:
+        print(f"starting with {vcr_cassette}")
         yield api_client
 
 
+
 @given(parsers.parse('an instance of "{name}" API'))
 def api(context, package_name, client, name):
     """Return an API instance."""
@@ -371,7 +366,7 @@ def cleanup(api, operation_id, response, client=client):
 
 
 @when("the request is sent")
-def execute_request(undo, context, vcr_cassette, client):
+def execute_request(undo, context, client):
     """Execute the prepared request."""
     api_request = context["api_request"]
     api_request["response"] = api_request["request"].call_with_http_info(

tests/v1/cassettes/test_list_ip_ranges_returns_ok_response.frozen

@@ -1 +1 @@
-2020-09-24T15:22:49.668210+02:00
+2020-12-14T13:39:55.657993+00:00