Skip to content

Commit be07ed7

Browse files
authored
feat(issues): Add support for AWS trace parameterization (#94702)
These are also not-infrequently spotted in messages.
1 parent 2263a19 commit be07ed7

File tree

2 files changed

+15
-2
lines changed

2 files changed

+15
-2
lines changed

src/sentry/grouping/parameterization.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,14 @@ def compiled_pattern(self) -> re.Pattern[str]:
8888
""",
8989
),
9090
ParameterizationRegex(
91-
name="traceparent", raw_pattern=r"""\b00-[0-9a-f]{32}-[0-9a-f]{16}-0[01]\b"""
91+
name="traceparent",
92+
raw_pattern=r"""
93+
# https://www.w3.org/TR/trace-context/#traceparent-header
94+
(\b00-[0-9a-f]{32}-[0-9a-f]{16}-0[01]\b) |
95+
96+
# https://docs.aws.amazon.com/elasticloadbalancing/latest/application/load-balancer-request-tracing.html#request-tracing-syntax
97+
(\b1-[0-9a-f]{8}-[0-9a-f]{24}\b)
98+
""",
9299
),
93100
ParameterizationRegex(
94101
name="uuid",

tests/sentry/grouping/test_parameterization.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,11 @@ def parameterizer() -> Parameterizer:
1919
("hostname - subdomain", "www.example.net", "<hostname>"),
2020
("ip", "0.0.0.0", "<ip>"),
2121
(
22-
"traceparent",
22+
"traceparent - header",
2323
"traceparent: 00-0af7651916cd43dd8448eb211c80319c-b7ad6b7169203331-01",
2424
"traceparent: <traceparent>",
2525
),
26+
("traceparent - aws", "1-67891233-abcdef012345678912345678", "<traceparent>"),
2627
("uuid", "7c1811ed-e98f-4c9c-a9f9-58c757ff494f", "<uuid>"),
2728
(
2829
"uuid - multiple",
@@ -73,6 +74,11 @@ def parameterizer() -> Parameterizer:
7374
("int", "23", "<int>"),
7475
("int - separator", "0:17502", "<int>:<int>"),
7576
("int - parens", '{"msg" => "(#239323)', '{"msg" => "(#<int>)'),
77+
(
78+
"int - traceparent word boundary",
79+
"abcd1-67891233-abcdef012345678912345678",
80+
"abcd1<int>-abcdef012345678912345678",
81+
),
7682
("int - date - invalid day", "2006-01-40", "<int><int><int>"),
7783
("int - date - invalid month", "2006-20-02", "<int><int><int>"),
7884
("int - date - invalid year", "10000-01-02", "<int><int><int>"),

0 commit comments

Comments
 (0)