feat(normalization): Scrub span description URLs #2095
Merged
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
iker-barriocanal
changed the title
iker-barriocanal
commented
May 8, 2023
| .and_then(|data| { | ||
| data.insert( | ||
| "description.scrubbed".to_owned(), | ||
| Annotated::new(Value::String(new_desc.to_owned())), |
There was a problem hiding this comment.
I was having some issues to add the scrubbed description as the value here, and the dance around scrubbed values above is a result of this.
iker-barriocanal
commented
May 8, 2023
| .unwrap(); | ||
|
|
||
| assert_eq!($input, span.value().unwrap().description.value().unwrap()); | ||
| if $output == "" { |
There was a problem hiding this comment.
Ideally, this is Option::None, I'll address this in a future PR.
jjbayer
approved these changes
May 8, 2023
olksdr
reviewed
May 9, 2023
|
|
||
| if let Some(is_url_like) = span.op.value().map(|op| op.starts_with("http")) { | ||
| if is_url_like && scrub_identifiers(&mut scrubbed)? { | ||
| let Some(new_desc) = scrubbed.value() else { |
There was a problem hiding this comment.
you could use .into_value() here instead of the .value(), since it would give the the Option<String> and there won't be any need to to new_desc.to_owned() where you allocate another string again on line 476
jan-auer
added a commit
that referenced
this pull request
May 9, 2023
* master: (178 commits) ref(crons): Allow `_` in monitor slugs (#2100) fix(span-metrics): Scrub subdomains in metric tags (#2103) feat(normalization): Scrub span description URLs (#2095) feat(dynamic-sampling): Add possibility to run dynamic sampling from `sentry-relay` (#2091) ref(dynamic-config): Remove transaction metrics allowlist from Sentry (#2092) feat(protocol): Support old effective-directory format (#2048) ref(spans): Add more tags to span metrics (#2090) fix(server): Support HTTP half-close connections (#2089) ref(spans): Use transactions namespace with `span` prefix (#2087) ref(spans): Update span metrics feature flag name (#2086) feat(metrics): Extract more metrics from spans (#2080) build: Bump tempfile to remove flagged dependency (#2085) feat(filter): Add document_uri csp filter (#2059) build: Use jemalloc on Linux (#2084) ci(gha): add debugging for "Couldn'\''t write tracker file" issue (#2081) feat(crons): Pass-through minimal `sdk` field (#2073) fix(quota): Parse large limits (#2079) instr(server): More details on unexpected envelope drop (#2077) fix(ci): Skip flaky integration test (#2076) feat(dynamic-sampling): Add support for `trace.replay_id` in matching rules (#2070) ...
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.
Scrub identifiers from URLs in span description. The scrubbed description is available in the span as
data['description.scrubbed'], and in case something was scrubbed, aspan.descriptiontag is added to span metrics. This only happens to these projects with the feature flag enabled.