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.

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

feat(profiling): Support ingesting mixed android/js profiles for react-native #375

Merged
merged 4 commits into from
Dec 19, 2023
Merged
Show file tree
Hide file tree
Changes from 2 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 @@ -6,6 +6,7 @@

- Relicense under FSL-1.0-Apache-2.0. ([#366](https://github.com/getsentry/vroom/pull/366))
- Return the emitted regressions in response. ([#372](https://github.com/getsentry/vroom/pull/372))
- Support ingesting mixed android/js profiles for react-native ([#375](https://github.com/getsentry/vroom/pull/375))


**Bug Fixes**:
Expand Down
1 change: 1 addition & 0 deletions internal/profile/legacy.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ type (
OrganizationID uint64 `json:"organization_id"`
Platform platform.Platform `json:"platform"`
Profile json.RawMessage `json:"profile,omitempty"`
JsProfile json.RawMessage `json:"js_profile,omitempty"`
ProfileID string `json:"profile_id"`
ProjectID uint64 `json:"project_id"`
Received timeutil.Time `json:"received"`
Expand Down
1 change: 1 addition & 0 deletions internal/speedscope/speedscope.go
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ type (
OrganizationID uint64 `json:"organizationID"` //nolint:unused
Platform platform.Platform `json:"platform"` //nolint:unused
Profile json.RawMessage `json:"-"` //nolint:unused
JsProfile json.RawMessage `json:"-"` //nolint:unused
ProfileID string `json:"profileID"` //nolint:unused
ProjectID uint64 `json:"projectID"` //nolint:unused
Received timeutil.Time `json:"received"` //nolint:unused
Expand Down
Loading