Skip to content

Celery: Add tag parsing safety #263

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
Sep 2, 2020
Merged

Celery: Add tag parsing safety #263

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
13 changes: 8 additions & 5 deletions instana/instrumentation/celery/hooks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,10 @@
def add_broker_tags(span, broker_url):
try:
url = parse.urlparse(broker_url)
span.set_tag("scheme", url.scheme)

# Add safety for edge case where scheme may not be a string
url_scheme = str(url.scheme)
span.set_tag("scheme", url_scheme)

if url.hostname is None:
span.set_tag("host", 'localhost')
Expand All @@ -27,15 +30,15 @@ def add_broker_tags(span, broker_url):

if url.port is None:
# Set default port if not specified
if url.scheme == 'redis':
if url_scheme == 'redis':
span.set_tag("port", "6379")
elif 'amqp' in url.scheme:
elif 'amqp' in url_scheme:
span.set_tag("port", "5672")
elif 'sqs' in url.scheme:
elif 'sqs' in url_scheme:
span.set_tag("port", "443")
else:
span.set_tag("port", str(url.port))
except:
except Exception:
logger.debug("Error parsing broker URL: %s" % broker_url, exc_info=True)

@signals.task_prerun.connect
Expand Down