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

Jump to bottom

feat(eap): prefix sentry_tags with sentry. #6328

Merged
merged 4 commits into from
Sep 23, 2024
Merged

feat(eap): prefix sentry_tags with sentry. #6328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f6425eb
fix(eap): make truncate even more permissive
colin-sentry Sep 19, 2024
3ddd63b
fix(eap): namespace sentry_tags with sentry.
colin-sentry Sep 19, 2024
7dc1eca
feat(eap): prefix all sentry_tags items with sentry.
colin-sentry Sep 19, 2024
6f82257
insta
colin-sentry Sep 20, 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
2 changes: 1 addition & 1 deletion rust_snuba/src/processors/eap_spans.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ impl From<FromSpanMessage> for EAPSpan {
if k == "transaction" {
res.segment_name = v.clone();
} else {
insert_string(k.clone(), v.clone());
insert_string(format!("sentry.{}", k), v.clone());
}
})
}
Expand Down
42 changes: 22 additions & 20 deletions ...uba/src/processors/snapshots/rust_snuba__processors__eap_spans__tests__serialization.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,61 +24,63 @@ expression: span
"sampling_weight_2": 100,
"sign": 1,
"attr_str_0": {
"relay_protocol_version": "3",
"transaction.op": "http.server"
"relay_protocol_version": "3"
},
"attr_str_1": {
"sentry.thread.name": "uWSGIWorker1Core0"
},
"attr_num_1": {
"my.neg.float.field": -101.2,
"my.true.bool.field": 1.0
},
"attr_str_2": {
"trace.status": "ok",
"transaction.method": "POST",
"user": "ip:127.0.0.1"
"attr_str_3": {
"sentry.thread.id": "8522009600"
},
"attr_str_4": {
"thread.id": "8522009600"
},
"attr_str_5": {
"http.status_code": "200",
"sentry.release": "backend@24.7.0.dev0+c45b49caed1e5fcbf70097ab3f434b487c359b6b",
"sentry.sdk.name": "sentry.python.django"
"sentry.sdk.name": "sentry.python.django",
"sentry.transaction.op": "http.server"
},
"attr_num_5": {
"my.neg.field": -100.0
},
"attr_str_6": {
"op": "http.server",
"relay_id": "88888888-4444-4444-8444-cccccccccccc",
"thread.name": "uWSGIWorker1Core0"
},
"attr_num_6": {
"my.false.bool.field": 0.0
},
"attr_str_7": {
"sentry.trace.status": "ok"
},
"attr_str_8": {
"sdk.name": "sentry.python.django"
"sentry.category": "http"
},
"attr_str_9": {
"sentry.environment": "development",
"status_code": "200"
"sentry.environment": "development"
},
"attr_str_10": {
"release": "backend@24.7.0.dev0+c45b49caed1e5fcbf70097ab3f434b487c359b6b",
"sentry.sdk.version": "2.7.0"
},
"attr_str_11": {
"sentry.platform": "python",
"sentry.transaction.method": "POST",
"sentry.user": "ip:127.0.0.1"
},
"attr_num_11": {
"num_of_spans": 50.0
},
"attr_str_12": {
"relay_use_post_or_schedule_rejected": "version",
"server_name": "D23CXQ4GK2.local"
},
"attr_str_13": {
"category": "http"
},
"attr_str_14": {
"environment": "development",
"platform": "python"
"sentry.status": "ok"
},
"attr_num_14": {
"my.int.field": 2000.0
Expand All @@ -87,16 +89,16 @@ expression: span
"relay_endpoint_version": "3",
"relay_no_cache": "False",
"relay_use_post_or_schedule": "True",
"sdk.version": "2.7.0",
"spans_over_limit": "False"
},
"attr_num_17": {
"my.float.field": 101.2
},
"attr_str_18": {
"sentry.segment.name": "/api/0/relays/projectconfigs/"
"sentry.segment.name": "/api/0/relays/projectconfigs/",
"sentry.status_code": "200"
},
"attr_str_19": {
"status": "ok"
"sentry.op": "http.server"
}
}
42 changes: 21 additions & 21 deletions ..._tests__schemas@snuba-spans-EAPSpansMessageProcessor-snuba-spans__1__basic_span.json.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,36 +10,36 @@ expression: snapshot_payload
"http.response_content_length": 100.0
},
"attr_str_0": {
"group": "deadbeefdeadbeef",
"tag3": "True",
"transaction.op": "navigation"
"tag3": "True"
},
"attr_str_11": {
"sentry.http.method": "GET",
"sentry.transaction.method": "GET"
},
"attr_str_12": {
"sentry.domain": "targetdomain.tld:targetport"
},
"attr_str_13": {
"sentry.system": "python"
},
"attr_str_14": {
"sentry.status": "ok"
},
"attr_str_18": {
"sentry.action": "GET",
"sentry.status_code": "200",
"tag1": "value1"
},
"attr_str_19": {
"status": "ok",
"sentry.group": "deadbeefdeadbeef",
"sentry.op": "http.client",
"tag2": "123"
},
"attr_str_2": {
"transaction.method": "GET"
},
"attr_str_4": {
"http.method": "GET",
"system": "python"
},
"attr_str_5": {
"domain": "targetdomain.tld:targetport",
"module": "http"
},
"attr_str_6": {
"op": "http.client"
},
"attr_str_7": {
"action": "GET"
"sentry.transaction.op": "navigation"
},
"attr_str_9": {
"status_code": "200"
"attr_str_8": {
"sentry.module": "http"
},
"duration_ms": 1000,
"end_timestamp": 1715868486370551,
Expand Down
54 changes: 31 additions & 23 deletions snuba/web/rpc/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ def truncate_request_meta_to_day(meta: RequestMeta) -> None:
start_timestamp = datetime.utcfromtimestamp(meta.start_timestamp.seconds)
end_timestamp = datetime.utcfromtimestamp(meta.end_timestamp.seconds)
start_timestamp = start_timestamp.replace(
day=start_timestamp.day, hour=0, minute=0, second=0, microsecond=0
day=start_timestamp.day - 1, hour=0, minute=0, second=0, microsecond=0
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is from a rebase, change is already in master

)
end_timestamp = end_timestamp.replace(
day=end_timestamp.day + 1, hour=0, minute=0, second=0, microsecond=0
Expand Down Expand Up @@ -66,25 +66,29 @@ def transform(exp: Expression) -> Expression:

# These are the columns which aren't stored in attr_str_ nor attr_num_ in clickhouse
NORMALIZED_COLUMNS: Final[Mapping[str, AttributeKey.Type.ValueType]] = {
"organization_id": AttributeKey.Type.TYPE_INT,
"project_id": AttributeKey.Type.TYPE_INT,
"service": AttributeKey.Type.TYPE_STRING,
"span_id": AttributeKey.Type.TYPE_STRING, # this is converted by a processor on the storage
"parent_span_id": AttributeKey.Type.TYPE_STRING, # this is converted by a processor on the storage
"segment_id": AttributeKey.Type.TYPE_STRING, # this is converted by a processor on the storage
"segment_name": AttributeKey.Type.TYPE_STRING,
"is_segment": AttributeKey.Type.TYPE_BOOLEAN,
"duration_ms": AttributeKey.Type.TYPE_INT,
"exclusive_time_ms": AttributeKey.Type.TYPE_INT,
"retention_days": AttributeKey.Type.TYPE_INT,
"name": AttributeKey.Type.TYPE_STRING,
"sample_weight": AttributeKey.Type.TYPE_FLOAT,
"timestamp": AttributeKey.Type.TYPE_UNSPECIFIED,
"start_timestamp": AttributeKey.Type.TYPE_UNSPECIFIED,
"end_timestamp": AttributeKey.Type.TYPE_UNSPECIFIED,
"sentry.organization_id": AttributeKey.Type.TYPE_INT,
"sentry.project_id": AttributeKey.Type.TYPE_INT,
"sentry.service": AttributeKey.Type.TYPE_STRING,
"sentry.span_id": AttributeKey.Type.TYPE_STRING, # this is converted by a processor on the storage
"sentry.parent_span_id": AttributeKey.Type.TYPE_STRING, # this is converted by a processor on the storage
"sentry.segment_id": AttributeKey.Type.TYPE_STRING, # this is converted by a processor on the storage
"sentry.segment_name": AttributeKey.Type.TYPE_STRING,
"sentry.is_segment": AttributeKey.Type.TYPE_BOOLEAN,
"sentry.duration_ms": AttributeKey.Type.TYPE_INT,
"sentry.exclusive_time_ms": AttributeKey.Type.TYPE_INT,
"sentry.retention_days": AttributeKey.Type.TYPE_INT,
"sentry.name": AttributeKey.Type.TYPE_STRING,
"sentry.sample_weight": AttributeKey.Type.TYPE_FLOAT,
"sentry.timestamp": AttributeKey.Type.TYPE_UNSPECIFIED,
"sentry.start_timestamp": AttributeKey.Type.TYPE_UNSPECIFIED,
"sentry.end_timestamp": AttributeKey.Type.TYPE_UNSPECIFIED,
}

TIMESTAMP_COLUMNS: Final[Set[str]] = {"timestamp", "start_timestamp", "end_timestamp"}
TIMESTAMP_COLUMNS: Final[Set[str]] = {
"sentry.timestamp",
"sentry.start_timestamp",
"sentry.end_timestamp",
}


def attribute_key_to_expression(attr_key: AttributeKey) -> Expression:
Expand All @@ -94,7 +98,7 @@ def attribute_key_to_expression(attr_key: AttributeKey) -> Expression:
)
alias = attr_key.name

if attr_key.name == "trace_id":
if attr_key.name == "sentry.trace_id":
if attr_key.type == AttributeKey.Type.TYPE_STRING:
return f.CAST(column("trace_id"), "String", alias=alias)
raise BadSnubaRPCRequestException(
Expand All @@ -103,18 +107,22 @@ def attribute_key_to_expression(attr_key: AttributeKey) -> Expression:

if attr_key.name in TIMESTAMP_COLUMNS:
if attr_key.type == AttributeKey.Type.TYPE_STRING:
return f.CAST(column(attr_key.name), "String", alias=alias)
return f.CAST(
column(attr_key.name[len("sentry.") :]), "String", alias=alias
)
if attr_key.type == AttributeKey.Type.TYPE_INT:
return f.CAST(column(attr_key.name), "Int64", alias=alias)
return f.CAST(column(attr_key.name[len("sentry.") :]), "Int64", alias=alias)
if attr_key.type == AttributeKey.Type.TYPE_FLOAT:
return f.CAST(column(attr_key.name), "Float64", alias=alias)
return f.CAST(
column(attr_key.name[len("sentry.") :]), "Float64", alias=alias
)
raise BadSnubaRPCRequestException(
f"Attribute {attr_key.name} must be requested as a string, float, or integer, got {attr_key.type}"
)

if attr_key.name in NORMALIZED_COLUMNS:
if NORMALIZED_COLUMNS[attr_key.name] == attr_key.type:
return column(attr_key.name, alias=attr_key.name)
return column(attr_key.name[len("sentry.") :], alias=attr_key.name)
raise BadSnubaRPCRequestException(
f"Attribute {attr_key.name} must be requested as {NORMALIZED_COLUMNS[attr_key.name]}, got {attr_key.type}"
)
Expand Down
25 changes: 17 additions & 8 deletions tests/web/rpc/test_common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,39 +11,48 @@ def test_expression_trace_id(self) -> None:
assert attribute_key_to_expression(
AttributeKey(
type=AttributeKey.TYPE_STRING,
name="trace_id",
name="sentry.trace_id",
),
) == f.CAST(column("trace_id"), "String", alias="trace_id")
) == f.CAST(column("trace_id"), "String", alias="sentry.trace_id")

def test_timestamp_columns(self) -> None:
for col in ["timestamp", "start_timestamp", "end_timestamp"]:
for col in [
"sentry.timestamp",
"sentry.start_timestamp",
"sentry.end_timestamp",
]:
assert attribute_key_to_expression(
AttributeKey(
type=AttributeKey.TYPE_STRING,
name=col,
),
) == f.CAST(column(col), "String", alias=col)
) == f.CAST(column(col[len("sentry.") :]), "String", alias=col)
assert attribute_key_to_expression(
AttributeKey(
type=AttributeKey.TYPE_INT,
name=col,
),
) == f.CAST(column(col), "Int64", alias=col)
) == f.CAST(column(col[len("sentry.") :]), "Int64", alias=col)
assert attribute_key_to_expression(
AttributeKey(
type=AttributeKey.TYPE_FLOAT,
name=col,
),
) == f.CAST(column(col), "Float64", alias=col)
) == f.CAST(column(col[len("sentry.") :]), "Float64", alias=col)

def test_normalized_col(self) -> None:
for col in ["span_id", "parent_span_id", "segment_id", "service"]:
for col in [
"sentry.span_id",
"sentry.parent_span_id",
"sentry.segment_id",
"sentry.service",
]:
assert attribute_key_to_expression(
AttributeKey(
type=AttributeKey.TYPE_STRING,
name=col,
),
) == column(col, alias=col)
) == column(col[len("sentry.") :], alias=col)

def test_attributes(self) -> None:
assert attribute_key_to_expression(
Expand Down
Loading
Loading