-
-
Notifications
You must be signed in to change notification settings - Fork 4.4k
fix(performance-quick-trace-query): Using Sentry.captureException to inspect trace endpoint response. #58167
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
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
3ada711
fix(performance-quick-trace-query): Using Sentry.captureException to …
527d49f
fix(performance-quick-trace-query): Pass empty array as trace when er…
ed53451
Merge branch 'master' into abdk/fix/tracequery-errors
Abdkhan14 af0c860
fix(quick-trace-errors): Fixed tests.
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,5 @@ | ||
import {Fragment} from 'react'; | ||
import * as Sentry from '@sentry/react'; | ||
|
||
import {Event} from 'sentry/types/event'; | ||
import {DiscoverQueryProps} from 'sentry/utils/discover/genericDiscoverQuery'; | ||
|
@@ -73,6 +74,10 @@ export default function QuickTraceQuery({children, event, ...props}: QueryProps) | |
organization | ||
); | ||
|
||
const scope = new Sentry.Scope(); | ||
const traceErrorMsg = 'Trace endpoints returning non-array in response'; | ||
scope.setFingerprint([traceErrorMsg]); | ||
|
||
if ( | ||
!traceFullResults.isLoading && | ||
traceFullResults.error === null && | ||
|
@@ -88,19 +93,31 @@ export default function QuickTraceQuery({children, event, ...props}: QueryProps) | |
}); | ||
} | ||
|
||
for (const subtrace of transactions ?? | ||
(traceFullResults.traces as TraceFull[])) { | ||
try { | ||
const trace = flattenRelevantPaths(event, subtrace); | ||
return children({ | ||
...traceFullResults, | ||
trace, | ||
currentEvent: trace.find(e => isCurrentEvent(e, event)) ?? null, | ||
}); | ||
} catch { | ||
// let this fall through and check the next subtrace | ||
// or use the trace lite results | ||
const traceTransactions = | ||
transactions ?? (traceFullResults.traces as TraceFull[]); | ||
|
||
try { | ||
for (const subtrace of traceTransactions) { | ||
try { | ||
const trace = flattenRelevantPaths(event, subtrace); | ||
return children({ | ||
...traceFullResults, | ||
trace, | ||
currentEvent: trace.find(e => isCurrentEvent(e, event)) ?? null, | ||
}); | ||
} catch { | ||
// let this fall through and check the next subtrace | ||
// or use the trace lite results | ||
} | ||
} | ||
} catch { | ||
// capture exception and let this fall through to | ||
// use the /events-trace-lite/ response below | ||
scope.setExtras({ | ||
traceTransactions, | ||
traceFullResults, | ||
}); | ||
Sentry.captureException(new Error(traceErrorMsg), scope); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. If you're capturing this as an exception vs. a message it's fine (I usually just do message for exploratory work), but just watch the frontend errors once this is out, might trip an alert |
||
} | ||
} | ||
|
||
|
@@ -118,14 +135,25 @@ export default function QuickTraceQuery({children, event, ...props}: QueryProps) | |
? orphanErrorsLite[0] | ||
: undefined; | ||
const traceTransactions = transactionLite ?? (trace as TraceLite); | ||
|
||
let traceTransaction: EventLite | undefined; | ||
try { | ||
traceTransaction = traceTransactions.find(e => isCurrentEvent(e, event)); | ||
} catch { | ||
scope.setExtras({ | ||
traceTransaction, | ||
orphanError, | ||
traceTransactions, | ||
trace, | ||
}); | ||
Sentry.captureException(new Error(traceErrorMsg), scope); | ||
} | ||
|
||
return children({ | ||
...traceLiteResults, | ||
trace: traceTransactions, | ||
trace: Array.isArray(traceTransactions) ? traceTransactions : [], | ||
orphanErrors: orphanErrorsLite, | ||
currentEvent: | ||
orphanError ?? | ||
traceTransactions.find(e => isCurrentEvent(e, event)) ?? | ||
null, | ||
currentEvent: orphanError ?? traceTransaction ?? null, | ||
}); | ||
} | ||
|
||
|
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Prob don't need a var here
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Will be getting rid of it all once I have some answers