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
1 change: 1 addition & 0 deletions example-new-architecture/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ import {APPLICATION_ID, CLIENT_TOKEN, ENVIRONMENT} from './ddCredentials';
trackErrors: true,
sessionSampleRate: 100,
telemetrySampleRate: 100,
nativeCrashReportEnabled: true
},
logsConfiguration: {},
traceConfiguration: {}
Expand Down
1 change: 1 addition & 0 deletions packages/core/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,7 @@ dependencies {
implementation "com.datadoghq:dd-sdk-android-logs:3.4.0"
implementation "com.datadoghq:dd-sdk-android-trace:3.4.0"
implementation "com.datadoghq:dd-sdk-android-webview:3.4.0"
implementation "com.datadoghq:dd-sdk-android-ndk:3.4.0"
implementation "com.google.code.gson:gson:2.10.0"
testImplementation "org.junit.platform:junit-platform-launcher:1.6.2"
testImplementation "org.junit.jupiter:junit-jupiter-api:5.6.2"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import com.datadog.android.rum.tracking.ActivityViewTrackingStrategy
import com.datadog.android.telemetry.model.TelemetryConfigurationEvent
import com.datadog.android.trace.Trace
import com.datadog.android.trace.TraceConfiguration
import com.datadog.android.ndk.NdkCrashReports
import com.google.gson.Gson
import java.util.Locale
import kotlin.time.Duration.Companion.seconds
Expand All @@ -44,12 +45,14 @@ class DdSdkNativeInitialization internal constructor(
private val ddTelemetry: DdTelemetry = DdTelemetry(),
private val jsonFileReader: JSONFileReader = JSONFileReader()
) {
@Suppress("CyclomaticComplexMethod")
internal fun initialize(ddSdkConfiguration: DdSdkConfiguration) {
val sdkConfiguration = buildSdkConfiguration(ddSdkConfiguration)
val trackingConsent = buildTrackingConsent(ddSdkConfiguration.trackingConsent)
var rumConfiguration: RumConfiguration? = null
var logsConfiguration: LogsConfiguration? = null
var traceConfiguration: TraceConfiguration? = null
val nativeCrashReportEnabled = ddSdkConfiguration.rumConfiguration?.nativeCrashReportEnabled ?: false

if (ddSdkConfiguration.rumConfiguration != null) {
rumConfiguration = buildRumConfiguration(ddSdkConfiguration)
Expand Down Expand Up @@ -88,6 +91,10 @@ class DdSdkNativeInitialization internal constructor(
if (traceConfiguration != null) {
Trace.enable(traceConfiguration, Datadog.getInstance())
}

if (nativeCrashReportEnabled) {
NdkCrashReports.enable()
}
}

private fun configureRumAndTracesForLogs(configuration: DdSdkConfiguration) {
Expand Down
Loading