Skip to content

Urllib3: More safeties in KV collection & processing #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 27, 2018
Merged

Urllib3: More safeties in KV collection & processing #64

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions instana/instrumentation/urllib3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,14 @@
import urllib3 # noqa

def collect(instance, args, kwargs):
""" Build and return a fully qualified URL for this request """
try:
kvs = {}

kvs['host'] = instance.host
kvs['port'] = instance.port

if len(args) is 2:
if args is not None and len(args) is 2:
kvs['method'] = args[0]
kvs['path'] = args[1]
else:
Expand Down Expand Up @@ -45,8 +46,10 @@ def urlopen_with_instana(wrapped, instance, args, kwargs):
span = instana.internal_tracer.start_span("urllib3", child_of=context)

kvs = collect(instance, args, kwargs)
span.set_tag(ext.HTTP_URL, kvs['url'])
span.set_tag(ext.HTTP_METHOD, kvs['method'])
if 'url' in kvs:
span.set_tag(ext.HTTP_URL, kvs['url'])
if 'method' in kvs:
span.set_tag(ext.HTTP_METHOD, kvs['method'])

instana.internal_tracer.inject(span.context, opentracing.Format.HTTP_HEADERS, kwargs["headers"])
rv = wrapped(*args, **kwargs)
Expand Down