Skip to content

Commit 839b627

Browse files
authored
Merge branch 'master' into bot/bump-api-schema-to-0121ea4e
2 parents f921ea1 + b5bd678 commit 839b627

File tree

7 files changed

+65
-11
lines changed

7 files changed

+65
-11
lines changed

app/platform-redirect/page.tsx

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import {Metadata} from 'next';
12
import {redirect} from 'next/navigation';
23

34
import {Alert} from 'sentry-docs/components/alert';
@@ -7,6 +8,13 @@ import {SmartLink} from 'sentry-docs/components/smartLink';
78
import {extractPlatforms, getDocsRootNode, nodeForPath} from 'sentry-docs/docTree';
89
import {setServerContext} from 'sentry-docs/serverContext';
910

11+
export const metadata: Metadata = {
12+
robots: 'noindex',
13+
title: 'Platform Specific Content',
14+
description:
15+
'The page you are looking for is customized for each platform. Select your platform below and we’ll direct you to the most specific documentation on it.',
16+
};
17+
1018
export default async function Page({
1119
searchParams: {next = '', platform},
1220
}: {

docs/platforms/javascript/common/configuration/integrations/browsertracing.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,6 @@ Read more about [setting up BrowserTracing](./../../../tracing/).
3434

3535
```JavaScript
3636
Sentry.init({
37-
integrations: [new Sentry.browserTracingIntegration()],
37+
integrations: [Sentry.browserTracingIntegration()],
3838
});
3939
```

docs/platforms/javascript/common/configuration/integrations/debug.mdx

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,17 @@
11
---
22
title: Debug
3-
description: "Allows you to inspect the contents of a processed event and hint object that gets passed to beforeSend or beforeSendTransaction."
3+
description: "Allows you to inspect the contents of a processed event and hint object that gets passed to beforeSend or beforeSendTransaction. (deprecated)"
44
---
55

6+
{/* TODO(v9): Remove this page and all references to it */}
7+
8+
<Alert title="Deprecation Notice">
9+
10+
The `Debug` Integration is deprecated and will be removed in the next major version of the SDK.
11+
To log outgoing events, we recommend using <PlatformLink to="/configuration/options/#hooks">Hook Options</PlatformLink> in `Sentry.init()`.
12+
13+
</Alert>
14+
615
_Import name: `Sentry.debugIntegration`_
716

817
This integration allows you to inspect the contents of a processed event and hint object that gets passed to `beforeSend` or `beforeSendTransaction`. It will always run as the last integration, no matter when it was registered.

docs/platforms/javascript/common/configuration/integrations/sessiontiming.mdx

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,17 @@
11
---
22
title: SessionTiming
3-
description: "Adds session timing data to events."
3+
description: "Adds session timing data to events. (deprecated)"
44
---
55

6+
{/* TODO(v9): Remove this page and all references to it */}
7+
8+
<Alert title="Deprecation Notice">
9+
10+
The `SessionTiming` Integration is deprecated and will be removed in the next major version of the SDK.
11+
To capture session durations alongside events, we recommend using <PlatformLink to="/enriching-events/context/">Context</PlatformLink>.
12+
13+
</Alert>
14+
615
_Import name: `Sentry.sessionTimingIntegration`_
716

817
This integration adds duration data for sessions to events.

platform-includes/debug-symbols-apple/_default.mdx

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,13 @@ For this to work, your project settings for `DEBUG_INFORMATION_FORMAT` must be s
2525

2626
<OrgAuthTokenNote />
2727

28-
```bash
28+
You can also upload your code for source context. This feature allows Sentry to display snippets of your code next to the event stack traces.
29+
30+
<OnboardingOptionButtons
31+
options={[{ id:"source-context", checked: false }]}
32+
/>
33+
34+
```bash {"onboardingOptions": {"source-context": "2"}}
2935
sentry-cli debug-files upload --auth-token ___ORG_AUTH_TOKEN___ \
3036
--include-sources \
3137
--org ___ORG_SLUG___ \
@@ -44,7 +50,7 @@ Sentry can display snippets of your code next to event stack traces. This featur
4450

4551
<OrgAuthTokenNote />
4652

47-
```ruby {tabTitle:Current Fastlane plugin}
53+
```ruby {tabTitle:Current Fastlane plugin} {"onboardingOptions": {"source-context": "5"}}
4854
sentry_debug_files_upload(
4955
auth_token: '___ORG_AUTH_TOKEN___',
5056
org_slug: '___ORG_SLUG___',
@@ -53,7 +59,7 @@ sentry_debug_files_upload(
5359
)
5460
```
5561

56-
```ruby {tabTitle:Fastlane plugin before 1.20.0}
62+
```ruby {tabTitle:Fastlane plugin before 1.20.0} {"onboardingOptions": {"source-context": "5"}}
5763
sentry_upload_dif(
5864
auth_token: '___ORG_AUTH_TOKEN___',
5965
org_slug: '___ORG_SLUG___',
@@ -94,7 +100,7 @@ Another option is to use warnings, and then set `GCC_TREAT_WARNINGS_AS_ERRORS` t
94100

95101
<OrgAuthTokenNote />
96102

97-
```bash {tabTitle:Warn on failures - nonblocking}
103+
```bash {tabTitle:Warn on failures - nonblocking} {"onboardingOptions": {"source-context": "10"}}
98104
if [[ "$(uname -m)" == arm64 ]]; then
99105
export PATH="/opt/homebrew/bin:$PATH"
100106
fi
@@ -103,7 +109,9 @@ if which sentry-cli >/dev/null; then
103109
export SENTRY_ORG=___ORG_SLUG___
104110
export SENTRY_PROJECT=___PROJECT_SLUG___
105111
export SENTRY_AUTH_TOKEN=___ORG_AUTH_TOKEN___
106-
ERROR=$(sentry-cli debug-files upload --include-sources "$DWARF_DSYM_FOLDER_PATH" 2>&1 >/dev/null)
112+
ERROR=$(sentry-cli debug-files upload \
113+
--include-sources \
114+
"$DWARF_DSYM_FOLDER_PATH" 2>&1 >/dev/null)
107115
if [ ! $? -eq 0 ]; then
108116
echo "warning: sentry-cli - $ERROR"
109117
fi
@@ -112,7 +120,7 @@ echo "warning: sentry-cli not installed, download from https://github.com/getsen
112120
fi
113121
```
114122

115-
```bash {tabTitle:Error on failures - blocking}
123+
```bash {tabTitle:Error on failures - blocking} {"onboardingOptions": {"source-context": "10"}}
116124
if [[ "$(uname -m)" == arm64 ]]; then
117125
export PATH="/opt/homebrew/bin:$PATH"
118126
fi
@@ -121,7 +129,9 @@ if which sentry-cli >/dev/null; then
121129
export SENTRY_ORG=___ORG_SLUG___
122130
export SENTRY_PROJECT=___PROJECT_SLUG___
123131
export SENTRY_AUTH_TOKEN=___ORG_AUTH_TOKEN___
124-
ERROR=$(sentry-cli debug-files upload --include-sources "$DWARF_DSYM_FOLDER_PATH" --force-foreground 2>&1 >/dev/null)
132+
ERROR=$(sentry-cli debug-files upload \
133+
--include-sources \
134+
"$DWARF_DSYM_FOLDER_PATH" --force-foreground 2>&1 >/dev/null)
125135
if [ ! $? -eq 0 ]; then
126136
echo "error: sentry-cli - $ERROR"
127137
fi

platform-includes/getting-started-primer/javascript.nextjs.mdx

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,16 @@ Features:
99

1010
<Note>
1111

12-
`next dev --turbo` is not supported while Turbopack is in beta. Running your devserver with Turbopack will cause the Sentry Next.js SDK not to be loaded in the browser. Data from serverside instrumentation will also be inaccurate or incomplete.
12+
The Sentry SDK does not fully support `next dev --turbo` while Turbopack does not ship all the features required to run Sentry.
13+
14+
Currently, when you run your devserver with Turbopack, the Sentry Next.js SDK will not be loaded in the browser.
15+
Keep this in mind when configuring the SDK.
16+
17+
Note that this only affects the devserver.
18+
The Sentry SDK will run without issues when you do a production build, even if you develop locally with Turbopack.
1319

1420
To support the SDK in the browser with Turbopack, [follow the feature request for client-side instrumentation in the Next.js repository](https://github.com/vercel/next.js/discussions/69294).
1521

22+
You can track Sentry's Turbopack support in the [GitHub Issue in the Sentry SDK repository](https://github.com/getsentry/sentry-javascript/issues/8105).
23+
1624
</Note>

src/components/onboarding/index.tsx

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,23 @@ const optionDetails: Record<
4848
</span>
4949
),
5050
},
51+
'source-context': {
52+
name: 'Source context',
53+
description: (
54+
<span>
55+
Upload your source code to allow Sentry to display snippets of your code next to
56+
the event stack traces.
57+
</span>
58+
),
59+
},
5160
};
5261

5362
const OPTION_IDS = [
5463
'error-monitoring',
5564
'performance',
5665
'profiling',
5766
'session-replay',
67+
'source-context',
5868
] as const;
5969

6070
type OptionId = (typeof OPTION_IDS)[number];

0 commit comments

Comments
 (0)