Do not record tracing requests (#78)

Author: jirikuncar

.azure-pipelines/all.yml

@@ -46,6 +46,8 @@ jobs:
   services:
     datadog-agent: datadog-agent
   steps:
+    - script: python -m pip install -e .[apm,tests]
+      displayName: Install package
     - script: ./run-tests.sh
       displayName: Run integration tests
       env:

run-tests.sh

@@ -19,7 +19,7 @@ else
 fi
 
 # Install test dependencies
-python -m pip install -e .[apm,tests]
+# python -m pip install -e .[apm,tests]
 # Run tests
 set +e
 python -m pytest

tests/conftest.py

@@ -205,9 +205,15 @@ 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
 
@@ -236,13 +242,13 @@ def freezer(vcr_cassette_name, vcr_cassette, vcr):
 @given('a valid "apiKeyAuth" key in the system')
 def a_valid_api_key(configuration):
     """a valid API key."""
-    configuration.api_key["apiKeyAuth"] = os.getenv("DD_TEST_CLIENT_API_KEY")
+    configuration.api_key["apiKeyAuth"] = os.getenv("DD_TEST_CLIENT_API_KEY", "")
 
 
 @given('a valid "appKeyAuth" key in the system')
 def a_valid_application_key(configuration):
     """a valid Application key."""
-    configuration.api_key["appKeyAuth"] = os.getenv("DD_TEST_CLIENT_APP_KEY")
+    configuration.api_key["appKeyAuth"] = os.getenv("DD_TEST_CLIENT_APP_KEY", "")
 
 
 @pytest.fixture

tests/v1/cassettes/test_list_ip_ranges_returns_ok_response.yaml

@@ -9,18 +9,18 @@ interactions:
       Dd-Operation-Id:
       - GetIpRanges
       User-Agent:
-      - datadog-api-client-python/0.1.dev66+dirty (python 3.7.7; os Darwin; arch x86_64)
+      - datadog-api-client-python/0.1.dev67+dirty (python 3.8.5; os Darwin; arch x86_64)
       x-datadog-parent-id:
-      - '15076274472212834694'
+      - '3810264299572682533'
       x-datadog-sampling-priority:
       - '1'
       x-datadog-trace-id:
-      - '1396492202956212894'
+      - '18298303860074712282'
     method: GET
     uri: https://ip-ranges.datadoghq.com/
   response:
     body:
-      string: "{\n    \"version\": 29,\n    \"modified\": \"2020-06-22-12-00-00\",\n
+      string: "{\n    \"version\": 30,\n    \"modified\": \"2020-08-27-09-00-00\",\n
         \   \"agents\": {\n        \"prefixes_ipv4\": [\n            \"107.21.15.22/32\",\n
         \           \"107.21.18.19/32\",\n            \"107.23.209.202/32\",\n            \"107.23.59.124/32\",\n
         \           \"107.23.68.220/32\",\n            \"107.23.74.206/32\",\n            \"184.72.98.113/32\",\n
@@ -310,36 +310,38 @@ interactions:
         \           \"52.9.13.199/32\",\n            \"52.9.139.134/32\",\n            \"63.34.100.178/32\",\n
         \           \"63.35.33.198/32\",\n            \"99.79.87.237/32\"\n        ],\n
         \       \"prefixes_ipv6\": []\n    },\n    \"webhooks\": {\n        \"prefixes_ipv4\":
-        [\n            \"34.192.254.186/32\",\n            \"34.204.102.208/32\",\n
-        \           \"52.20.96.17/32\"\n        ],\n        \"prefixes_ipv6\": []\n
-        \   }\n}\n"
+        [\n            \"3.218.14.56/32\",\n            \"3.225.172.201/32\",\n            \"34.192.254.186/32\",\n
+        \           \"34.204.102.208/32\",\n            \"52.20.96.17/32\",\n            \"52.21.183.255/32\"\n
+        \       ],\n        \"prefixes_ipv6\": []\n    }\n}\n"
     headers:
       Accept-Ranges:
       - bytes
