Skip to content

Commit

Permalink
Merge pull request #1017 from DataDog/nogorodnikov/merge_master_to_de…
Browse files Browse the repository at this point in the history
…velop_22082022

Merge master branch into develop
  • Loading branch information
0xnm authored Aug 23, 2022
2 parents b6e0e71 + f2393fe commit 5b884f9
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion docs/configure_rum_android_sdk.md
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ For instance, to set each fragment as a distinct view, use the following configu

For `ActivityViewTrackingStrategy`, `FragmentViewTrackingStrategy`, or `MixedViewTrackingStrategy`, you can filter which `Fragment` or `Activity` is tracked as a RUM View by providing a `ComponentPredicate` implementation in the constructor.

**Note**: By default, the library does not track any views. If you decide not to provide a view tracking strategy, you must manually send the views by calling the `startView` and `stopView` methods yourself.
**Note**: By default, the library is using `ActivityViewTrackingStrategy`. If you decide not to provide a view tracking strategy, you must manually send the views by calling the `startView` and `stopView` methods yourself.


### Automatically track network requests
Expand Down
1 change: 0 additions & 1 deletion docs/mobile_data_collected.md
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,6 @@ RUM action, error, resource, and long task events contain information about the
| Metric | Type | Description |
|----------------------------------------|-------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| `view.time_spent` | number (ns) | Time spent on this view. |
| `view.loading_time` | number (ns) | Loading time for this view. |
| `view.long_task.count` | number | Count of all long tasks collected for this view. |
| `view.error.count` | number | Count of all errors collected for this view. |
| `view.resource.count` | number | Count of all resources collected for this view. |
Expand Down
39 changes: 20 additions & 19 deletions docs/rum_getting_started.md
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,9 @@ public class SampleApplication extends Application {
{{< /tabs >}}
{{< /site-region >}}

The credentials for initialization require your application's variant name and uses the value of `BuildConfig.FLAVOR` or an empty string if you don't have variants. This enables the correct ProGuard `mapping.txt` file to automatically upload at build time so you can view de-obfuscated RUM error stack traces. For more information, see the [guide to uploading Android source mapping files][8].
The initialization credentials require your application's variant name and uses the value of `BuildConfig.FLAVOR`. With the variant, RUM can match the errors reported from your application with the mapping files uploaded by the Gradle plugin. If you do not have variants, the credentials use an empty string.

The Gradle plugin automatically uploads the appropriate ProGuard `mapping.txt` file at build time so you can view deobfuscated RUM error stack traces. For more information, see the [Track Android Errors][8].

### Initialize the RUM Monitor and Interceptor

Expand All @@ -300,8 +302,8 @@ GlobalRum.registerIfAbsent(monitor)
{{% /tab %}}
{{% tab "Java" %}}
```java
final RumMonitor monitor = new RumMonitor.Builder().build();
GlobalRum.registerIfAbsent(monitor);
final RumMonitor monitor = new RumMonitor.Builder().build();
GlobalRum.registerIfAbsent(monitor);
```
{{% /tab %}}
{{< /tabs >}}
Expand All @@ -311,16 +313,16 @@ To track your OkHttp requests as resources, add the provided [Interceptor][9]:
{{< tabs >}}
{{% tab "Kotlin" %}}
```kotlin
val okHttpClient = OkHttpClient.Builder()
.addInterceptor(DatadogInterceptor())
.build()
val okHttpClient = OkHttpClient.Builder()
.addInterceptor(DatadogInterceptor())
.build()
```
{{% /tab %}}
{{% tab "Java" %}}
```java
final OkHttpClient okHttpClient = new OkHttpClient.Builder()
.addInterceptor(new DatadogInterceptor())
.build();
final OkHttpClient okHttpClient = new OkHttpClient.Builder()
.addInterceptor(new DatadogInterceptor())
.build();
```
{{% /tab %}}
{{< /tabs >}}
Expand All @@ -337,17 +339,16 @@ You can track events such as crashes and network requests when your application

Add the following snippet during initialization in your Datadog configuration:

{{< tabs >}}
{{< tabs >}}
{{% tab "Kotlin" %}}
```kotlin
.trackBackgroundRumEvents(true)
```
```kotlin
.trackBackgroundRumEvents(true)
```
{{% /tab %}}
{{% tab "Java" %}}
```java
.trackBackgroundRumEvents(true)

```
{{% tab "Java" %}}
```java
.trackBackgroundRumEvents(true)
```
{{% /tab %}}
{{< /tabs >}}
<div class="alert alert-info"><p>Tracking background events may lead to additional sessions, which can impact billing. For questions, <a href="https://docs.datadoghq.com/help/">contact Datadog support.</a></p>
Expand All @@ -371,4 +372,4 @@ Add the following snippet during initialization in your Datadog configuration:
[11]: https://docs.datadoghq.com/real_user_monitoring/android/advanced_configuration/#automatically-track-network-requests
[12]: https://github.com/DataDog/dd-sdk-android-gradle-plugin
[13]: https://docs.datadoghq.com/real_user_monitoring/android/web_view_tracking/
[14]: https://docs.datadoghq.com/getting_started/tagging/using_tags/#rum--session-replay
[14]: https://docs.datadoghq.com/getting_started/tagging/using_tags/#rum--session-replay

0 comments on commit 5b884f9

Please sign in to comment.