Properly decode index name to str before putting in dimension value (#67

)

Also make tests run with python3 instead of 2.

.circleci/config.yml

@@ -2,7 +2,7 @@ version: '2'
 jobs:
   build:
     docker:
-      - image: ubuntu:xenial
+      - image: ubuntu:bionic
     working_directory: ~/code
     steps:
       - setup_remote_docker
@@ -12,7 +12,7 @@ jobs:
             set -x
             VER="17.03.0-ce"
             apt-get update -q
-            apt-get install -yq curl python-pip
+            apt-get install -yq curl python3-pip
             curl -L -o /tmp/docker-$VER.tgz https://get.docker.com/builds/Linux/x86_64/docker-$VER.tgz
             tar -xz -C /tmp -f /tmp/docker-$VER.tgz
             mv /tmp/docker/* /usr/bin
@@ -27,8 +27,8 @@ jobs:
           name: Run basic tests
           working_directory: ~/code/tests
           command: |
-            pip install pytest
-            pip install mock
+            python3 -m pip install pytest
+            python3 -m pip install mock
             bash run_tests.sh | tee /tmp/test.log || true  # The test command always exits non-zero
             ! grep -E 'FAILED|ERROR' /tmp/test.log > /dev/null || exit 1
       - run:

elasticsearch_collectd.py

@@ -907,7 +907,7 @@ def parse_index_stats(self, json, index_name):
                 result = dig_it_up(json, key.path)
                 # update the index name in the type_instance to include
                 # the index as a dimensions
-                name = name.format(index_name=sanitize_type_instance(index_name))
+                name = name.format(index_name=sanitize_type_instance(index_name).decode("utf-8"))
                 self.dispatch_stat(result, name, key)
 
     def dispatch_stat(self, result, name, key, dimensions=None):

tests/run_tests.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-PYTHON="python"
+PYTHON="python3"
 if [ ! -z "$1" ]; then
   PYTHON="$1"
 fi

tests/simulate.py

@@ -1,7 +1,7 @@
 #! /usr/bin/python
 
-import sys
 import os
+import sys
 from http.server import BaseHTTPRequestHandler, HTTPServer
 
 PORT_NUMBER = 9200
@@ -14,15 +14,17 @@
         print("invalid or missing directory %s" % base_path)
         sys.exit(1)
 else:
-    print("usage: ./simulate.py directory_path. Example ./simulate.py \
-data/1.7.2")
+    print(
+        "usage: ./simulate.py directory_path. Example ./simulate.py \
+data/1.7.2"
+    )
     sys.exit(1)
 
 
 class EsSimulatorHandler(BaseHTTPRequestHandler):
     def do_GET(self):
         self.send_response(200)
-        self.send_header('Content-type', 'application/json')
+        self.send_header("Content-type", "application/json")
         self.end_headers()
         self.serve_path(self.path)
         return
@@ -34,13 +36,14 @@ def serve_path(self, path):
         else:
             file_path = file_path + ".json"
         with open(file_path, "r") as f:
-            self.wfile.write(f.read())
+            self.wfile.write(f.read().encode("utf-8"))
+
 
 try:
-    server = HTTPServer(('', PORT_NUMBER), EsSimulatorHandler)
-    print('Started ES simulator on port ', PORT_NUMBER)
+    server = HTTPServer(("", PORT_NUMBER), EsSimulatorHandler)
+    print("Started ES simulator on port ", PORT_NUMBER)
     server.serve_forever()
 
 except KeyboardInterrupt:
-    print('ctrl-c received, shutting down')
+    print("ctrl-c received, shutting down")
     server.socket.close()