Skip to content

Commit 662ae57

Browse files
committed
Merge branch 'master' into smarter-search
2 parents 9efd110 + 6f5fbf8 commit 662ae57

File tree

726 files changed

+2942
-2268
lines changed

Some content is hidden

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

726 files changed

+2942
-2268
lines changed

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,8 @@ export async function generateMetadata(props: MetadataProps): Promise<Metadata>
209209
? [{url: `${previewDomain ?? domain}/og.png`, width: 1200, height: 630}]
210210
: [];
211211

212+
let noindex: undefined | boolean = undefined;
213+
212214
const rootNode = await getDocsRootNode();
213215

214216
if (params.path) {
@@ -227,6 +229,8 @@ export async function generateMetadata(props: MetadataProps): Promise<Metadata>
227229
if (pageNode.frontmatter.customCanonicalTag) {
228230
customCanonicalTag = formatCanonicalTag(pageNode.frontmatter.customCanonicalTag);
229231
}
232+
233+
noindex = pageNode.frontmatter.noindex;
230234
}
231235
}
232236

@@ -253,5 +257,6 @@ export async function generateMetadata(props: MetadataProps): Promise<Metadata>
253257
alternates: {
254258
canonical,
255259
},
260+
robots: noindex ? 'noindex' : undefined,
256261
};
257262
}

