Skip to content
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

[dogstatsd] Fix unicode handling of event text #661

Merged
merged 1 commit into from
Jun 16, 2021
Merged

[dogstatsd] Fix unicode handling of event text #661

Show file tree
Hide file tree
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
16 changes: 14 additions & 2 deletions datadog/dogstatsd/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
DistributedContextManagerDecorator,
)
from datadog.dogstatsd.route import get_default_route
from datadog.util.compat import text
from datadog.util.compat import is_p3k, text
from datadog.util.format import normalize_tags
from datadog.version import __version__
from typing import Optional, List, Text, Union
Expand Down Expand Up @@ -711,10 +711,22 @@ def event(
title = self._escape_event_content(title)
text = self._escape_event_content(text)

if not is_p3k():
if not isinstance(title, unicode): # noqa: F821
title = unicode(self._escape_event_content(title), 'utf8') # noqa: F821
if not isinstance(text, unicode): # noqa: F821
text = unicode(self._escape_event_content(text), 'utf8') # noqa: F821

# Append all client level tags to every event
tags = self._add_constant_tags(tags)

string = u"_e{%d,%d}:%s|%s" % (len(title), len(text), title, text)
string = u"_e{{{},{}}}:{}|{}".format(
len(title.encode('utf8', 'replace')),
len(text.encode('utf8', 'replace')),
title,
text,
)

if date_happened:
string = "%s|d:%d" % (string, date_happened)
if hostname:
Expand Down
14 changes: 12 additions & 2 deletions tests/unit/dogstatsd/test_statsd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,9 +274,19 @@ def test_event(self):

self.statsd.event('Title', u'♬ †øU †øU ¥ºu T0µ ♪',
aggregation_key='key', tags=['t1', 't2:v2'])
event = u'_e{5,19}:Title|♬ †øU †øU ¥ºu T0µ ♪|k:key|#t1,t2:v2'
event = u'_e{5,32}:Title|♬ †øU †øU ¥ºu T0µ ♪|k:key|#t1,t2:v2'
self.assert_equal_telemetry(event, self.recv(2), telemetry=telemetry_metrics(metrics=0, events=1, bytes_sent=len(event)))

def test_unicode_event(self):
self.statsd.event(
'my.prefix.Delivery - Daily Settlement Summary Report Delivery — Invoice Cloud succeeded',
'Delivered — destination.csv')
event = u'_e{89,29}:my.prefix.Delivery - Daily Settlement Summary Report Delivery — Invoice Cloud succeeded|' + \
u'Delivered — destination.csv'
self.assert_equal_telemetry(event, self.recv(2), telemetry=telemetry_metrics(metrics=0, events=1, bytes_sent=len(event)))

self.statsd._reset_telemetry()

def test_event_constant_tags(self):
self.statsd.constant_tags = ['bar:baz', 'foo']
self.statsd.event('Title', u'L1\nL2', priority='low', date_happened=1375296969)
Expand All @@ -287,7 +297,7 @@ def test_event_constant_tags(self):

self.statsd.event('Title', u'♬ †øU †øU ¥ºu T0µ ♪',
aggregation_key='key', tags=['t1', 't2:v2'])
event = u'_e{5,19}:Title|♬ †øU †øU ¥ºu T0µ ♪|k:key|#t1,t2:v2,bar:baz,foo'
event = u'_e{5,32}:Title|♬ †øU †øU ¥ºu T0µ ♪|k:key|#t1,t2:v2,bar:baz,foo'
self.assert_equal_telemetry(event, self.recv(2), telemetry=telemetry_metrics(metrics=0, events=1, tags="bar:baz,foo", bytes_sent=len(event)))

def test_service_check(self):
Expand Down