Skip to content

Commit 33e5027

Browse files
author
Karl Heinz Struggl
committed
Merge branch 'master' into kahest/platforms-note-multiple-apm
2 parents 96b982c + df405f2 commit 33e5027

File tree

60 files changed

+457
-720
lines changed

Some content is hidden

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

60 files changed

+457
-720
lines changed

develop-docs/application/architecture.mdx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Edges represent service dependencies.
1010
```mermaid
1111
graph TD
1212
app[Your Application] --> |SDK| lb{{Load Balancer}}
13-
lb --> |"sentry.example.com/api/\d+/store/"| relay
13+
lb --> |"sentry.example.com/api/0/envelope/"| relay
1414
lb --> |"sentry.example.com"| sentry_web["Sentry (web)"]
1515
symbolicator --> sentry_web
1616
relay --> kafka
@@ -50,7 +50,7 @@ For more information read [Path of an event through Relay](https://getsentry.git
5050
```mermaid
5151
graph TD
5252
app[Your application] --> |sends crashes| lb{{nginx}}
53-
lb --> |/api/n/store/| relay
53+
lb --> |/api/0/envelope/| relay
5454
relay --> kafka[(Ingest Kafka)]
5555
kafka --> ingest-consumer["Sentry ingest consumer"]
5656
ingest-consumer --> preprocess-event

develop-docs/development/environment/index.mdx

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -288,3 +288,9 @@ docker ps
288288
**Problem:** You use an Android emulator with a DSN pointing to localhost, and the events don't show up in your local Sentry instance.
289289

290290
**Solution:** Change `localhost` to `10.0.2.2`. So, for example, change http://d895df97e1cb4a33b4dff8af3e78da09@localhost:8000/2 to http://[email protected]:8000/2. This is because localhost or `127.0.0.1` refers to the emulator's own loopback interface, not the loopback interface of the host machine. For more information see https://developer.android.com/studio/run/emulator-networking.
291+
292+
---
293+
294+
**Problem:** Switching from Docker Desktop to Colima results in error `Failed to start service: Credentials store error: StoreError('docker-credential-desktop not installed or not available in PATH')`
295+
296+
**Solution:** Remove the `credsStore` key in your `~/.docker/config.json` file.

docs/concepts/data-management/event-grouping/index.mdx

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -80,19 +80,7 @@ Stack trace rules can work as a combination of both SDK and project settings. As
8080

8181
You can see a fingerprint by opening an issue, clicking "{} View JSON", and finding the _fingerprint_ property in that file. If the default grouping was used, you'll see "default" written there. If a different grouping was used, you'll see the actual fingerprint value itself.
8282

83-
<div style={{"height":"0px","paddingBottom":"calc(56.88524590163935% + 41px)","position":"relative","width":"100%"}}>
84-
<iframe
85-
src="https://demo.arcade.software/8vE2p1OF0WRxjg7XN8HH?embed"
86-
frameborder="0"
87-
loading="lazy"
88-
webkitallowfullscreen
89-
mozallowfullscreen
90-
allowfullscreen
91-
allow="fullscreen;"
92-
style={{"colorScheme":"light","height":"100%","left":"0px","position":"absolute","top":"0px","width":"100%"}}
93-
title="View Issue Fingerprint"
94-
></iframe>
95-
</div>
83+
<Arcade src="https://demo.arcade.software/8vE2p1OF0WRxjg7XN8HH?embed" />
9684

9785
## Transaction Grouping Algorithms
9886

docs/concepts/key-terms/environments/index.mdx

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,4 @@ If a project is hidden, you won't see that environment in the environment select
4040

4141
Follow along with the interactive demo below to see how to hide and unhide environments.
4242

43-
<div style={{"height":"0px","paddingBottom":"calc(66.5403% + 41px)","position":"relative","width":"100%"}}>
44-
<iframe
45-
src="https://demo.arcade.software/GqXUGJBjoH5fOG5AMyLt?embed"
46-
frameborder="0"
47-
loading="lazy"
48-
webkitallowfullscreen
49-
mozallowfullscreen
50-
allowfullscreen
51-
allow="fullscreen;"
52-
style={{"colorScheme":"light","height":"100%","left":"0px","position":"absolute","top":"0px","width":"100%"}}
53-
title="Environments - Hide/show"
54-
></iframe>
55-
</div>
43+
<Arcade src="https://demo.arcade.software/GqXUGJBjoH5fOG5AMyLt?embed" />

docs/concepts/key-terms/tracing/trace-view.mdx