develop-docs/application-architecture/feedback-architecture.mdx

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ the [User Feedback Widget](https://docs.sentry.io/product/user-feedback/#user-fe
2121
to the JavaScript SDK. It allows adding more information, for example tags,
2222
release, url, etc.
2323

24-
`USER_REPORT_ENVELOPE`: [The older format](/sdk/data-model/envelope-items/#user-report) with name/email/comments, that requires
24+
`USER_REPORT_ENVELOPE`: [The older format](/sdk/data-model/envelope-items/#user-report---deprecated) with name/email/comments, that requires
2525
`event_id` to link a Sentry error event.
2626

2727
`USER_REPORT_DJANGO_ENDPOINT`: [The deprecated Web API](https://docs.sentry.io/api/projects/submit-user-feedback/)
@@ -186,7 +186,7 @@ graph TD
186186

187187
### Envelopes
188188

189-
User reports are also sent to Relay in envelope format, item type [user_report](/sdk/data-model/envelope-items/#user-report).
189+
User reports are also sent to Relay in envelope format, item type [user_report](/sdk/data-model/envelope-items/#user-report---deprecated).
190190

191191
The SDK function that sends these is `captureUserFeedback`.
192192

@@ -231,10 +231,9 @@ graph TD
231231
232232
subgraph Sentry
233233
issues_endpoint["/issues"]
234-
issues_endpoint --> |"GET"| ui["Feedback UI (/feedback)"]
234+
issues_endpoint --> |"GET"| feedback_ui["Feedback UI (/feedback)"]
235235
report_endpoint["/user-feedback"]
236-
report_endpoint --> |"GET"| report_ui["Issue Details UI > User Feedback"]
237-
issues_endpoint --> |"GET"| report_ui
236+
report_endpoint --> |"GET"| issues_ui["Issue Details UI > User Feedback"]
238237
end
239238
240239
postgres --> |"queries"| report_endpoint

develop-docs/getting-started/index.mdx

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,10 @@ description: This documentation serves as reference points for developing agains
44
sidebar_order: 1
55
---
66

7-
## Getting Started
7+
We recommend going through the [engineering practices](/engineering-practices) and our [development philsophy](/getting-started/philosophy/) before contributing a change to Sentry.
88

9-
We recommend going through the general documentation before contributing a change to Sentry.
109

11-
- <Link to="/getting-started/philosophy/">Development Philosophy</Link> (and <Link to="/sdk/philosophy/">SDK Development Philosophy</Link>)
12-
- <Link to="/development/commit-messages/">Commit Messages</Link>
13-
- <Link to="/development/code-review/">Code Review</Link>
14-
- <Link to="/development/environment/">Environment</Link>
15-
- <Link to="/development/workflow/">Workflow</Link>
16-
- <Link to="/application/architecture/">Application Architecture</Link>
10+
<DevDocsCardGrid />
11+
1712

1813
You can also take a glance at the [Sentry Dockerfile](https://github.com/getsentry/sentry/blob/master/self-hosted/Dockerfile) for more information on how the Sentry server is configured, including its system dependencies.

develop-docs/ingestion/relay/transaction-span-ratelimits.mdx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,19 +69,19 @@ Relay stage: customer managed, PoP-Relay or Processing-Relay. Until spans are ex
6969
should count the contained spans and generate an outcome with the contained span quantity + 1, for the segment span
7070
which would be generated from the transaction itself.
7171

72-
<Note>
72+
<Alert>
7373
While it is desirable to have span counts correctly extracted from dropped transactions, it may not be feasible
7474
to do so at any stage of the processing pipeline. For example, it may not be possible to do so (malformed transactions)
7575
or simply too expensive to compute.
76-
</Note>
76+
</Alert>
7777

7878
After spans have been extracted, the transaction is no longer a container of span items and just represents itself,
7979
thus, a dropped transaction with spans already extracted only generates outcomes for the total transactions and
8080
indexed transaction categories.
8181

82-
<Note>
82+
<Alert>
8383
Span quotas are equivalent to transactions quotas, so all the above also applies for a span quota.
84-
</Note>
84+
</Alert>
8585

8686

8787
## Examples

develop-docs/integrations/azuredevops/index.mdx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ When configuring the app, use the following values:
2525
| Supported account types | Accounts in any organizational directory |
2626
| Redirect URI | `{YOUR_DOMAIN}/extensions/vsts/setup` |
2727

28-
<Note>
28+
<Alert>
2929

3030
Take note of your App ID as we'll need it later.
3131
![App ID](./app-id.png)
3232

33-
</Note>
33+
</Alert>
3434

3535
Next go to Manager -> API Permissions to add the following permissions:
3636
* Azure DevOps (`vso.code`, `vso.graph`, `vso.work_item`, `vso.service_endpoint`)

develop-docs/integrations/bitbucket.mdx

Lines changed: 0 additions & 12 deletions
This file was deleted.
11 KB
Loading
34.6 KB
Loading
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
---
2+
title: Bitbucket Integration
3+
sidebar_title: Bitbucket
4+
---
5+
6+
## Prerequisites
7+
8+
#### Create a Bitbucket "product"
9+
10+
To use Sentry’s Bitbucket integration you’ll need to create a Bitbucket "product" if you don’t already have one.
11+
12+
Go to [Bitbucket's Admin Console](http://admin.atlassian.com/) and click on __Add Product__. and select __Bitbucket__. Name your Bitbucket instance and click __Create__.
13+
14+
![Add Product](./add-product.png)
15+
16+
#### Create a Bitbucket Repo
17+
18+
Next, you'll need to create a Bitbucket repository. Click on __Create repository__ and fill in the details. You should now see your new repository in the list of repositories.
19+
20+
![Create Repository](./create-repo.png)
21+
22+
23+
## Create a Bitbucket App
24+
25+
To use Sentry’s Bitbucket integration you’ll need to create a Bitbucket app. Navigate to [Bitbucket Apps](https://bitbucket.org/account/user/apps/create) and click __Create__.
26+
Ensure [developer mode](https://support.atlassian.com/bitbucket-cloud/docs/enable-bitbucket-cloud-development-mode/) is enabled in your Atlassian account.
27+
28+
29+
Follow our [documentation on configuring the Bitbucket integration](https://docs.sentry.io/product/integrations/bitbucket/#configure) to use the integration.

develop-docs/integrations/github.mdx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ sidebar_title: GitHub
55

66
## Create a GitHub App
77

8-
To configure the GitHub integration you'll need to create a GitHub app and obtain credentials.
8+
To configure the GitHub integration you'll need to create a GitHub app and obtain credentials. Installation will fail if your Github App's name contains spaces.
99

1010
<Alert level="warning">
11-
The GitHub Org Slug must not contain any spaces.
11+
The GitHub App name and GitHub Org Slug must not contain any spaces.
1212
</Alert>
1313

1414
<CreateGitHubAppForm url="https://github.com/organizations/:org/settings/apps/new?name=:org-Sentry-Integration&public=false&members=read&emails=read&administration=read&contents=read&issues=write&pull_requests=write&repository_hooks=write&url=:url-prefix&callback_url=:url-prefix%2Fauth%2Fsso%2F&setup_url=:url-prefix%2Fextensions%2Fgithub%2Fsetup%2F&webhook_url=:url-prefix%2Fextensions%2Fgithub%2Fwebhook%2F&events[]=push&events[]=pull_request&webhook_active=true" defaultOrg="your-organization" defaultUrlPrefix="https://your-sentry-url-prefix.com" />

0 commit comments

Comments
 (0)