From 075b88ae0111b26728735faba9c7a5b206282d2b Mon Sep 17 00:00:00 2001 From: Markus Unterwaditzer Date: Fri, 19 Oct 2018 11:54:42 +0200 Subject: [PATCH 1/2] fix: Rename meta key to _meta Fix #131 --- sentry_sdk/utils.py | 2 +- tests/integrations/flask/test_flask.py | 10 +++++----- tests/test_event.py | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sentry_sdk/utils.py b/sentry_sdk/utils.py index 5531545e94..5b4e97a455 100644 --- a/sentry_sdk/utils.py +++ b/sentry_sdk/utils.py @@ -552,7 +552,7 @@ def inner(obj): obj, meta = inner(obj) if meta is not None: - obj[""] = meta + obj["_meta"] = meta return obj diff --git a/tests/integrations/flask/test_flask.py b/tests/integrations/flask/test_flask.py index ec03f2a1ee..f730c61e7f 100644 --- a/tests/integrations/flask/test_flask.py +++ b/tests/integrations/flask/test_flask.py @@ -203,7 +203,7 @@ def index(): assert response.status_code == 200 event, = events - assert event[""]["request"]["data"]["foo"]["bar"] == { + assert event["_meta"]["request"]["data"]["foo"]["bar"] == { "": {"len": 2000, "rem": [["!limit", "x", 509, 512]]} } assert len(event["request"]["data"]["foo"]["bar"]) == 512 @@ -229,7 +229,7 @@ def index(): assert response.status_code == 200 event, = events - assert event[""]["request"]["data"]["foo"] == { + assert event["_meta"]["request"]["data"]["foo"] == { "": {"len": 2000, "rem": [["!limit", "x", 509, 512]]} } assert len(event["request"]["data"]["foo"]) == 512 @@ -259,7 +259,7 @@ def index(): assert response.status_code == 200 event, = events - assert event[""]["request"]["data"] == { + assert event["_meta"]["request"]["data"] == { "": {"len": 2000, "rem": [["!config", "x", 0, 2000]]} } assert not event["request"]["data"] @@ -285,12 +285,12 @@ def index(): assert response.status_code == 200 event, = events - assert event[""]["request"]["data"]["foo"] == { + assert event["_meta"]["request"]["data"]["foo"] == { "": {"len": 2000, "rem": [["!limit", "x", 509, 512]]} } assert len(event["request"]["data"]["foo"]) == 512 - assert event[""]["request"]["data"]["file"] == { + assert event["_meta"]["request"]["data"]["file"] == { "": {"len": 0, "rem": [["!raw", "x", 0, 0]]} } assert not event["request"]["data"]["file"] diff --git a/tests/test_event.py b/tests/test_event.py index af50e487b0..d95ae34fb0 100644 --- a/tests/test_event.py +++ b/tests/test_event.py @@ -6,7 +6,7 @@ def test_flatten_metadata(): assert flatten_metadata({"foo": ["bar"]}) == {"foo": [u"bar"]} assert flatten_metadata({"foo": [AnnotatedValue("bar", u"meta")]}) == { "foo": [u"bar"], - "": {"foo": {"0": {"": u"meta"}}}, + "_meta": {"foo": {"0": {"": u"meta"}}}, } From 18dfa59c04315f0b6ce9e61cc10892689eabf175 Mon Sep 17 00:00:00 2001 From: Markus Unterwaditzer Date: Fri, 19 Oct 2018 13:03:50 +0200 Subject: [PATCH 2/2] fix: Fix test --- tests/integrations/django/test_basic.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/integrations/django/test_basic.py b/tests/integrations/django/test_basic.py index c83ddaca6f..5fe6fe0bdd 100644 --- a/tests/integrations/django/test_basic.py +++ b/tests/integrations/django/test_basic.py @@ -200,7 +200,10 @@ def test_request_body(sentry_init, client, capture_events): assert event["message"] == "hi" assert event["request"]["data"] == "" - assert event[""]["request"]["data"][""] == {"len": 6, "rem": [["!raw", "x", 0, 6]]} + assert event["_meta"]["request"]["data"][""] == { + "len": 6, + "rem": [["!raw", "x", 0, 6]], + } del events[:]