[tests] Update the integrations libraries versions to the latest poss…

…ible. (#607) * [tests] Update the integrations libraries versions to the latest possible. A few notes follow for specific libraries besides updates you can see in the code itself *tornado* - not possible to udate to 5.x, postponing *elasticsearch* - added 6.3 - a test had to be updated because `doc_type` arg was optional before, it is not anymore. *falcon* - added 1.3, 1.4 - a small change to a test class was necessaries because of a new expected property that must exists in the TestCase class. *flask* - added version 1.0 - our integration flask_cache does not support flask 1. *pymongo/mongoengine* - mongoengine: updated to latest - pymongo: added 3.6. Latest stable is 3.7, but our integration fails to trace at least inserts. Example: 1) ['count here.are.songs', 'count here.are.songs', 'count here.are.songs', 'count here.are.songs', 'delete here.are.songs {"artist": "?"}', 'delete here.are.songs {"artist": "?"}', 'drop here.are.songs', 'insert here.are.songs'] 2) [u'count here.are.songs', u'count here.are.songs', u'count here.are.songs', u'count here.are.songs', u'delete here.are.songs {"artist": "?"}', u'delete here.are.songs {"artist": "?"}', u'drop here.are.songs'] * [tests] Fix dependecy line aiobotocore->aiohttp->multidict after release of multidict 4.4 Suddenly master started to fail when before was passing just fine. The difference in the dependency tree showed that the only package updated was multidict. Fails : aiobotocore==0.2.3,aiohttp==1.3.5,...,multidict==4.4.1,...,yarl==0.9.8 Succeed: aiobotocore==0.2.3,aiohttp==1.3.5,...,multidict==4.3.1,...yarl==0.9.8 The versions we are testing are pretty old and they are not compatible with multidict 4.4.x that was just released a few days ago. The issue aio-libs/aiohttp#3277 was opened as this issue can potentially impact other users too.
DataDog · Sep 18, 2018 · b4a8959 · b4a8959
1 parent 3a4e3fe
commit b4a8959
Show file tree

Hide file tree

Showing 4 changed files with 123 additions and 57 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -207,11 +207,13 @@ jobs:
       - restore_cache:
           keys:
               - tox-cache-aiohttp-{{ checksum "tox.ini" }}
-      - run: tox -e '{py34,py35,py36}-aiohttp{12,13,20,21,22}-aiohttp_jinja{012,013}-yarl' --result-json /tmp/aiohttp.results
+      - run: tox -e '{py34,py35,py36}-aiohttp{12,13,20,21,22}-aiohttp_jinja{012,013}-yarl' --result-json /tmp/aiohttp.1.results
+      - run: tox -e '{py34,py35,py36}-aiohttp{23}-aiohttp_jinja{015}-yarl10' --result-json /tmp/aiohttp.2.results
       - persist_to_workspace:
           root: /tmp
           paths:
-            - aiohttp.results
+            - aiohttp.1.results
+            - aiohttp.2.results
       - save_cache:
           key: tox-cache-aiohttp-{{ checksum "tox.ini" }}
           paths:
@@ -225,8 +227,8 @@ jobs:
       - restore_cache:
           keys:
               - tox-cache-tornado-{{ checksum "tox.ini" }}
-      - run: tox -e '{py27,py34,py35,py36}-tornado{40,41,42,43,44}' --result-json /tmp/tornado.1.results
-      - run: tox -e '{py27}-tornado{40,41,42,43,44}-futures{30,31,32}' --result-json /tmp/tornado.2.results
+      - run: tox -e '{py27,py34,py35,py36}-tornado{40,41,42,43,44,45}' --result-json /tmp/tornado.1.results
+      - run: tox -e '{py27}-tornado{40,41,42,43,44,45}-futures{30,31,32}' --result-json /tmp/tornado.2.results
       - persist_to_workspace:
           root: /tmp
           paths:
@@ -273,7 +275,7 @@ jobs:
           keys:
               - tox-cache-cassandra-{{ checksum "tox.ini" }}
       - run: tox -e wait cassandra
-      - run: tox -e '{py27,py34,py35,py36}-cassandra{35,36,37,38}' --result-json /tmp/cassandra.results
+      - run: tox -e '{py27,py34,py35,py36}-cassandra{35,36,37,38,315}' --result-json /tmp/cassandra.results
       - persist_to_workspace:
           root: /tmp
           paths:
@@ -311,7 +313,7 @@ jobs:
       - restore_cache:
           keys:
               - tox-cache-elasticsearch-{{ checksum "tox.ini" }}
-      - run: TOX_SKIP_DIST=False tox -e '{py27,py34,py35,py36}-elasticsearch{16,17,18,23,24,51,52,53,54}' --result-json /tmp/elasticsearch.results
+      - run: TOX_SKIP_DIST=False tox -e '{py27,py34,py35,py36}-elasticsearch{16,17,18,23,24,51,52,53,54,63}' --result-json /tmp/elasticsearch.results
       - persist_to_workspace:
           root: /tmp
           paths:
@@ -329,8 +331,8 @@ jobs:
       - restore_cache:
           keys:
               - tox-cache-falcon-{{ checksum "tox.ini" }}
-      - run: tox -e '{py27,py34,py35,py36}-falcon{10,11,12}' --result-json /tmp/falcon.1.results
-      - run: TOX_SKIP_DIST=False tox -e '{py27,py34,py35,py36}-falcon-autopatch{10,11,12}' --result-json /tmp/falcon.2.results
+      - run: tox -e '{py27,py34,py35,py36}-falcon{10,11,12,13,14}' --result-json /tmp/falcon.1.results
+      - run: TOX_SKIP_DIST=False tox -e '{py27,py34,py35,py36}-falcon-autopatch{10,11,12,13,14}' --result-json /tmp/falcon.2.results
       - persist_to_workspace:
           root: /tmp
           paths:
@@ -386,8 +388,8 @@ jobs:
       - restore_cache:
           keys:
               - tox-cache-flask-{{ checksum "tox.ini" }}
-      - run: tox -e '{py27,py34,py35,py36}-flask{010,011,012}-blinker' --result-json /tmp/flask.1.results
-      - run: TOX_SKIP_DIST=False tox -e '{py27,py34,py35,py36}-flask-autopatch{010,011,012}-blinker' --result-json /tmp/flask.2.results
+      - run: tox -e '{py27,py34,py35,py36}-flask{010,011,012,10}-blinker' --result-json /tmp/flask.1.results
+      - run: TOX_SKIP_DIST=False tox -e '{py27,py34,py35,py36}-flask-autopatch{010,011,012,10}-blinker' --result-json /tmp/flask.2.results
       - run: tox -e '{py27,py34,py35,py36}-flask{010,011,012}-flaskcache{013}-memcached-redis{210}-blinker' --result-json /tmp/flask.3.results
       - run: TOX_SKIP_DIST=False tox -e '{py27,py34,py35,py36}-flask-autopatch{010,011,012}-flaskcache{013}-memcached-redis{210}-blinker' --result-json /tmp/flask.4.results
       - run: tox -e '{py27}-flask{010,011}-flaskcache{012}-memcached-redis{210}-blinker' --result-json /tmp/flask.5.results
@@ -414,7 +416,7 @@ jobs:
       - restore_cache:
           keys:
               - tox-cache-gevent-{{ checksum "tox.ini" }}
-      - run: tox -e '{py27,py34,py35,py36}-gevent{11,12}' --result-json /tmp/gevent.1.results
+      - run: tox -e '{py27,py34,py35,py36}-gevent{11,12,13}' --result-json /tmp/gevent.1.results
       - run: tox -e '{py27}-gevent{10}' --result-json /tmp/gevent.2.results
       - persist_to_workspace:
           root: /tmp
@@ -534,7 +536,7 @@ jobs:
           keys:
               - tox-cache-pymysql-{{ checksum "tox.ini" }}
       - run: tox -e 'wait' mysql
-      - run: tox -e '{py27,py34,py35,py36}-pymysql{07,08}' --result-json /tmp/pymysql.results
+      - run: tox -e '{py27,py34,py35,py36}-pymysql{07,08,09}' --result-json /tmp/pymysql.results
       - persist_to_workspace:
           root: /tmp
           paths:
@@ -593,7 +595,7 @@ jobs:
       - restore_cache:
           keys:
               - tox-cache-mongoengine-{{ checksum "tox.ini" }}
-      - run: tox -e '{py27,py34,py35,py36}-mongoengine{011}' --result-json /tmp/mongoengine.results
+      - run: tox -e '{py27,py34,py35,py36}-mongoengine{015}' --result-json /tmp/mongoengine.results
       - persist_to_workspace:
           root: /tmp
           paths:
@@ -612,7 +614,7 @@ jobs:
       - restore_cache:
           keys:
               - tox-cache-pymongo-{{ checksum "tox.ini" }}
-      - run: tox -e '{py27,py34,py35,py36}-pymongo{30,31,32,33,34}-mongoengine{011}' --result-json /tmp/pymongo.results
+      - run: tox -e '{py27,py34,py35,py36}-pymongo{30,31,32,33,34,36}-mongoengine{015}' --result-json /tmp/pymongo.results
       - persist_to_workspace:
           root: /tmp
           paths:
@@ -651,7 +653,7 @@ jobs:
       - restore_cache:
           keys:
               - tox-cache-requests-{{ checksum "tox.ini" }}
-      - run: tox -e '{py27,py34,py35,py36}-requests{208,209,210,211,212,213}' --result-json /tmp/requests.results
+      - run: tox -e '{py27,py34,py35,py36}-requests{208,209,210,211,212,213,219}' --result-json /tmp/requests.results
       - persist_to_workspace:
           root: /tmp
           paths:
@@ -681,7 +683,7 @@ jobs:
           keys:
               - tox-cache-sqlalchemy-{{ checksum "tox.ini" }}
       - run: tox -e 'wait' postgres mysql
-      - run: tox -e '{py27,py34,py35,py36}-sqlalchemy{10,11}-psycopg2{27}-mysqlconnector{21}' --result-json /tmp/sqlalchemy.results
+      - run: tox -e '{py27,py34,py35,py36}-sqlalchemy{10,11,12}-psycopg2{27}-mysqlconnector{21}' --result-json /tmp/sqlalchemy.results
       - persist_to_workspace:
           root: /tmp
           paths:
@@ -748,7 +750,7 @@ jobs:
           keys:
               - tox-cache-aiopg-{{ checksum "tox.ini" }}
       - run: tox -e 'wait' postgres
-      - run: tox -e '{py34,py35,py36}-aiopg{012,013}' --result-json /tmp/aiopg.results
+      - run: tox -e '{py34,py35,py36}-aiopg{012,015}' --result-json /tmp/aiopg.results
       - persist_to_workspace:
           root: /tmp
           paths:
@@ -803,7 +805,7 @@ jobs:
       - restore_cache:
           keys:
               - tox-cache-msgpack-{{ checksum "tox.ini" }}
-      - run: tox -e '{py27,py34}-msgpack{03,04}' --result-json /tmp/msgpack.results
+      - run: tox -e '{py27,py34}-msgpack{03,04,05}' --result-json /tmp/msgpack.results
       - persist_to_workspace:
           root: /tmp
           paths:

diff --git a/tests/contrib/elasticsearch/test.py b/tests/contrib/elasticsearch/test.py
@@ -123,7 +123,7 @@ def test_elasticsearch(self):
         # Raise error 404 with a non existent index
         writer.pop()
         try:
-            es.get(index="non_existent_index", id=100)
+            es.get(index="non_existent_index", id=100, doc_type="_all")
             eq_("error_not_raised", "TransportError")
         except TransportError as e:
             spans = writer.pop()

diff --git a/tests/contrib/falcon/test_autopatch.py b/tests/contrib/falcon/test_autopatch.py
@@ -8,6 +8,13 @@
 
 
 class AutoPatchTestCase(testing.TestCase, FalconTestCase):
+
+    # Added because falcon 1.3 and 1.4 test clients (falcon.testing.client.TestClient) expect this property to be
+    # defined. It would be initialized in the constructor, but we call it here like in 'TestClient.__init__(self, None)'
+    # because falcon 1.0.x does not have such module and would fail. Once we stop supporting falcon 1.0.x then we can
+    # use the cleaner __init__ invocation
+    _default_headers = None
+
     def setUp(self):
         self._service = 'my-falcon'
         self.tracer = tracer