Skip to content

feat(replays): Fix typo in payload deserializer #1467

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
merged 3 commits into from
Sep 13, 2022
Merged

feat(replays): Fix typo in payload deserializer #1467

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
8d46d7e
Use singular request key
cmanallen Sep 13, 2022
f941457
Further renames to 'request'
cmanallen Sep 13, 2022
06c457e
Fix integration test coverage
cmanallen Sep 13, 2022
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
12 changes: 6 additions & 6 deletions relay-replays/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
//! "urls": ["https://sentry.io"],
//! "error_ids": ["d2132d31b39445f1938d7e21b6bf0ec4"],
//! "trace_ids": ["63c5b0f895441a94340183c5f1e74cd4"],
//! "requests": {
//! "request": {
//! "headers": {"User-Agent": "Mozilla/5.0..."}
//! },
//! }
Expand All @@ -45,7 +45,7 @@ pub fn normalize_replay_event(
) -> Result<Vec<u8>, Error> {
let mut replay_input: ReplayInput = serde_json::from_slice(replay_bytes)?;

// Set user-agent metadata from requests object.
// Set user-agent metadata from request object.
replay_input.set_user_agent_meta();

// Set user ip-address if needed.
Expand Down Expand Up @@ -82,12 +82,12 @@ struct ReplayInput {
#[serde(default)]
user: User,
#[serde(default)]
requests: Requests,
request: Request,
}

impl ReplayInput {
fn set_user_agent_meta(&mut self) {
let user_agent = &self.requests.headers.user_agent;
let user_agent = &self.request.headers.user_agent;

let ua = user_agent::parse_user_agent(user_agent);
let browser_struct = VersionedMeta {
Expand Down Expand Up @@ -155,7 +155,7 @@ struct User {

#[derive(Debug, Default, Deserialize, Serialize)]
#[serde(default)]
struct Requests {
struct Request {
url: Option<String>,
headers: Headers,
}
Expand Down Expand Up @@ -229,7 +229,7 @@ mod tests {
}

#[test]
fn test_set_user_agent_meta_no_requests() {
fn test_set_user_agent_meta_no_request() {
let payload = include_bytes!("../tests/fixtures/replay_no_requests.json");
let mut replay_input: ReplayInput = serde_json::from_slice(payload).unwrap();
replay_input.set_user_agent_meta();
Expand Down
2 changes: 1 addition & 1 deletion relay-replays/tests/fixtures/replay.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"email": "[email protected]",
"ip_address": "192.168.11.12"
},
"requests": {
"request": {
"url": null,
"headers": {
"User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.5 Safari/605.1.15"
Expand Down
2 changes: 1 addition & 1 deletion relay-replays/tests/fixtures/replay_missing_user.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"name": "name",
"version": "veresion"
},
"requests": {
"request": {
"url": null,
"headers": {
"User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.5 Safari/605.1.15"
Expand Down
2 changes: 1 addition & 1 deletion relay-replays/tests/fixtures/replay_missing_user_ip_address.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"username": "user",
"email": "[email protected]"
},
"requests": {
"request": {
"url": null,
"headers": {
"User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.5 Safari/605.1.15"
Expand Down
8 changes: 4 additions & 4 deletions tests/integration/test_replay_events.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ def generate_replay_sdk_event():
"email": "[email protected]",
"ip_address": "192.168.11.12",
},
"requests": {
"request": {
"url": None,
"headers": {
"User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.5 Safari/605.1.15"
Expand Down Expand Up @@ -78,10 +78,10 @@ def test_replay_event_with_processing(
assert parsed_replay["user"]["username"] == replay["user"]["username"]
assert parsed_replay["user"]["email"] == replay["user"]["email"]
assert parsed_replay["user"]["ip_address"] == replay["user"]["ip_address"]
assert parsed_replay["requests"]["url"] == replay["requests"]["url"]
assert parsed_replay["request"]["url"] == replay["request"]["url"]
assert (
parsed_replay["requests"]["headers"]["User-Agent"]
== replay["requests"]["headers"]["User-Agent"]
parsed_replay["request"]["headers"]["User-Agent"]
== replay["request"]["headers"]["User-Agent"]
)

# Round to account for float imprecision. Not a big deal. Decimals
Expand Down