Skip to content

Commit d6b29d3

Browse files
authored
Merge branch 'master' into docs/self-hosted/reference-architecture
2 parents 16ca4dd + 08119d2 commit d6b29d3

File tree

1,252 files changed

+33046
-11181
lines changed

Some content is hidden

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

1,252 files changed

+33046
-11181
lines changed

.babelrc.js.bak

Lines changed: 0 additions & 16 deletions
This file was deleted.

.env.example

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@
55

66
NEXT_PUBLIC_ALGOLIA_APP_ID=
77
NEXT_PUBLIC_ALGOLIA_SEARCH_KEY=
8+
NEXT_PUBLIC_SENTRY_DSN=

.github/workflows/lint-404s.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,13 @@ jobs:
3232
- uses: actions/cache@v4
3333
id: cache
3434
with:
35-
path: ${{ github.workspace }}/node_modules
35+
path: |
36+
${{ github.workspace }}/node_modules
37+
${{ github.workspace }}/.next/cache
38+
${{ github.workspace }}/.eslintcache
3639
key: node-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
40+
restore-keys: |
41+
node-${{ runner.os }}-
3742
3843
- run: yarn install --frozen-lockfile
3944
if: steps.cache.outputs.cache-hit != 'true'

.github/workflows/test.yml

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,23 @@ jobs:
2929
- uses: actions/cache@v4
3030
id: cache
3131
with:
32-
path: ${{ github.workspace }}/node_modules
32+
path: |
33+
${{ github.workspace }}/node_modules
34+
${{ github.workspace }}/.next/cache
35+
${{ github.workspace }}/.eslintcache
3336
key: node-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
37+
restore-keys: |
38+
node-${{ runner.os }}-
39+
3440
- run: yarn install --frozen-lockfile
3541
if: steps.cache.outputs.cache-hit != 'true'
3642

3743
# Additional checks
3844
- run: yarn lint:ts
39-
- run: yarn lint:docs
4045

4146
# Run automatic fixes (run prettier apart from eslint to also fix mdx files)
4247
- run: yarn lint:prettier:fix
43-
- run: yarn lint:eslint:fix
48+
- run: yarn lint:eslint:fix --cache
4449

4550
# Check (and error) for dirty working tree for forks
4651
# Reason being we need a different token to auto commit changes and
@@ -69,8 +74,14 @@ jobs:
6974
- uses: actions/cache@v4
7075
id: cache
7176
with:
72-
path: ${{ github.workspace }}/node_modules
77+
path: |
78+
${{ github.workspace }}/node_modules
79+
${{ github.workspace }}/.next/cache
80+
${{ github.workspace }}/.eslintcache
7381
key: node-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
82+
restore-keys: |
83+
node-${{ runner.os }}-
84+
7485
- run: yarn install --frozen-lockfile
7586
if: steps.cache.outputs.cache-hit != 'true'
7687
- name: Run Tests

.gitignore

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ npm-debug.log*
44
yarn-debug.log*
55
yarn-error.log*
66

7-
# Ignore generated export markdown files
8-
/public/md-exports/
9-
107
# Runtime data
118
pids
129
*.pid
@@ -53,9 +50,10 @@ typings/
5350
# Output of 'npm pack'
5451
*.tgz
5552

56-
# dotenv environment variables file
53+
# dotenv environment variables files
5754
.env
58-
.env.development
55+
.env.*
56+
!.env.example
5957

6058
# gatsby files
6159
.cache/
@@ -96,6 +94,8 @@ public/page-data
9694
# tsbuildinfo file generated by CI
9795
tsconfig.tsbuildinfo
9896

97+
# Ignore generated files
98+
/public/md-exports/
9999
public/mdx-images/*
100100

101101
# yalc

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,12 @@ export const dynamic = 'force-static';
4747
const mdxComponentsWithWrapper = mdxComponents(
4848
{Include, PlatformContent},
4949
({children, frontMatter, nextPage, previousPage}) => (
50-
<DocPage frontMatter={frontMatter} nextPage={nextPage} previousPage={previousPage}>
50+
<DocPage
51+
frontMatter={frontMatter}
52+
nextPage={nextPage}
53+
previousPage={previousPage}
54+
fullWidth={frontMatter.fullWidth}
55+
>
5156
{children}
5257
</DocPage>
5358
)
@@ -199,10 +204,10 @@ export async function generateMetadata(props: MetadataProps): Promise<Metadata>
199204
? `https://${process.env.VERCEL_URL}`
200205
: domain;
201206
let title =
202-
'Sentry Docs | Application Performance Monitoring &amp; Error Tracking Software';
207+
'Sentry Docs | Application Performance Monitoring & Error Tracking Software';
203208
let customCanonicalTag: string = '';
204209
let description =
205-
'Self-hosted and cloud-based application performance monitoring &amp; error tracking that helps software teams see clearer, solve quicker, &amp; learn continuously.';
210+
'Self-hosted and cloud-based application performance monitoring & error tracking that helps software teams see clearer, solve quicker, and learn continuously.';
206211
// show og image on the home page only
207212
const images =
208213
((await props.params).path ?? []).length === 0

app/globals.css

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,3 +165,18 @@ body {
165165
{
166166
color: rgb(134, 142, 150) !important;
167167
}
168+
169+
/* CSS Counters for Onboarding Steps */
170+
.onboarding-steps {
171+
counter-reset: onboarding-step;
172+
}
173+
174+
.onboarding-step {
175+
counter-increment: onboarding-step;
176+
}
177+
178+
.onboarding-step .step-heading::before,
179+
.onboarding-step h2::before {
180+
content: 'Step ' counter(onboarding-step) ': ';
181+
font-weight: inherit;
182+
}

app/sitemap.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {getDevDocsFrontMatter, getDocsFrontMatter} from 'sentry-docs/mdx';
55

66
export default async function sitemap(): Promise<MetadataRoute.Sitemap> {
77
if (isDeveloperDocs) {
8-
const docs = getDevDocsFrontMatter();
8+
const docs = await getDevDocsFrontMatter();
99
const baseUrl = 'https://develop.sentry.dev';
1010
return docsToSitemap(docs, baseUrl);
1111
}

bin/lint-docs.ts

Lines changed: 0 additions & 6 deletions
This file was deleted.

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,18 @@ An example of rule encoded in JSON is the following:
5252
}
5353
```
5454

55+
<Alert title="✨ Note">
56+
Dynamic sampling rules must always include a `condition` field, otherwise the entire dynamic sampling ruleset will be ignored by Relay. If you want a rule to match every event, set the condition as follows:
57+
```json
58+
{
59+
"condition": {
60+
"inner": [],
61+
"op": "and"
62+
}
63+
}
64+
```
65+
</Alert>
66+
5567
#### Fetching the Sampling Configuration
5668

5769
The sampling configuration is fetched by Relay from Sentry in a pull fashion. This is done by sending a request to the `/api/0/relays/projectconfigs/` endpoint periodically (defined [here](https://github.com/getsentry/sentry/blob/master/src/sentry/api/endpoints/relay/project_configs.py#L34-L34)).

0 commit comments

Comments
 (0)