+      Age:
+      - '32'
       Connection:
       - keep-alive
       Content-Length:
-      - '27355'
+      - '27449'
       Content-Type:
       - application/json
       Date:
-      - Thu, 09 Jul 2020 08:46:42 GMT
+      - Fri, 18 Sep 2020 11:51:12 GMT
       ETag:
-      - '"669c774898319a1b2b93efe51e7bab92"'
+      - '"a10a4e3f85ed8c2509855388e149972a"'
       Last-Modified:
-      - Mon, 22 Jun 2020 10:05:14 GMT
+      - Thu, 27 Aug 2020 12:58:04 GMT
       Server:
       - AmazonS3
       Vary:
       - Accept-Encoding
       Via:
-      - 1.1 4debdaa39c21a3212350a638102f8b06.cloudfront.net (CloudFront)
+      - 1.1 960b47175d6cfc9ed048624de2747035.cloudfront.net (CloudFront)
       X-Amz-Cf-Id:
-      - _94naS-Szp4Jgjjj9udFzWCwuBpdhGth5JG2qscWc9rKXI3uh6azJA==
+      - 5ags5K5jwp3hZhwNEgfIo8HYE8a8H1kJQCFA2CCWxvwO9dV6q4JyzQ==
       X-Amz-Cf-Pop:
-      - MAD50-C1
+      - MAD51-C2
       X-Cache:
-      - Miss from cloudfront
+      - Hit from cloudfront
     status:
       code: 200
       message: OK

tests/v2/cassettes/test_add_a_user_to_a_role_returns_ok_response.frozen

@@ -1 +1 @@
-2020-07-09T10:46:44.829180+02:00
+2020-09-18T13:52:21.913614+02:00

tests/v2/cassettes/test_add_a_user_to_a_role_returns_ok_response.yaml

@@ -1,6 +1,6 @@
 interactions:
 - request:
-    body: '{"data": {"type": "roles", "attributes": {"name": "datadog-api-client-python-test_add_a_user_to_a_role_returns_ok_response-1594284404.830072"}}}'
+    body: '{"data": {"type": "roles", "attributes": {"name": "datadog-api-client-python-test_add_a_user_to_a_role_returns_ok_response-1600429941.913614"}}}'
     headers:
       Accept:
       - application/json
@@ -9,18 +9,18 @@ interactions:
       Dd-Operation-Id:
       - CreateRole
       User-Agent:
-      - datadog-api-client-python/0.1.dev66+dirty (python 3.7.7; os Darwin; arch x86_64)
+      - datadog-api-client-python/0.1.dev67+dirty (python 3.8.5; os Darwin; arch x86_64)
       x-datadog-parent-id:
-      - '15884952075265482642'
+      - '8558459201274557640'
       x-datadog-sampling-priority:
       - '1'
       x-datadog-trace-id:
-      - '8203213315955403737'
+      - '15244305100351974793'
     method: POST
     uri: https://api.datadoghq.com/api/v2/roles
   response:
     body:
-      string: '{"data":{"type":"roles","id":"b81810a6-c1c0-11ea-9cec-67b58552398d","attributes":{"name":"datadog-api-client-python-test_add_a_user_to_a_role_returns_ok_response-1594284404.830072","created_at":"2020-07-09T08:46:45.468242+00:00","modified_at":"2020-07-09T08:46:45.468242+00:00"},"relationships":{"permissions":{"data":[{"type":"permissions","id":"d90f6830-d3d8-11e9-a77a-b3404e5e9ee2"},{"type":"permissions","id":"4441648c-d8b1-11e9-a77a-1b899a04b304"}]}}}}'
+      string: '{"data":{"type":"roles","id":"69891cce-f9a5-11ea-adf4-d7aa0bfd6e6f","attributes":{"name":"datadog-api-client-python-test_add_a_user_to_a_role_returns_ok_response-1600429941.913614","created_at":"2020-09-18T11:52:22.372677+00:00","modified_at":"2020-09-18T11:52:22.372677+00:00"},"relationships":{"permissions":{"data":[{"type":"permissions","id":"d90f6830-d3d8-11e9-a77a-b3404e5e9ee2"},{"type":"permissions","id":"4441648c-d8b1-11e9-a77a-1b899a04b304"}]}}}}'
     headers:
       Cache-Control:
       - no-cache
