Skip to content

Commit 37d0c9e

Browse files
committed
Merge branch 'master' of github.com:getsentry/sentry-docs into smi/quick-start/nextjs
2 parents abbeca1 + ba10f5b commit 37d0c9e

File tree

569 files changed

+4655
-2566
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

569 files changed

+4655
-2566
lines changed

.github/CODEOWNERS

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@
3838

3939
# /src/docs/cli/dif.mdx @getsentry/owners-native
4040

41-
# /.github/labels.yml @getsentry/open-source
42-
# /.github/workflows/react-to-product-owners-yml-changes.yml @getsentry/open-source
43-
# /bin/react-to-product-owners-yml-changes.py @getsentry/open-source
44-
# /bin/react-to-product-owners-yml-changes.sh @getsentry/open-source
41+
# /.github/labels.yml @getsentry/dev-infra
42+
# /.github/workflows/react-to-product-owners-yml-changes.yml @getsentry/dev-infra
43+
# /bin/react-to-product-owners-yml-changes.py @getsentry/dev-infra
44+
# /bin/react-to-product-owners-yml-changes.sh @getsentry/dev-infra
4545

4646
# ###### Replays #######
4747

app/[[...path]]/page.tsx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,10 +200,14 @@ export async function generateMetadata(props: MetadataProps): Promise<Metadata>
200200
: domain;
201201
let title =
202202
'Sentry Docs | Application Performance Monitoring &amp; Error Tracking Software';
203-
let customCanonicalTag;
203+
let customCanonicalTag: string = '';
204204
let description =
205205
'Self-hosted and cloud-based application performance monitoring &amp; error tracking that helps software teams see clearer, solve quicker, &amp; learn continuously.';
206-
const images = [{url: `${previewDomain ?? domain}/meta.jpg`, width: 1200, height: 822}];
206+
// show og image on the home page only
207+
const images =
208+
((await props.params).path ?? []).length === 0
209+
? [{url: `${previewDomain ?? domain}/og.png`, width: 1200, height: 630}]
210+
: [];
207211

208212
const rootNode = await getDocsRootNode();
209213

app/globals.css

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,3 +160,8 @@ body {
160160
opacity: 1;
161161
}
162162
}
163+
164+
#kapa-widget-portal a[href="https://sentry.io/privacy/"]
165+
{
166+
color: rgb(134, 142, 150) !important;
167+
}

