use async_timeout instead of aiohttp.Timeout (#157)

aiohttp.Timeout was removed in aiohttp 3.0

closes #157

Author: beniwohli

CHANGELOG.asciidoc

@@ -6,11 +6,13 @@
 [[changelog]]
 == Changelog
 
-//
-//[[release-next]]
-//[float]
-//=== Unreleased
-//https://github.com/elastic/apm-agent-python/compare/v1.0.0\...master[Check the HEAD diff]
+
+[[release-next]]
+[float]
+=== Unreleased
+https://github.com/elastic/apm-agent-python/compare/v2.0.0\...master[Check the HEAD diff]
+
+ * fixed compatibility issue with aiohttp 3.0 ({pull}157[#157])
 
 [[release-2.0.0]]
 [float]

elasticapm/transport/asyncio.py

@@ -1,6 +1,7 @@
 import asyncio
 
 import aiohttp
+import async_timeout
 
 from .base import TransportException
 from .http_base import HTTPTransportBase
@@ -23,7 +24,7 @@ async def send(self, data, headers, timeout=None):
         """Use synchronous interface, because this is a coroutine."""
 
         try:
-            with aiohttp.Timeout(timeout):
+            with async_timeout.timeout(timeout):
                 async with self.client.post(self._url,
                                             data=data,
                                             headers=headers) as response:

setup.cfg

@@ -25,7 +25,7 @@ multi_line_output=0
 known_standard_library=importlib,types,asyncio
 known_django=django
 known_first_party=elasticapm,tests
-known_third_party=pytest,flask,aiohttp,urllib3_mock,webob,memcache,pymongo,boto3,logbook,twisted,celery,zope,urllib3,redis,jinja2,requests,certifi,mock,jsonschema,werkzeug,pytest_localserver,psycopg2
+known_third_party=pytest,flask,aiohttp,urllib3_mock,webob,memcache,pymongo,boto3,logbook,twisted,celery,zope,urllib3,redis,jinja2,requests,certifi,mock,jsonschema,werkzeug,pytest_localserver,psycopg2,async_timeout
 default_section=FIRSTPARTY
 sections=FUTURE,STDLIB,DJANGO,THIRDPARTY,FIRSTPARTY,LOCALFOLDER