@@ -35,11 +35,11 @@ interactions:
       DD-POOL:
       - dogweb
       Date:
-      - Thu, 09 Jul 2020 08:46:45 GMT
+      - Fri, 18 Sep 2020 11:52:22 GMT
       Pragma:
       - no-cache
       Set-Cookie:
-      - DD-PSHARD=233; Max-Age=604800; Path=/; expires=Thu, 16-Jul-2020 08:46:45 GMT;
+      - DD-PSHARD=233; Max-Age=604800; Path=/; expires=Fri, 25-Sep-2020 11:52:22 GMT;
         secure; HttpOnly
       Strict-Transport-Security:
       - max-age=15724800;
@@ -48,16 +48,24 @@ interactions:
       X-Content-Type-Options:
       - nosniff
       X-DD-Debug:
-      - rK52fEhHKxisnKo2rembr3YValr4L+BG6/8tD9iNDc8Prg2mnV6DynBkS75++wh/
+      - kS9NSnhl4uQ8VlOuLb8SB7TQURuCRIbRwHRx1a1SKX/xDGoogXWL0I8r2t0CM40K
       X-DD-VERSION:
-      - '35.2718508'
+      - '35.3056650'
       X-Frame-Options:
       - SAMEORIGIN
+      X-RateLimit-Limit:
+      - '500'
+      X-RateLimit-Period:
+      - '60'
+      X-RateLimit-Remaining:
+      - '480'
+      X-RateLimit-Reset:
+      - '38'
     status:
       code: 200
       message: OK
 - request:
-    body: '{"data": {"type": "users", "attributes": {"email": "datadog-api-client-python-test_add_a_user_to_a_role_returns_ok_response-1594284405.533793@datadoghq.com"}}}'
+    body: '{"data": {"type": "users", "attributes": {"email": "datadog-api-client-python-test_add_a_user_to_a_role_returns_ok_response-1600429941.913614@datadoghq.com"}}}'
     headers:
       Accept:
       - application/json
@@ -66,18 +74,18 @@ interactions:
       Dd-Operation-Id:
       - CreateUser
       User-Agent:
-      - datadog-api-client-python/0.1.dev66+dirty (python 3.7.7; os Darwin; arch x86_64)
+      - datadog-api-client-python/0.1.dev67+dirty (python 3.8.5; os Darwin; arch x86_64)
       x-datadog-parent-id:
-      - '16850406431851233939'
+      - '10038621718731563104'
       x-datadog-sampling-priority:
       - '1'
       x-datadog-trace-id:
-      - '8203213315955403737'
+      - '15244305100351974793'
     method: POST
     uri: https://api.datadoghq.com/api/v2/users
   response:
     body:
