Merge pull request #152 from DataDog/yann/dogstatsd-unicode-tags

[dogstatsd] support unicode tags 🔣

Author: Yann

datadog/dogstatsd/base.py

@@ -2,20 +2,23 @@
 """
 DogStatsd is a Python client for DogStatsd, a Statsd fork for Datadog.
 """
-
-import logging
-import os
+# stdlib
+from functools import wraps
 from random import random
 from time import time
+import logging
+import os
 import socket
 import struct
-from functools import wraps
 
 try:
     from itertools import imap
 except ImportError:
     imap = map
 
+# datadog
+from datadog.util.compat import text
+
 
 log = logging.getLogger('dogstatsd')
 
@@ -289,7 +292,7 @@ def _report(self, metric, metric_type, value, tags, sample_rate):
         if tags:
             payload.extend(["|#", ",".join(tags)])
 
-        encoded = "".join(imap(str, payload))
+        encoded = "".join(imap(text, payload))
 
         # Send it
         self._send(encoded)

datadog/util/compat.py

@@ -24,6 +24,8 @@ def iteritems(d):
     def iternext(iter):
         return next(iter)
 
+    text = str
+
 else:
     get_input = raw_input
     import ConfigParser as configparser
@@ -36,6 +38,8 @@ def iteritems(d):
     def iternext(iter):
         return iter.next()
 
+    text = unicode
+
 
 try:
     from UserDict import IterableUserDict

tests/unit/dogstatsd/test_statsd.py

@@ -103,8 +103,8 @@ def test_tagged_gauge(self):
         t.assert_equal('gt:123.4|g|#country:china,age:45,blue', self.recv())
 
     def test_tagged_counter(self):
-        self.statsd.increment('ct', tags=['country:canada', 'red'])
-        t.assert_equal('ct:1|c|#country:canada,red', self.recv())
+        self.statsd.increment('ct', tags=[u'country:españa', 'red'])
+        t.assert_equal(u'ct:1|c|#country:españa,red', self.recv())
 
     def test_tagged_histogram(self):
         self.statsd.histogram('h', 1, tags=['red'])