Lines changed: 2 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ By default, the waterfall view shows a list of transactions. If you need more gr
3030
>
3131
<iframe
3232
src="https://demo.arcade.software/25H9paIDvBOQp5T3pFeW?embed&show_copy_link=true"
33-
title="Trace View — Performance — sentry — Sentry"
3433
frameborder="0"
3534
loading="lazy"
3635
webkitallowfullscreen
@@ -45,7 +44,6 @@ By default, the waterfall view shows a list of transactions. If you need more gr
4544
top: "0px",
4645
width: "100%",
4746
}}
48-
title="Trace View -> Error"
4947
></iframe>
5048
</div>
5149

@@ -59,68 +57,14 @@ Whatever you highlight will also be saved if you navigate away from the page and
5957
If you're doing a comparison and want an easy way to go back and forth between highlighted areas of interest in your trace, you can pin the tabs. When a tab is pinned, the view will be persistent throughout your session.
6058

6159
<br />
62-
<div
63-
style={{
64-
height: "0px",
65-
paddingBottom: "calc(66.66% + 41px)",
66-
position: "relative",
67-
width: "100%",
68-
}}
69-
>
70-
<iframe
71-
src="https://demo.arcade.software/yP3PFytK0ckfetjJTe52?embed&show_copy_link=true"
72-
title="Sentry"
73-
frameborder="0"
74-
loading="lazy"
75-
webkitallowfullscreen
76-
mozallowfullscreen
77-
allowfullscreen
78-
allow="clipboard-write; fullscreen;"
79-
style={{
80-
colorScheme: "light",
81-
height: "100%",
82-
left: "0px",
83-
position: "absolute",
84-
top: "0px",
85-
width: "100%",
86-
}}
87-
title="Trace View - Tabbing"
88-
></iframe>
89-
</div>
60+
<Arcade src="https://demo.arcade.software/yP3PFytK0ckfetjJTe52?embed&show_copy_link=true" />
9061
<br />
9162
Sometimes, duration gaps between entries can be small, but critical to your debugging
9263
effort. That's why the Trace View enables you to zoom into certain areas of the trace,
9364
either by double clicking on row elements (which zooms into the row) or by using
9465
your scroll wheel.
9566
<br />
96-
<div
97-
style={{
98-
height: "0px",
99-
paddingBottom: "calc(66.66% + 41px)",
100-
position: "relative",
101-
width: "100%",
102-
}}
103-
>
104-
<iframe
105-
src="https://demo.arcade.software/U8JbMjFJR1KRiP4G4j4E?embed&show_copy_link=true"
106-
title="Trace View — Performance — sentry — Sentry"
107-
frameborder="0"
108-
loading="lazy"
109-
webkitallowfullscreen
110-
mozallowfullscreen
111-
allowfullscreen
112-
allow="clipboard-write; fullscreen;"
113-
style={{
114-
colorScheme: "light",
115-
height: "100%",
116-
left: "0px",
117-
position: "absolute",
118-
top: "0px",
119-
width: "100%",
120-
}}
121-
title="Trace View - Zooming"
122-
></iframe>
123-
</div>
67+
<Arcade src="https://demo.arcade.software/U8JbMjFJR1KRiP4G4j4E?embed&show_copy_link=true" />
12468
<br />
12569
The Trace View has other features like search, which makes it easy to visualize matching
12670
spans that you can then iterate over using the up or down arrows. You can also tailor

docs/contributing/pages/components.mdx

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,18 @@ An Alert component with no level setting will render as a Note component.
3838