-      string: '{"data":{"type":"users","id":"b846a434-c1c0-11ea-9cec-e7b501f3531f","attributes":{"name":null,"handle":"datadog-api-client-python-test_add_a_user_to_a_role_returns_ok_response-1594284405.533793@datadoghq.com","created_at":"2020-07-09T08:46:45.772962+00:00","email":"datadog-api-client-python-test_add_a_user_to_a_role_returns_ok_response-1594284405.533793@datadoghq.com","icon":"https://secure.gravatar.com/avatar/ab056270b9cba867d091a6aa6e1ddf3f?s=48&d=retro","title":null,"verified":false,"disabled":false,"allowed_login_methods":[],"status":"Pending"},"relationships":{"roles":{"data":[]},"org":{"data":{"type":"orgs","id":"4dee724d-00cc-11ea-a77b-570c9d03c6c5"}}}}}'
+      string: '{"data":{"type":"users","id":"69abf456-f9a5-11ea-adf4-ebea463b630a","attributes":{"name":null,"handle":"datadog-api-client-python-test_add_a_user_to_a_role_returns_ok_response-1600429941.913614@datadoghq.com","created_at":"2020-09-18T11:52:22.599840+00:00","email":"datadog-api-client-python-test_add_a_user_to_a_role_returns_ok_response-1600429941.913614@datadoghq.com","icon":"https://secure.gravatar.com/avatar/62eb6036d677ac5755342e6202b18b3a?s=48&d=retro","title":null,"verified":false,"disabled":false,"allowed_login_methods":[],"status":"Pending"},"relationships":{"roles":{"data":[]},"org":{"data":{"type":"orgs","id":"4dee724d-00cc-11ea-a77b-570c9d03c6c5"}}}}}'
     headers:
       Cache-Control:
       - no-cache
@@ -92,27 +100,27 @@ interactions:
       DD-POOL:
       - dogweb
       Date:
-      - Thu, 09 Jul 2020 08:46:45 GMT
+      - Fri, 18 Sep 2020 11:52:22 GMT
       Pragma:
       - no-cache
       Set-Cookie:
-      - DD-PSHARD=233; Max-Age=604800; Path=/; expires=Thu, 16-Jul-2020 08:46:45 GMT;
+      - DD-PSHARD=233; Max-Age=604800; Path=/; expires=Fri, 25-Sep-2020 11:52:22 GMT;
         secure; HttpOnly
       Strict-Transport-Security:
       - max-age=15724800;
       X-Content-Type-Options:
       - nosniff
       X-DD-Debug:
-      - NclXS5F5t+kukUaODU4jY2oSI1KBdPHFdFhJZNfbXLWDOThxbCLlKKmYvikjdDSg
+      - NVN1vUIP943yBv5BrKvNkq9LhGENimQCGx913v3GQzIJuXIMEzcrTlr1CpALPFWv
       X-DD-VERSION:
-      - '35.2718508'
+      - '35.3056650'
       X-Frame-Options:
       - SAMEORIGIN
     status:
       code: 201
       message: Created
 - request:
-    body: '{"data": {"id": "b846a434-c1c0-11ea-9cec-e7b501f3531f", "type": "users"}}'
+    body: '{"data": {"id": "69abf456-f9a5-11ea-adf4-ebea463b630a", "type": "users"}}'
     headers:
       Accept:
       - application/json
@@ -121,18 +129,18 @@ interactions:
       Dd-Operation-Id:
       - AddUserToRole
       User-Agent:
-      - datadog-api-client-python/0.1.dev66+dirty (python 3.7.7; os Darwin; arch x86_64)
+      - datadog-api-client-python/0.1.dev67+dirty (python 3.8.5; os Darwin; arch x86_64)
       x-datadog-parent-id:
-      - '14051334650606896764'
+      - '16996011730018003958'
       x-datadog-sampling-priority:
       - '1'
       x-datadog-trace-id:
-      - '8203213315955403737'
+      - '15244305100351974793'
     method: POST
-    uri: https://api.datadoghq.com/api/v2/roles/b81810a6-c1c0-11ea-9cec-67b58552398d/users
+    uri: https://api.datadoghq.com/api/v2/roles/69891cce-f9a5-11ea-adf4-d7aa0bfd6e6f/users
   response:
     body:
