From e6a6b757dd61261a9ec86534dddcc95b7d95d34c Mon Sep 17 00:00:00 2001 From: Peter Giacomo Lombardo Date: Tue, 2 Apr 2019 10:49:13 +0200 Subject: [PATCH 1/2] aiohttp: Explicitly set scope to None when not tracing --- instana/instrumentation/aiohttp/client.py | 1 + 1 file changed, 1 insertion(+) diff --git a/instana/instrumentation/aiohttp/client.py b/instana/instrumentation/aiohttp/client.py index 412822ca..518606b6 100644 --- a/instana/instrumentation/aiohttp/client.py +++ b/instana/instrumentation/aiohttp/client.py @@ -18,6 +18,7 @@ async def stan_request_start(session, trace_config_ctx, params): # If we're not tracing, just return if parent_span is None: + trace_config_ctx.scope = None return scope = async_tracer.start_active_span("aiohttp-client", child_of=parent_span) From 145b100ba7eea98f000c23860261ccbb8548cbab Mon Sep 17 00:00:00 2001 From: Peter Giacomo Lombardo Date: Tue, 2 Apr 2019 11:42:57 +0200 Subject: [PATCH 2/2] Limit Django version until 2.2 is validated --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 847590a9..681be0c3 100644 --- a/setup.py +++ b/setup.py @@ -55,7 +55,7 @@ def check_setuptools(): 'test': [ 'aiohttp>=3.5.4;python_version>="3.5"', 'asynqp>=0.4;python_version>="3.5"', - 'django>=1.11', + 'django>=1.11,<2.2', 'nose>=1.0', 'flask>=0.12.2', 'lxml>=3.4',