3939
See also the [Note component](#note).
4040

41+
## Arcade embeds
42+
43+
Render an [Arcade](https://arcade.software) embed.
44+
<Arcade src="https://demo.arcade.software/v7uhzmdV6Q5PDzoVPAE6?embed&show_copy_link=true" />
45+
```markdown {tabTitle:Example}
46+
<Arcade src="https://demo.arcade.software/v7uhzmdV6Q5PDzoVPAE6?embed&show_copy_link=true" />
47+
```
48+
49+
Attributes:
50+
51+
- `src` (string) - the URL of the Arcade embed
52+
4153
## Expandable
4254

4355
Render an expandable section.

docs/organization/early-adopter-features/index.mdx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,4 @@ Limitations:
2222
- [Span Summary](/product/performance/transaction-summary/#span-summary)
2323
- [Investigation Mode](/product/performance/retention-priorities/#investigation-mode) for retention priorities in Tracing
2424
- [Uptime Monitoring](/product/alerts/uptime-monitoring/)
25+
- [Dynamic Alerts](/product/alerts/create-alerts/metric-alert-config/#dynamic-alerts)

docs/organization/integrations/integration-platform/index.mdx

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -37,19 +37,7 @@ The Sentry integration platform provides the ability to add rich UI components t
3737
You can make any integration available as an action in [issue alerts](/organization/integrations/integration-platform/webhooks/issue-alerts) and [metric alerts](/organization/integrations/integration-platform/webhooks/metric-alerts) by enabling the "Alert Rule Action" toggle. The integration will then show
3838
up as a service in the action section when creating or updating an alert rule. The interactive demo below shows how to set up an integration that can receive Sentry alerts.
3939

40-
<div style={{"height":"0px","paddingBottom":"calc(56.88524590163935% + 41px)","position":"relative","width":"100%"}}>
41-
<iframe
42-
src="https://demo.arcade.software/v7uhzmdV6Q5PDzoVPAE6?embed&show_copy_link=true"
43-
frameborder="0"
44-
loading="lazy"
45-
webkitallowfullscreen
46-
mozallowfullscreen
47-
allowfullscreen
48-
allow="fullscreen;"
49-
style={{"colorScheme":"light","height":"100%","left":"0px","position":"absolute","top":"0px","width":"100%"}}
50-
title="Create Internal Integration &amp; Alert Rule"
51-
></iframe>
52-
</div>
40+
<Arcade src="https://demo.arcade.software/v7uhzmdV6Q5PDzoVPAE6?embed&show_copy_link=true" />
5341

5442
For your service to receive webhooks for alert rules, you must have `Send a notification via <your integration>` as an action in the rule. Once that's set up, you'll start receiving webhook requests for triggered alerts. For more information about the request and payload, check out the [full Webhooks documentation](/organization/integrations/integration-platform/webhooks/). If you'd like users to provide more app-specific information to handle these webhooks (e.g. assignees, teams, notification channels), consider implementing the [alert rule action UI component](/organization/integrations/integration-platform/ui-components/alert-rule-action).
5543

docs/organization/integrations/integration-platform/webhooks/issue-alerts.mdx

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,7 @@ Sentry integrations which have been made available as [alert rule actions](/orga
88

99
The interactive demo below shows how to set up an internal integration that can receive issue alerts.
1010

11-
<div style={{"height":"0px","paddingBottom":"calc(56.88524590163935% + 41px)","position":"relative","width":"100%"}}>
12-
<iframe
13-
src="https://demo.arcade.software/v7uhzmdV6Q5PDzoVPAE6?embed&show_copy_link=true"
14-
frameborder="0"
15-
loading="lazy"
16-
webkitallowfullscreen
17-
mozallowfullscreen
18-
allowfullscreen
19-
allow="fullscreen;"
20-
style={{"colorScheme":"light","height":"100%","left":"0px","position":"absolute","top":"0px","width":"100%"}}
21-
title="Create Internal Integration &amp; Alert Rule"
22-
></iframe>
23-
</div>
11+
<Arcade src="https://demo.arcade.software/v7uhzmdV6Q5PDzoVPAE6?embed&show_copy_link=true" />
2412

2513
## Sentry-Hook-Resource Header
2614

docs/organization/integrations/integration-platform/webhooks/metric-alerts.mdx

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,7 @@ Sentry integrations which have been made available as [alert rule actions](/orga
88

99
The interactive demo below shows how to set up an internal integration that can receive Sentry alerts.
1010

11-
<div style={{"height":"0px","paddingBottom":"calc(56.88524590163935% + 41px)","position":"relative","width":"100%"}}>
12-
<iframe
13-
src="https://demo.arcade.software/v7uhzmdV6Q5PDzoVPAE6?embed&show_copy_link=true"
14-
frameborder="0"
15-
loading="lazy"
16-
webkitallowfullscreen
17-
mozallowfullscreen
18-
allowfullscreen
19-
allow="fullscreen;"
20-
style={{"colorScheme":"light","height":"100%","left":"0px","position":"absolute","top":"0px","width":"100%"}}
21-
title="Create Internal Integration &amp; Alert Rule"
22-
></iframe>
23-
</div>
11+
<Arcade src="https://demo.arcade.software/v7uhzmdV6Q5PDzoVPAE6?embed&show_copy_link=true" />
2412

2513
## Sentry-Hook-Resource Header
2614

0 commit comments

Comments
 (0)