Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docs/platforms/android/configuration/options.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -258,9 +258,9 @@ Default: set to `android.content.Context.getCacheDir()/sentry`.

</ConfigKey>

<ConfigKey name="shutdown-timeout">
<ConfigKey name="shutdown-timeout-millis">

Controls how many seconds to wait before shutting down. Sentry SDKs send events from a background queue. This queue is given a certain amount to drain pending events. The default is SDK specific but typically around two seconds. Setting this value too low may cause problems for sending events from command line applications. Setting the value too high will cause the application to block for a long time for users experiencing network connectivity problems.
Controls how many seconds to wait before shutting down. Sentry SDKs send events from a background queue. This queue is given a certain amount to drain pending events. The default is SDK specific but typically around two seconds. Setting this value too low may cause problems for sending events from the application. Setting the value too high will cause the application to block for a long time for users experiencing network connectivity problems.

</ConfigKey>

Expand Down
8 changes: 4 additions & 4 deletions docs/platforms/java/common/configuration/index.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -265,18 +265,18 @@ sentry.traces-sample-rate=0.2

### Tracing Origins

To set tracing origins, use the `tracing-origins` option:
To set tracing origins, use the `trace-propagation-targets` option:

```properties {tabTitle:sentry.properties}
tracing-origins=localhost,^(http|https)://api\\..*$
trace-propagation-targets=localhost,^(http|https)://api\\..*$
```

```properties {tabTitle:environment variable}
SENTRY_TRACING_ORIGINS=localhost,^(http|https)://api\\..*$
SENTRY_TRACE_PROPAGATION_TARGETS=localhost,^(http|https)://api\\..*$
```

```properties {tabTitle:system property}
sentry.tracing-origins=localhost,^(http|https)://api\\..*$
sentry.trace-propagation-targets=localhost,^(http|https)://api\\..*$
```

### Debug
Expand Down
8 changes: 1 addition & 7 deletions docs/platforms/java/common/configuration/options.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ When set, a proxy can be configured that should be used for outbound requests. T

</ConfigKey>

<ConfigKey name="shutdown-timeout">
<ConfigKey name="shutdown-timeout-millis">

Controls how many seconds to wait before shutting down. Sentry SDKs send events from a background queue. This queue is given a certain amount to drain pending events. The default is SDK specific but typically around two seconds. Setting this value too low may cause problems for sending events from command line applications. Setting the value too high will cause the application to block for a long time for users experiencing network connectivity problems.

Expand All @@ -239,12 +239,6 @@ A function responsible for determining the percentage chance a given transaction

</ConfigKey>

<ConfigKey name="tracing-origins">

An optional property that configures which downstream services receive the `sentry-trace` header attached to HTTP requests. It contains a list of URLs or regex against which URLs are matched. If not set, the `sentry-trace` header is attached to every request executed from an instrumented client.

</ConfigKey>

<ConfigKey name="trace-propagation-targets">

An optional property that controls which downstream services receive tracing data, in the form of a `sentry-trace` and a `baggage` header attached to any outgoing HTTP requests.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ If you'd like to opt-out of this feature, you can do it via options.

```xml {filename:AndroidManifest.xml}
<application>
<meta-data android:name="io.sentry.session-tracking.enable" android:value="true" />
<meta-data android:name="io.sentry.auto-session-tracking.enable" android:value="true" />
</application>
```

Expand All @@ -40,15 +40,15 @@ Or, if you are manually instrumenting Sentry:
import io.sentry.android.core.SentryAndroid;

SentryAndroid.init(this, options -> {
options.setEnableSessionTracking(true);
options.setEnableAutoSessionTracking(true);
});
```

```kotlin
import io.sentry.android.core.SentryAndroid

SentryAndroid.init(this) { options ->
options.isEnableSessionTracking = true
options.isEnableAutoSessionTracking = true
}
```

Expand Down
2 changes: 1 addition & 1 deletion platform-includes/configuration/drain-example/java.mdx
Original file line number Diff line number Diff line change
@@ -1 +1 @@
The Java SDK automatically shuts down on JVM exit and waits `shutdownTimeout` milliseconds before that happens.
The Java SDK automatically shuts down on JVM exit and waits `shutdownTimeoutMillis` milliseconds before that happens.
Loading