Skip to content

Commit 775d988

Browse files
philipphofmannphilipphofmann
committed
Merge branch 'master' into feat/batch-processor
2 parents bb43046 + 8508561 commit 775d988

File tree

61 files changed

+738
-745
lines changed

Some content is hidden

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

61 files changed

+738
-745
lines changed

‎develop-docs/sdk/data-model/event-payloads/contexts.mdx‎

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -674,30 +674,6 @@ Additional information that allows Sentry to connect multiple transactions, span
674674
| `data_loss` | Unrecoverable data loss or corruption | 500 |
675675
| `unauthenticated` | The requester doesn't have valid authentication credentials for the operation | 401 |
676676

677-
`exclusive_time`
678-
679-
: _Optional_. The amount of time in milliseconds spent in this transaction span, excluding its immediate child spans.
680-
681-
- Example: `1.035`
682-
683-
`client_sample_rate`
684-
685-
: _Optional_. The client-side sample rate.
686-
687-
- Example: `0.1`
688-
689-
`tags`
690-
691-
: _Optional_. A map or list of tags for this event. Each tag must be less than 200 characters.
692-
693-
- Example: `{ "deviceMemory": "8 GB", "effectiveConnectionType": "4g", "routing.instrumentation": "react-router-v3" }`
694-
695-
`dynamic_sampling_context`
696-
697-
: _Optional_. The [Dynamic Sampling Context](/sdk/performance/dynamic-sampling-context/).
698-
699-
- Example: `{ "trace_id": "12312012123120121231201212312012", "sample_rate": "1.0", "public_key": "93D0D1125146288EAEE2A9B3AF4F96CCBE3CB316" },`
700-
701677
`origin`
702678

