Skip to content

feat(nextjs): Connect server component transactions if there is no incoming trace #9845

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.

Sign up for GitHub

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
lforst merged 12 commits into from
Dec 18, 2023
Merged

feat(nextjs): Connect server component transactions if there is no incoming trace #9845

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e1841f2
ref(nextjs): Simplify `wrapServerComponentWithSentry`
Dec 14, 2023
49d6e4c
feat(nextjs): Connect server component transactions if there is no in…
Dec 14, 2023
6dd49dd
.
Dec 14, 2023
9ecaa10
Merge remote-tracking branch 'origin/develop' into lforst-refactor-wr…
Dec 18, 2023
9e8e0aa
Set status to ok on redirect
Dec 18, 2023
e44f1ed
Merge branch 'lforst-refactor-wrap-servercomponents' into lforst-conn…
Dec 18, 2023
2619bbd
Merge remote-tracking branch 'origin/develop' into lforst-connect-ser…
Dec 18, 2023
3618f73
Connect generation functions
Dec 18, 2023
5696faa
Merge remote-tracking branch 'origin/develop' into lforst-connect-ser…
Dec 18, 2023
1ae5c14
Add comment explaining.
Dec 18, 2023
9b871f3
Add e2e test
Dec 18, 2023
edcda0d
Pr feedback
Dec 18, 2023
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
Prev Previous commit
Pr feedback
  • Loading branch information
Luca Forstner committed Dec 18, 2023
commit edcda0d1fdad1c50085166cfb9ecb4aa4f756b3a
6 changes: 3 additions & 3 deletions packages/nextjs/src/common/utils/commonObjectTracing.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ export function commonObjectToPropagationContext(
propagationContext: PropagationContext,
): PropagationContext {
if (typeof commonObject === 'object' && commonObject) {
const memoTraceId = commonMap.get(commonObject);
if (memoTraceId) {
return memoTraceId;
const memoPropagationContext = commonMap.get(commonObject);
if (memoPropagationContext) {
return memoPropagationContext;
} else {
commonMap.set(commonObject, propagationContext);
return propagationContext;
Expand Down