-      string: '{"meta":{"page":{"total_count":1}},"data":[{"type":"users","id":"b846a434-c1c0-11ea-9cec-e7b501f3531f","attributes":{"name":null,"handle":"datadog-api-client-python-test_add_a_user_to_a_role_returns_ok_response-1594284405.533793@datadoghq.com","created_at":"2020-07-09T08:46:45.772962+00:00","email":"datadog-api-client-python-test_add_a_user_to_a_role_returns_ok_response-1594284405.533793@datadoghq.com","icon":"https://secure.gravatar.com/avatar/ab056270b9cba867d091a6aa6e1ddf3f?s=48&d=retro","title":null,"verified":false,"disabled":false,"allowed_login_methods":[],"status":"Pending"},"relationships":{"roles":{"data":[{"type":"roles","id":"b81810a6-c1c0-11ea-9cec-67b58552398d"}]},"org":{"data":{"type":"orgs","id":"4dee724d-00cc-11ea-a77b-570c9d03c6c5"}}}}]}'
+      string: '{"meta":{"page":{"total_count":1}},"data":[{"type":"users","id":"69abf456-f9a5-11ea-adf4-ebea463b630a","attributes":{"name":null,"handle":"datadog-api-client-python-test_add_a_user_to_a_role_returns_ok_response-1600429941.913614@datadoghq.com","created_at":"2020-09-18T11:52:22.599840+00:00","email":"datadog-api-client-python-test_add_a_user_to_a_role_returns_ok_response-1600429941.913614@datadoghq.com","icon":"https://secure.gravatar.com/avatar/62eb6036d677ac5755342e6202b18b3a?s=48&d=retro","title":null,"verified":false,"disabled":false,"allowed_login_methods":[],"status":"Pending"},"relationships":{"roles":{"data":[{"type":"roles","id":"69891cce-f9a5-11ea-adf4-d7aa0bfd6e6f"}]},"org":{"data":{"type":"orgs","id":"4dee724d-00cc-11ea-a77b-570c9d03c6c5"}}}}]}'
     headers:
       Cache-Control:
       - no-cache
@@ -147,11 +155,11 @@ interactions:
       DD-POOL:
       - dogweb
       Date:
-      - Thu, 09 Jul 2020 08:46:46 GMT
+      - Fri, 18 Sep 2020 11:52:22 GMT
       Pragma:
       - no-cache
       Set-Cookie:
-      - DD-PSHARD=233; Max-Age=604800; Path=/; expires=Thu, 16-Jul-2020 08:46:46 GMT;
+      - DD-PSHARD=233; Max-Age=604800; Path=/; expires=Fri, 25-Sep-2020 11:52:22 GMT;
         secure; HttpOnly
       Strict-Transport-Security:
       - max-age=15724800;
@@ -160,11 +168,19 @@ interactions:
       X-Content-Type-Options:
       - nosniff
       X-DD-Debug:
-      - l+fZq7vW9gg1qInAzXkJZdt8f8e/094RDnN9pOEIlkXbx1jb6kpjgt1+syYCZyFC
+      - ZTMib3S/rZeXw/RhaeaehRILC7QJAaERfyf3m4/am8FN44e9rxbkPcmk4YzKBISj
       X-DD-VERSION:
-      - '35.2718508'
+      - '35.3056650'
       X-Frame-Options:
       - SAMEORIGIN
+      X-RateLimit-Limit:
+      - '500'
+      X-RateLimit-Period:
+      - '60'
+      X-RateLimit-Remaining:
+      - '479'
+      X-RateLimit-Reset:
+      - '38'
     status:
       code: 200
       message: OK

tests/v2/cassettes/test_create_a_user_returns_ok_response.frozen

@@ -1 +1 @@
-2020-08-27T11:32:31.916552+02:00
+2020-09-18T13:51:45.592497+02:00

tests/v2/cassettes/test_create_a_user_returns_ok_response.yaml

@@ -1,7 +1,7 @@
 interactions:
 - request:
     body: '{"data": {"type": "users", "attributes": {"name": "Datadog API Client Python",
-      "email": "datadog-api-client-python-test_create_a_user_returns_ok_response-1598520751.916552@datadoghq.com"}}}'
+      "email": "datadog-api-client-python-test_create_a_user_returns_ok_response-1600429905.592497@datadoghq.com"}}}'
     headers:
       Accept:
       - application/json
