Skip to content

Commit f5055ca

Browse files
authored
Merge branch 'master' into troubleshoot/flutter-desktop
2 parents 0a2ecac + 65a3fcb commit f5055ca

File tree

1,027 files changed

+25589
-12489
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,027 files changed

+25589
-12489
lines changed

.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=

.gitignore

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,10 @@ typings/
5050
# Output of 'npm pack'
5151
*.tgz
5252

53-
# dotenv environment variables file
53+
# dotenv environment variables files
5454
.env
55-
.env.development
55+
.env.*
56+
!.env.example
5657

5758
# gatsby files
5859
.cache/

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

Lines changed: 6 additions & 1 deletion
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
)

app/globals.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,6 @@ body {
177177

178178
.onboarding-step .step-heading::before,
179179
.onboarding-step h2::before {
180-
content: "Step " counter(onboarding-step) ": ";
180+
content: 'Step ' counter(onboarding-step) ': ';
181181
font-weight: inherit;
182182
}

develop-docs/backend/application-domains/asynchronous-workers.mdx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@ title: Asynchronous Workers
33
sidebar_order: 70
44
---
55

6+
<Alert level="warning" title="Deprecated">
7+
Celery workers are deprecated, and will be removed as of the 25.10.x self-hosted
8+
release.
9+
</Alert>
10+
611
Sentry comes with a built-in queue to process tasks in a more asynchronous fashion. For example when an event comes in instead of writing it to the database immediately, it sends a job to the queue so that the request can be returned right away, and the background workers handle actually saving that data.
712

813
Sentry relies on the [Celery](https://docs.celeryproject.org/) library for managing workers.
@@ -75,7 +80,7 @@ There are a few important points:
7580
because this is what registers the task by name. Thus every module
7681
containing a task must be added to the `CELERY_IMPORTS` and `TASKWORKER_IMPORTS` settings in
7782
`src/sentry/conf/server.py`.
78-
83+
7984
We have a separate setting for the Taskbroker workers until we fully deprecate the Celery workers.
8085

8186
## Running a Worker

develop-docs/backend/application-domains/pii/index.mdx

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -68,39 +68,6 @@ some SDK. Go to our PII config editor [Piinguin], and:
6868
3. Paste in other payloads and see if they look fine, go to step **2** if
6969
necessary.
7070

71-
After iterating on the config, paste it back into the project config located at
72-
`.relay/projects/<PROJECT_ID>.json`
73-
74-
For example:
75-
76-
```json
77-
{
78-
"publicKeys": [
79-
{
80-
"publicKey": "___PUBLIC_KEY___",
81-
"isEnabled": true
82-
}
83-
],
84-
"config": {
85-
"allowedDomains": ["*"],
86-
"piiConfig": {
87-
"rules": {
88-
"device_id": {
89-
"type": "pattern",
90-
"pattern": "d/[a-f0-9]{12}",
91-
"redaction": {
92-
"method": "hash"
93-
}
94-
}
95-
},
96-
"applications": {
97-
"freeform": ["device_id"]
98-
}
99-
}
100-
}
101-
}
102-
```
103-
10471
[advanced data scrubbing]: https://docs.sentry.io/product/data-management-settings/scrubbing/advanced-datascrubbing/
10572
[relay]: https://github.com/getsentry/relay
10673
[piinguin]: https://getsentry.github.io/piinguin

0 commit comments

Comments
 (0)