app/layout.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ export default function RootLayout({children}: {children: React.ReactNode}) {
5656
data-project-color="#6A5FC1"
5757
data-project-logo="https://avatars.githubusercontent.com/u/1396951?s=280&v=4"
5858
data-font-family="var(--font-rubik)"
59-
data-modal-disclaimer="Disclaimer: Welcome to our knowledge search bot! While we'd love to be able to answer all your questions, please remember this is a tool for searching our publicly available sources and not a support forum. Don't include any sensitive or personal information in your queries. For more on how Sentry handles your data, see our [Privacy Policy](https://sentry.io/privacy/). This form is protected by reCAPTCHA. Google's Privacy Policy and Google's Terms of Service apply."
59+
data-modal-disclaimer="Please note: This is a tool that searches publicly available sources. Do not include any sensitive or personal information in your queries. For more on how Sentry handles your data, see our [Privacy Policy](https://sentry.io/privacy/)."
6060
data-modal-example-questions="How to set up Sentry for Next.js?,What are tracePropagationTargets?"
6161
/>
6262
</body>

app/platform-redirect/page.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ export default async function Page(props: {
7979

8080
return (
8181
<DocPage frontMatter={frontMatter}>
82-
<Alert level="info">{platformInfo}</Alert>
82+
<Alert>{platformInfo}</Alert>
8383

8484
<ul>
8585
{platformList.map(p => (

apps/changelog/package.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,16 @@
2121
"@auth/prisma-adapter": "^2.7.4",
2222
"@google-cloud/storage": "^7.7.0",
2323
"@prisma/client": "^5.8.1",
24+
"@prisma/instrumentation": "^5.8.1",
2425
"@radix-ui/react-icons": "^1.3.2",
2526
"@radix-ui/react-toolbar": "^1.1.0",
2627
"@radix-ui/themes": "^3.1.3",
27-
"@sentry/nextjs": "8.36.0",
28+
"@sentry/nextjs": "9.0.0-alpha.0",
2829
"@spotlightjs/spotlight": "^2.1.1",
2930
"next": "15.1.2",
3031
"next-auth": "^4.24.5",
3132
"next-mdx-remote": "^4.4.1",
33+
"next-plausible": "^3.12.4",
3234
"nextjs-toploader": "^1.6.6",
3335
"nuqs": "^1.17.7",
3436
"prism-sentry": "^1.0.2",
@@ -66,4 +68,4 @@
6668
"@types/react": "npm:[email protected]",
6769
"@types/react-dom": "npm:[email protected]"
6870
}
69-
}
71+
}
Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
11
import * as Sentry from '@sentry/nextjs';
2+
import {PrismaInstrumentation} from '@prisma/instrumentation';
23

34
Sentry.init({
45
dsn: process.env.NEXT_PUBLIC_SENTRY_DSN,
56
tracesSampleRate: 1,
67
environment: process.env.NODE_ENV,
7-
integrations: [Sentry.prismaIntegration()],
8+
integrations: [
9+
Sentry.prismaIntegration({
10+
prismaInstrumentation: new PrismaInstrumentation(),
11+
}),
12+
],
813
spotlight: process.env.NODE_ENV === 'development',
914
});

apps/changelog/src/app/layout.tsx

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import {Theme} from '@radix-ui/themes';
44
import type {Metadata} from 'next';
55
import {Rubik} from 'next/font/google';
66
import Script from 'next/script';
7+
import PlausibleProvider from 'next-plausible';
78

89
const rubik = Rubik({
910
weight: ['400', '500', '700'],
@@ -33,17 +34,14 @@ export const metadata: Metadata = {
3334
export default function RootLayout({children}: {children: React.ReactNode}) {
3435
return (
3536
<html lang="en">
37+
<head>
38+
<PlausibleProvider domain="changelog.sentry.io" />
39+
</head>
3640
<body className={`${rubik.variable}`}>
3741
<Theme accentColor="iris" grayColor="sand" radius="large" scaling="95%">
3842
{children}
3943
</Theme>
4044
</body>
41-
<Script
42-
defer
43-
data-domain="docs.sentry.io,rollup.sentry.io"
44-
data-api="https://plausible.io/api/event"
45-
src="https://plausible.io/js/script.tagged-events.js"
46-
/>
4745
</html>
4846
);
4947
}

apps/changelog/src/instrumentation.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ export async function register() {
1010
}
1111
}
1212

13-
export const onRequestError = Sentry.experimental_captureRequestError;
13+
export const onRequestError = Sentry.captureRequestError;

develop-docs/application-architecture/dynamic-sampling/architecture.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ In this case, the matching will happen from **top to bottom** and the following
133133
1. Rule `1` is matched against the event payload, since it is of type `transaction`. The `samplingValue` is a `factor`, thus the accumulated factors will now be `2.0 * 1.0`, where `1.0` is the identity for the multiplication.
134134
2. Because rule `1` was a factor rule, the matching continues and rule `2` will be matched against the DSC, since it is of type `trace`. The `samplingValue` is a `sampleRate`, thus the matching will stop and the sample rate will be computed as `2.0 * 0.5 = 1.0`, where `2.0` is the factor accumulated from the previous rule and `0.5` is the sample rate of the current rule.
135135

136-
<Alert title="✨ Note" level="info">
136+
<Alert title="✨ Note">
137137

138138
It is important to note that a `sampleRate` rule must match in order for a sampling decision to be made; in case this condition is not met, the event will be kept. In practice, each project will have a uniform trace rule which will always match and contain the base sample rate of the organization.
139139

0 commit comments

Comments
 (0)