@@ -10,13 +10,19 @@ interactions:
       Dd-Operation-Id:
       - CreateUser
       User-Agent:
-      - datadog-api-client-python/0.1.dev43+dirty (python 3.8.5; os Darwin; arch x86_64)
+      - datadog-api-client-python/0.1.dev67+dirty (python 3.8.5; os Darwin; arch x86_64)
+      x-datadog-parent-id:
+      - '16616642207621448965'
+      x-datadog-sampling-priority:
+      - '1'
+      x-datadog-trace-id:
+      - '8737721158158492832'
     method: POST
     uri: https://api.datadoghq.com/api/v2/users
   response:
     body:
-      string: '{"data":{"type":"users","id":"3ba26a7c-e848-11ea-aa53-4fc031b99f2d","attributes":{"name":"Datadog
-        API Client Python","handle":"datadog-api-client-python-test_create_a_user_returns_ok_response-1598520751.916552@datadoghq.com","created_at":"2020-08-27T09:32:32.399468+00:00","email":"datadog-api-client-python-test_create_a_user_returns_ok_response-1598520751.916552@datadoghq.com","icon":"https://secure.gravatar.com/avatar/f57cbf46e3d6cbbbad4a55c39a36a3ec?s=48&d=retro","title":null,"verified":false,"disabled":false,"allowed_login_methods":[],"status":"Pending"},"relationships":{"roles":{"data":[]},"org":{"data":{"type":"orgs","id":"4dee724d-00cc-11ea-a77b-570c9d03c6c5"}}}}}'
+      string: '{"data":{"type":"users","id":"53ec981e-f9a5-11ea-adf4-cb405cae2881","attributes":{"name":"Datadog
+        API Client Python","handle":"datadog-api-client-python-test_create_a_user_returns_ok_response-1600429905.592497@datadoghq.com","created_at":"2020-09-18T11:51:46.114021+00:00","email":"datadog-api-client-python-test_create_a_user_returns_ok_response-1600429905.592497@datadoghq.com","icon":"https://secure.gravatar.com/avatar/951e50d02424567c55e9b1d02c10da20?s=48&d=retro","title":null,"verified":false,"disabled":false,"allowed_login_methods":[],"status":"Pending"},"relationships":{"roles":{"data":[]},"org":{"data":{"type":"orgs","id":"4dee724d-00cc-11ea-a77b-570c9d03c6c5"}}}}}'
     headers:
       Cache-Control:
       - no-cache
@@ -31,20 +37,20 @@ interactions:
       DD-POOL:
       - dogweb
       Date:
-      - Thu, 27 Aug 2020 09:32:32 GMT
+      - Fri, 18 Sep 2020 11:51:46 GMT
       Pragma:
       - no-cache
       Set-Cookie:
-      - DD-PSHARD=233; Max-Age=604800; Path=/; expires=Thu, 03-Sep-2020 09:32:32 GMT;
+      - DD-PSHARD=233; Max-Age=604800; Path=/; expires=Fri, 25-Sep-2020 11:51:46 GMT;
         secure; HttpOnly
       Strict-Transport-Security:
       - max-age=15724800;
       X-Content-Type-Options:
       - nosniff
       X-DD-Debug:
-      - ZpBCDU/bpmKaDCX3ezcoTB0mBcER1z/7nopw48EhUJ44Kn+wkWF9LGL4tUdS8yc3
+      - hj67/REi7e3yYcyH3k1IhaTqyaqEZObxcXfHyl0cMf/YGOgEumufCDMBPGXJkv7n
       X-DD-VERSION:
-      - '35.2942348'
+      - '35.3056650'
       X-Frame-Options:
       - SAMEORIGIN
     status:

tests/v2/cassettes/test_create_role_returns_ok_response.frozen

@@ -1 +1 @@
-2020-08-31T15:59:44.924330+02:00
+2020-09-18T13:52:06.476526+02:00