Skip to content

Commit a00af6b

Browse files
authored
build: Update sentry-conventions (#5148)
This updates `sentry-conventions` from [8cc17b9](getsentry/sentry-conventions@8cc17b9) to [7a3f6a2](getsentry/sentry-conventions@7a3f6a2). As a consequence, the attributes `sentry.observed_timestamp_nanos`, `sentry.browser.name`, and `sentry.browser.version` are no longer scrubbed by default scrubbing rules.
1 parent 653f9a5 commit a00af6b

File tree

2 files changed

+11
-15
lines changed

2 files changed

+11
-15
lines changed
Submodule sentry-conventions updated 56 files

tests/integration/test_ourlogs.py

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -491,30 +491,26 @@ def test_ourlog_extraction_default_pii_scrubbing_does_not_scrub_default_attribut
491491
relay.send_envelope(project_id, envelope)
492492

493493
item = items_consumer.get_item()
494-
# Some of the following should not be redacted, but currently they are inside the `Attributes` object which
495-
# treats every PII field as 'true' (default field), thus it's targetable by rules like '**'.
496494
assert item == {
497495
"attributes": {
498-
"sentry._meta.fields.attributes.sentry.browser.version": {
499-
"stringValue": '{"meta":{"value":{"":{"rem":[["remove_custom_field","s",0,10]],"len":4}}}}'
500-
},
501496
"sentry._meta.fields.attributes.custom_field": {
502497
"stringValue": '{"meta":{"value":{"":{"rem":[["remove_custom_field","s",0,10]],"len":12}}}}'
503498
},
504-
"sentry.browser.version": {"stringValue": "[REDACTED]"},
505-
"sentry._meta.fields.attributes.sentry.observed_timestamp_nanos": {
506-
"stringValue": '{"meta":{"value":{"":{"rem":[["remove_custom_field","s",0,10]],"len":19}}}}'
507-
},
499+
"sentry.browser.version": {"stringValue": "2.32"},
508500
"custom_field": {"stringValue": "[REDACTED]"},
509501
"sentry.body": {"stringValue": "[REDACTED]"},
510-
"sentry._meta.fields.attributes.sentry.browser.name": {
511-
"stringValue": '{"meta":{"value":{"":{"rem":[["remove_custom_field","s",0,10]],"len":15}}}}'
512-
},
513502
"sentry.severity_text": {"stringValue": "info"},
514-
"sentry.observed_timestamp_nanos": {"stringValue": "[REDACTED]"},
503+
"sentry.observed_timestamp_nanos": {
504+
"stringValue": time_within_delta(
505+
ts,
506+
delta=timedelta(seconds=1),
507+
expect_resolution="ns",
508+
precision="us",
509+
)
510+
},
515511
"sentry.span_id": {"stringValue": "eee19b7ec3c1b174"},
516512
"sentry.payload_size_bytes": mock.ANY,
517-
"sentry.browser.name": {"stringValue": "[REDACTED]"},
513+
"sentry.browser.name": {"stringValue": "Python Requests"},
518514
"sentry._meta.fields.body": {
519515
"stringValue": '{"meta":{"":{"rem":[["remove_custom_field","s",0,10]],"len":8}}}'
520516
},

0 commit comments

Comments
 (0)