Merge pull request #2351 from DataDog/joseph/tzname-ugly-fix

[collector.py] ugly fix for the tzname encoding issue

checks/collector.py

@@ -753,7 +753,7 @@ def _get_hostname_metadata(self):
             pass
 
         metadata["hostname"] = self.hostname
-        metadata["timezones"] = time.tzname
+        metadata["timezones"] = sanitize_tzname(time.tzname)
 
         # Add cloud provider aliases
         host_aliases = GCE.get_host_aliases(self.agentConfig)
@@ -773,3 +773,12 @@ def _should_send_additional_data(self, data_name):
             return True
 
         return False
+
+def sanitize_tzname(tzname):
+    """ Returns the tzname given, and deals with Japanese encoding issue
+    """
+    if tzname[0] == '\x93\x8c\x8b\x9e (\x95W\x8f\x80\x8e\x9e)':
+        log.debug('tzname from TOKYO detected and converted')
+        return ('JST', 'JST')
+    else:
+        return tzname