Skip to content

Elasticsearch Instrumentation: Safer json serialization #403

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

Merged
merged 5 commits into from
Mar 20, 2019
Merged

Elasticsearch Instrumentation: Safer json serialization #403

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0099b66
Handle datetime objects in elasticsearch queries
dougbyrne Feb 4, 2019
362dc6a
Use compat.text_type instead of str for python version compatibility
dougbyrne Feb 5, 2019
5e233f1
Merge branch 'master' into safer_json_serialization_elasticsearch
dougbyrne Feb 5, 2019
20dfe7c
Merge branch 'master' into safer_json_serialization_elasticsearch
beniwohli Mar 18, 2019
c9a3ea7
Merge branch 'master' into safer_json_serialization_elasticsearch
beniwohli Mar 20, 2019
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
3 changes: 2 additions & 1 deletion elasticapm/instrumentation/packages/elasticsearch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@

import elasticapm
from elasticapm.instrumentation.packages.base import AbstractInstrumentedModule
from elasticapm.utils import compat

logger = logging.getLogger(__name__)

Expand Down Expand Up @@ -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:
Expand Down