fix(profiling): Expand all Profile items in an envelope #1465
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jjbayer
approved these changes
Sep 13, 2022
| @@ -850,27 +850,24 @@ impl EnvelopeProcessor { | |||
|
|
|||
| /// Remove profiles if the feature flag is not enabled | |||
| fn process_profiles(&self, state: &mut ProcessEnvelopeState) { | |||
| let profiling_enabled = state.project_state.has_feature(Feature::Profiling); | |||
There was a problem hiding this comment.
This should work, even for external Relays, because features is part of LimitedProjectConfig.
https://github.com/getsentry/relay/blob/master/relay-server/src/actors/project.rs#L177
relay-server/src/actors/processor.rs
Outdated
| envelope.add_item(item); | ||
| } | ||
| } | ||
| Ok(mut payloads) => new_profiles.append(&mut payloads), |
There was a problem hiding this comment.
What's the advantage of introducing the intermediate vector new_profiles here, instead of calling envelope.add_item directly?
There was a problem hiding this comment.
That would create an endless loop in the outer loop, since that runs until there's no more profiling item in the envelope.
jan-auer
approved these changes
Sep 13, 2022
relay-server/src/actors/processor.rs
Outdated
| let context = &state.envelope_context; | ||
| let new_profiles: &mut Vec<Vec<u8>> = &mut Vec::new(); |
There was a problem hiding this comment.
This could be declared a Vec directly and use type inference.
jan-auer
added a commit
that referenced
this pull request
Sep 15, 2022
* master: fix(profiling): Expand all Profile items in an envelope (#1465)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This fixes the last 2 remaing issues introduced by my recent PRs:
Profileitems if the organization doesn't have profiling enabledProfileitems in an envelope as opposed to jus the first one