Skip to content

Commit 16f849c

Browse files
authored
fix(aiobotocore): add support for aiobotocore>=0.11.0 (#1268)
1 parent 6961f6b commit 16f849c

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

ddtrace/contrib/aiobotocore/patch.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,11 @@
33
from ddtrace import config
44
import aiobotocore.client
55

6-
from aiobotocore.endpoint import ClientResponseContentProxy
6+
try:
7+
from aiobotocore.endpoint import ClientResponseContentProxy
8+
except ImportError:
9+
# aiobotocore>=0.11.0
10+
from aiobotocore._endpoint_helpers import ClientResponseContentProxy
711

812
from ...constants import ANALYTICS_SAMPLE_RATE_KEY, SPAN_MEASURED_KEY
913
from ...pin import Pin

tox.ini

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ envlist =
3030
{py27,py34,py35,py36,py37,py38}-test_logging
3131
# Integrations environments
3232
aiobotocore_contrib-py34-aiobotocore{02,03,04}
33-
aiobotocore_contrib-{py35,py36}-aiobotocore{02,03,04,05,07,08,09,010}
33+
aiobotocore_contrib-{py35,py36}-aiobotocore{02,03,04,05,07,08,09,010,011,latest}
3434
# aiobotocore 0.2 and 0.4 do not work because they use async as a reserved keyword
35-
aiobotocore_contrib-py{37,38}-aiobotocore{03,05,07,08,09,010}
35+
aiobotocore_contrib-py{37,38}-aiobotocore{03,05,07,08,09,010,011,latest}
3636
# Python 3.7 needs at least aiohttp 2.3
3737
aiohttp_contrib-{py34,py35,py36}-aiohttp{12,13,20,21,22}-aiohttp_jinja{012,013}-yarl
3838
aiohttp_contrib-{py34,py35,py36,py37,py38}-aiohttp23-aiohttp_jinja015-yarl10
@@ -194,6 +194,8 @@ deps =
194194
# backports
195195
py27: enum34
196196
# integrations
197+
aiobotocorelatest: aiobotocore>=0.11
198+
aiobotocore011: aiobotocore>=0.11,<0.12
197199
aiobotocore010: aiobotocore>=0.10,<0.11
198200
aiobotocore09: aiobotocore>=0.9,<0.10
199201
aiobotocore08: aiobotocore>=0.8,<0.9

0 commit comments

Comments
 (0)