Skip to content
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

feat(metrics): Forward received_at field to Kafka #3561

Merged
merged 24 commits into from
May 22, 2024
Merged

feat(metrics): Forward received_at field to Kafka #3561

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
96b2afa
feat(metrics): Forward received_at field to Kafka
iambriccardo May 7, 2024
19215e1
Merge branch 'master' into riccardo/feat/forward-received-at
iambriccardo May 7, 2024
298c9fa
Update tests
iambriccardo May 7, 2024
187d1b5
Merge branch 'master' into riccardo/feat/forward-received-at
iambriccardo May 7, 2024
7572a51
FIx
iambriccardo May 7, 2024
0d18245
FIx
iambriccardo May 8, 2024
c865cd4
Upgrade kafka schemas
iambriccardo May 8, 2024
ee9b3f7
Fix
iambriccardo May 8, 2024
def59a0
Improve
iambriccardo May 8, 2024
d5b88d8
Improve
iambriccardo May 8, 2024
9bc8367
Fix
iambriccardo May 8, 2024
cd8cc42
Fix
iambriccardo May 8, 2024
b5ecdb9
Improve
iambriccardo May 10, 2024
bdf8a03
Improve
iambriccardo May 10, 2024
a78b197
Revert
iambriccardo May 10, 2024
27e48d7
Fix
iambriccardo May 10, 2024
74990f5
Add changelog
iambriccardo May 10, 2024
de8bbd5
Merge branch 'master' into riccardo/feat/forward-received-at
iambriccardo May 10, 2024
c2eaeb3
Update relay-server/src/services/store.rs
iambriccardo May 10, 2024
bdadda5
Merge
iambriccardo May 21, 2024
06736db
Merge branch 'master' into riccardo/feat/forward-received-at
iambriccardo May 21, 2024
ad14b6b
Merge
iambriccardo May 21, 2024
bb4a0a2
Merge
iambriccardo May 21, 2024
342da97
Fix
iambriccardo May 21, 2024
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
Prev Previous commit
Next Next commit
FIx
  • Loading branch information
@iambriccardo
iambriccardo committed May 8, 2024
commit 0d1824542d1fefdb91b8e27c02b439e00c16d8ba
6 changes: 4 additions & 2 deletions tests/integration/test_metrics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1579,6 +1579,8 @@ def test_span_metrics_secondary_aggregator(
processing.send_transaction(project_id, transaction)

metrics = metrics_consumer.get_metrics()
for metric in metrics:
del metric["received_at"]

# Transaction metrics are still aggregated:
assert all([m[0]["name"].startswith("spans", 2) for m in metrics])
Expand All @@ -1605,7 +1607,7 @@ def test_span_metrics_secondary_aggregator(
},
"timestamp": int(timestamp.timestamp()),
"type": "d",
"value": [123],
"value": [123.0],
},
[("namespace", b"spans")],
),
Expand All @@ -1618,7 +1620,7 @@ def test_span_metrics_secondary_aggregator(
"tags": {"span.op": "default"},
"timestamp": int(timestamp.timestamp()),
"type": "d",
"value": [3],
"value": [3.0],
},
[("namespace", b"spans")],
),
Expand Down
1 change: 1 addition & 0 deletions tests/integration/test_spans.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -638,6 +638,7 @@ def test_span_ingestion(
metrics.sort(key=lambda m: (m["name"], sorted(m["tags"].items()), m["timestamp"]))
for metric in metrics:
try:
del metric["received_at"]
metric["value"].sort()
except AttributeError:
pass
Expand Down
Loading