Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

fix(unreal): Do not serialize broken misc_primary_cpu_brand #650

Merged
merged 3 commits into from
Jul 6, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
- Apply clock drift correction to Release Health sessions and validate timestamps. ([#633](https://github.com/getsentry/relay/pull/633))
- Apply clock drift correction for timestamps that are too far in the past or future. This fixes a bug where broken transaction timestamps would lead to negative durations. ([#634](https://github.com/getsentry/relay/pull/634))
- Respond with status code `200 OK` to rate limited minidump and UE4 requests. Third party clients otherwise retry those requests, leading to even more load. ([#646](https://github.com/getsentry/relay/pull/646), [#647](https://github.com/getsentry/relay/pull/647))
- Ingested unreal crash reports no longer have a `misc_primary_cpu_brand` key with GPU information set in the Unreal context. ([#650](https://github.com/getsentry/relay/pull/650))

**Internal**:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ expression: event.to_json_pretty().unwrap()
"misc_cpu_vendor": "GenuineIntel",
"misc_number_of_cores": 6,
"misc_number_of_cores_inc_hyperthread": 6,
"misc_primary_cpu_brand": "Parallels Display Adapter (WDDM)",
"platform_name": "WindowsNoEditor",
"portable_call_stack": "YetAnother 0x00000000544e0000 + 703394 YetAnother 0x00000000544e0000 + 281f2ee YetAnother 0x00000000544e0000 + 2a26dd3 YetAnother 0x00000000544e0000 + 2a4f984 YetAnother 0x00000000544e0000 + 355e77e YetAnother 0x00000000544e0000 + 3576186 YetAnother 0x00000000544e0000 + 8acc56 YetAnother 0x00000000544e0000 + 8acf00 YetAnother 0x00000000544e0000 + 35c121d YetAnother 0x00000000544e0000 + 35cfb58 YetAnother 0x00000000544e0000 + 2eb082f YetAnother 0x00000000544e0000 + 2eb984f YetAnother 0x00000000544e0000 + 2d1cd39 YetAnother 0x00000000544e0000 + 325258 YetAnother 0x00000000544e0000 + 334e4c YetAnother 0x00000000544e0000 + 334eaa YetAnother 0x00000000544e0000 + 3429e6 YetAnother 0x00000000544e0000 + 44e73c6 KERNEL32 0x000000000fd40000 + 13034 ntdll 0x0000000010060000 + 71471",
"process_id": 9444,
Expand Down
5 changes: 5 additions & 0 deletions relay-server/src/utils/unreal.rs
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,11 @@ fn merge_unreal_context(event: &mut Event, context: Unreal4Context) {
}
}

// Clear this property. It's a duplicate of misc_primary_gpu_brand and only exists because
// somebody made a typo once while mapping the GPU data from unrealcontext in symbolic, and we
// tried to fix this in a backwards-compatible way by retaining both properties.
runtime_props.misc_primary_cpu_brand = None;

if let Some(gpu_brand) = runtime_props.misc_primary_gpu_brand.take() {
let gpu_context = contexts.get_or_insert_with(GpuContext::default_key(), || {
Context::Gpu(Box::new(GpuContext::default()))
Expand Down