Elasticsearch Instrumentation: Safer json serialization (#403)

* Handle datetime objects in elasticsearch queries

* Use compat.text_type instead of str for python version compatibility

Author: dougbyrne

elasticapm/instrumentation/packages/elasticsearch.py

@@ -35,6 +35,7 @@
 
 import elasticapm
 from elasticapm.instrumentation.packages.base import AbstractInstrumentedModule
+from elasticapm.utils import compat
 
 logger = logging.getLogger(__name__)
 
@@ -74,7 +75,7 @@ def call(self, module, method, wrapped, instance, args, kwargs):
                 # we assume utf8, which is the default
                 query.append("q=" + params["q"].decode("utf-8", errors="replace"))
             if isinstance(body, dict) and "query" in body:
-                query.append(json.dumps(body["query"]))
+                query.append(json.dumps(body["query"], default=compat.text_type))
             context["db"]["statement"] = "\n\n".join(query)
         elif api_method == "Elasticsearch.update":
             if isinstance(body, dict) and "script" in body: