Merge branch 'master' into flush-metrics

elastic · May 31, 2021 · e6bb3b2 · e6bb3b2
2 parents 41cec53 + 5e2ebd3
commit e6bb3b2
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 13 deletions.
diff --git a/.ci/.jenkins_exclude.yml b/.ci/.jenkins_exclude.yml
@@ -226,8 +226,6 @@ exclude:
     FRAMEWORK: aioredis-newest
   - PYTHON_VERSION: python-3.10-rc  # getting "loop argument must agree with lock" error
     FRAMEWORK: aioredis-newest
-  - PYTHON_VERSION: python-3.10-rc
-    FRAMEWORK: httpx-0.12
   # aiomysql
   - PYTHON_VERSION: pypy-3
     FRAMEWORK: aiomysql-newest

diff --git a/.ci/.jenkins_framework_full.yml b/.ci/.jenkins_framework_full.yml
@@ -41,8 +41,8 @@ FRAMEWORK:
   - pymongo-3.4
   - pymongo-3.5
   - pymongo-newest
-  - redis-2.8
-  - redis-2.9
+  - redis-3
+  - redis-2
   - redis-newest
   - psycopg2-2.7
   - psycopg2-newest
@@ -74,7 +74,6 @@ FRAMEWORK:
   - pymemcache-3.0
   - pymemcache-newest
   - graphene-2
-  - httpx-0.12
   - httpx-0.13
   - httpx-0.14
   - httpx-newest

diff --git a/elasticapm/instrumentation/packages/asyncio/httpcore.py b/elasticapm/instrumentation/packages/asyncio/httpcore.py
@@ -49,7 +49,7 @@ class HTTPCoreAsyncInstrumentation(AsyncAbstractInstrumentedModule):
 
     instrument_list = [
         ("httpcore._async.connection", "AsyncHTTPConnection.request"),  # < httpcore 0.11
-        ("httpcore._async.connection", "AsyncHTTPConnection.arequest"),  # httcore 0.11 - 0.12
+        ("httpcore._async.connection", "AsyncHTTPConnection.arequest"),  # httpcore 0.11 - 0.12
         ("httpcore._async.connection", "AsyncHTTPConnection.handle_async_request"),  # >= httpcore 0.13
     ]
 

diff --git a/tests/instrumentation/asyncio_tests/aioredis_tests.py b/tests/instrumentation/asyncio_tests/aioredis_tests.py
@@ -125,14 +125,15 @@ async def test_redis_client(instrument, elasticapm_client, redis_conn):
     assert len(spans) == 3
 
 
+@pytest.mark.skip(reason="Test is flaky for some reason, possibly related to import-time instrumentation")
 @pytest.mark.integrationtest
-async def test_publish_subscribe(instrument, elasticapm_client, redis_conn):
+async def test_publish_subscribe_async(instrument, elasticapm_client, redis_conn):
     elasticapm_client.begin_transaction("transaction.test")
     with capture_span("test_publish_subscribe", "test"):
         # publish
         await redis_conn.publish("mykey", "a")
 
-        #subscribe
+        # subscribe
         await redis_conn.subscribe("mykey")
 
     elasticapm_client.end_transaction("MyView")

diff --git a/tests/instrumentation/redis_tests.py b/tests/instrumentation/redis_tests.py
@@ -165,6 +165,7 @@ def test_unix_domain_socket_connection_destination_info():
     assert destination_info["address"] == "unix:///some/path"
 
 
+@pytest.mark.skipif(redis.VERSION < (3,), reason="pubsub not available as context manager in redis-py 2")
 @pytest.mark.integrationtest
 def test_publish_subscribe(instrument, elasticapm_client, redis_conn):
     elasticapm_client.begin_transaction("transaction.test")

diff --git a/tests/requirements/reqs-redis-2.8.txt → tests/requirements/reqs-redis-2.txt b/tests/requirements/reqs-redis-2.8.txt → tests/requirements/reqs-redis-2.txt
@@ -1,2 +1,2 @@
-redis>=2.8,<2.9
+redis<3
 -r reqs-base.txt
diff --git a/tests/requirements/reqs-redis-3.0.txt b/tests/requirements/reqs-redis-3.0.txt
diff --git a/tests/requirements/reqs-redis-2.9.txt → tests/requirements/reqs-redis-3.txt b/tests/requirements/reqs-redis-2.9.txt → tests/requirements/reqs-redis-3.txt
@@ -1,2 +1,2 @@
-redis>=2.9,<2.10
+redis<4
 -r reqs-base.txt
diff --git a/tests/requirements/reqs-redis-newest.txt b/tests/requirements/reqs-redis-newest.txt
@@ -1,2 +1,2 @@
-redis>=2.10
+redis
 -r reqs-base.txt