Skip to content

feat(summary): Fixed the incorrect emission of span metric summaries #2566

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
mitsuhiko merged 3 commits into from
Dec 4, 2023
Merged

feat(summary): Fixed the incorrect emission of span metric summaries #2566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e4c97d5
feat(summary): Fixed the incorrect emission of span metric summaries
mitsuhiko Dec 4, 2023
3594675
fix lint
mitsuhiko Dec 4, 2023
6bc0af9
Merge branch 'master' into fix/wrong-summaries
mitsuhiko Dec 4, 2023
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
18 changes: 10 additions & 8 deletions sentry_sdk/metrics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,20 +375,22 @@ def add(

def to_json(self):
# type: (...) -> Dict[str, Any]
rv = {}
rv = {} # type: Any
for (export_key, tags), (
v_min,
v_max,
v_count,
v_sum,
) in self._measurements.items():
rv[export_key] = {
"tags": _tags_to_dict(tags),
"min": v_min,
"max": v_max,
"count": v_count,
"sum": v_sum,
}
rv.setdefault(export_key, []).append(
{
"tags": _tags_to_dict(tags),
"min": v_min,
"max": v_max,
"count": v_count,
"sum": v_sum,
}
)
return rv


Expand Down
86 changes: 53 additions & 33 deletions tests/test_metrics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -597,33 +597,37 @@ def test_metric_summaries(sentry_init, capture_envelopes):
t = transaction.items[0].get_transaction_event()

assert t["_metrics_summary"] == {
"c:root-counter@none": {
"count": 1,
"min": 1.0,
"max": 1.0,
"sum": 1.0,
"c:root-counter@none": [
{
"count": 1,
"min": 1.0,
"max": 1.0,
"sum": 1.0,
"tags": {
"transaction": "/foo",
"release": "fun-release@1.0.0",
"environment": "not-fun-env",
},
}
]
}

assert t["spans"][0]["_metrics_summary"]["d:my-dist@none"] == [
{
"count": 10,
"min": 0.0,
"max": 9.0,
"sum": 45.0,
"tags": {
"transaction": "/foo",
"release": "fun-release@1.0.0",
"environment": "not-fun-env",
"release": "fun-release@1.0.0",
"transaction": "/foo",
},
}
}

assert t["spans"][0]["_metrics_summary"]["d:my-dist@none"] == {
"count": 10,
"min": 0.0,
"max": 9.0,
"sum": 45.0,
"tags": {
"environment": "not-fun-env",
"release": "fun-release@1.0.0",
"transaction": "/foo",
},
}
]

assert t["spans"][0]["tags"] == {"a": "b"}
timer = t["spans"][0]["_metrics_summary"]["d:my-timer-metric@second"]
(timer,) = t["spans"][0]["_metrics_summary"]["d:my-timer-metric@second"]
assert timer["count"] == 1
assert timer["max"] == timer["min"] == timer["sum"]
assert timer["sum"] > 0
Expand Down Expand Up @@ -697,6 +701,7 @@ def should_summarize_metric(key, tags):
op="stuff", name="/foo", source=TRANSACTION_SOURCE_ROUTE
) as transaction:
metrics.timing("foo", value=1.0, tags={"a": "b"}, timestamp=ts)
metrics.timing("foo", value=1.0, tags={"b": "c"}, timestamp=ts)
metrics.timing("bar", value=1.0, tags={"a": "b"}, timestamp=ts)

Hub.current.flush()
Expand All @@ -707,25 +712,40 @@ def should_summarize_metric(key, tags):
assert envelope.items[0].headers["type"] == "statsd"
m = parse_metrics(envelope.items[0].payload.get_bytes())

assert len(m) == 2
assert len(m) == 3
assert m[0][1] == "bar@second"
assert m[1][1] == "foo@second"
assert m[2][1] == "foo@second"

# Measurement Attachment
t = transaction.items[0].get_transaction_event()["_metrics_summary"]
assert t == {
"d:foo@second": {
"tags": {
"a": "b",
"environment": "not-fun-env",
"release": "fun-release@1.0.0",
"transaction": "/foo",
"d:foo@second": [
{
"tags": {
"a": "b",
"environment": "not-fun-env",
"release": "fun-release@1.0.0",
"transaction": "/foo",
},
"min": 1.0,
"max": 1.0,
"count": 1,
"sum": 1.0,
},
"min": 1.0,
"max": 1.0,
"count": 1,
"sum": 1.0,
}
{
"tags": {
"b": "c",
"environment": "not-fun-env",
"release": "fun-release@1.0.0",
"transaction": "/foo",
},
"min": 1.0,
"max": 1.0,
"count": 1,
"sum": 1.0,
},
]
}


Expand Down