703679
: _Optional_. The origin of the trace indicates what created the trace. For more details, see [trace origin](/sdk/performance/trace-origin/).
@@ -731,16 +707,6 @@ If the route is set to a string (e.g. `"route": "foo"`), it will be normalized i
731707
"parent_span_id": null,
732708
"description": "<OrganizationContext>",
733709
"op": "http.server",
734-
"tags": {
735-
"deviceMemory": "8 GB",
736-
"effectiveConnectionType": "4g",
737-
"routing.instrumentation": "react-router-v3"
738-
},
739-
"dynamic_sampling_context": {
740-
"trace_id": "12312012123120121231201212312012",
741-
"sample_rate": "1.0",
742-
"public_key": "93D0D1125146288EAEE2A9B3AF4F96CCBE3CB316"
743-
},
744710
"origin": "auto.http.http_client_5",
745711
"data": {
746712
"route": {

‎develop-docs/sdk/telemetry/traces/trace-propagation-cheat-sheet.mdx‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
---
2+
title: Trace Propagation Cheat Sheet
3+
---
4+
5+
This is a cheat sheet where you can see how the trace propagation work in SDKs in different scenarios.
6+
7+
| SCENARIO:<br/>Incoming trace in `sentry-trace/baggage` headers | SCENARIO:<br/>Incoming sampled flag in `sentry-trace/baggage` header | SCENARIO:<br/>`traces_propagation_targets` are matching? | SCENARIO:<br/>`traces_sample_rate` setting | OUTCOME:<br/>Send Spans to Sentry? | OUTCOME:<br/>Outgoing Requests Have Trace? (`sentry-trace/baggage` are present) | OUTCOME:<br/>Continue Incoming Trace? (outgoing `trace_id` is the incoming `trace_id`) |
8+
| -------------------------------------------------------------- | :------------------------------------------------------------------: | :------------------------------------------------------: | :----------------------------------------: | :--------------------------------: | :-----------------------------------------------------------------------------: | :------------------------------------------------------------------------------------: |
9+
| not present | - | yes | null | no | yes | - |
10+
| not present | - | yes | 0 | no | yes | - |
11+
| not present | - | yes | 1 | yes | yes | - |
12+
| -------------------- | -------------------- | -------------------- | -------------------- | -------------------- | -------------------- | -------------------- |
13+
| not present | - | no | null | no | no | - |
14+
| not present | - | no | 0 | no | no | - |
15+
| not present | - | no | 1 | yes | no | - |
16+
| -------------------- | -------------------- | -------------------- | -------------------- | -------------------- | -------------------- | -------------------- |
17+
| present | empty (deferred) | yes | null | no | yes | yes |
18+
| present | empty (deferred) | yes | 0 | no | yes | yes |
19+
| present | empty (deferred) | yes | 1 | yes | yes | yes |
20+
| -------------------- | -------------------- | -------------------- | -------------------- | -------------------- | -------------------- | -------------------- |
21+
| present | 1 | yes | null | no | yes | yes |
22+
| present | 1 | yes | 0 | yes | yes | yes |
23+
| present | 1 | yes | 1 | yes | yes | yes |
24+
| -------------------- | -------------------- | -------------------- | -------------------- | -------------------- | -------------------- | -------------------- |
25+
| present | 0 | yes | null | no | yes | yes |
26+
| present | 0 | yes | 0 | no | yes | yes |
27+
| present | 0 | yes | 1 | no | yes | yes |
28+
| -------------------- | -------------------- | -------------------- | -------------------- | -------------------- | -------------------- | -------------------- |
29+
| present | empty (deferred) | no | null | no | no | - |
30+
| present | empty (deferred) | no | 0 | no | no | - |
31+
| present | empty (deferred) | no | 1 | yes | no | - |
32+
| -------------------- | -------------------- | -------------------- | -------------------- | -------------------- | -------------------- | -------------------- |
33+
| present | 1 | no | null | no | no | - |
34+
| present | 1 | no | 0 | yes | no | - |
35+
| present | 1 | no | 1 | yes | no | - |
36+
| -------------------- | -------------------- | -------------------- | -------------------- | -------------------- | -------------------- | -------------------- |
37+
| present | 0 | no | null | no | no | - |
38+
| present | 0 | no | 0 | no | no | - |
39+
| present | 0 | no | 1 | no | no | - |

‎docs/platforms/android/index.mdx‎

Lines changed: 40 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,50 @@ Select which Sentry features you'd like to install in addition to Error Monitori
4747

4848
Sentry captures data by using an SDK within your application's runtime. These are platform-specific and allow Sentry to have a deep understanding of how your application works.
4949

50-
We recommend installing the SDK through our [Sentry Wizard](https://github.com/getsentry/sentry-wizard) by running the following command inside your project directory:
50+
We recommend installing the SDK through our [Sentry Wizard](https://github.com/getsentry/sentry-wizard) by running one of the following commands inside your project directory:
5151

52-
```bash
52+
```bash {tabTitle:brew}
5353
brew install getsentry/tools/sentry-wizard && sentry-wizard -i android
5454
```
5555

56+
```bash {tabTitle:npx}
57+
npx @sentry/wizard@latest -i android
58+
```
59+
60+
```bash {tabTitle:macOS (Intel/x64)}
61+
downloadUrl="https://github.com/getsentry/sentry-wizard/releases/download/v4.0.1/sentry-wizard-darwin-x64"
62+
curl -L $downloadUrl -o sentry-wizard
63+
chmod +x sentry-wizard
64+
./sentry-wizard -i android
65+
```
66+
67+
```bash {tabTitle:macOS (Apple Silicon/arm64)}
68+
downloadUrl="https://github.com/getsentry/sentry-wizard/releases/download/v4.0.1/sentry-wizard-darwin-arm64"
69+
curl -L $downloadUrl -o sentry-wizard
70+
chmod +x sentry-wizard
71+
./sentry-wizard -i android
72+
```
73+
74+
```bash {tabTitle:Linux (x64)}
75+
downloadUrl="https://github.com/getsentry/sentry-wizard/releases/download/v4.0.1/sentry-wizard-linux-x64"
76+
curl -L $downloadUrl -o sentry-wizard
77+
chmod +x sentry-wizard
78+
./sentry-wizard -i android
79+
```
80+
81+
```bash {tabTitle:Linux (arm64)}
82+
downloadUrl="https://github.com/getsentry/sentry-wizard/releases/download/v4.0.1/sentry-wizard-linux-arm64"
83+
curl -L $downloadUrl -o sentry-wizard
84+
chmod +x sentry-wizard
85+
./sentry-wizard -i android
86+
```
87+
88+
```powershell {tabTitle:Windows}
89+
$downloadUrl = "https://github.com/getsentry/sentry-wizard/releases/download/v4.0.1/sentry-wizard-win-x64.exe"
90+
Invoke-WebRequest $downloadUrl -OutFile sentry-wizard.exe
91+
./sentry-wizard.exe -i android
92+
```
93+
5694
This will patch your project and configure the SDK. You only need to patch the project once, then you can add the patched files to your version control system.
5795
If you prefer, you can also <PlatformLink to="/manual-setup/">set up the SDK manually</PlatformLink> or follow the instructions below to adapt the [configuration](#configure).
5896

0 commit comments

Comments
 (0)