Migrate Android SDK to v2 #522
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,9 +8,12 @@ package com.datadog.reactnative | |
|
|
||
| import android.content.Context | ||
| import com.datadog.android.core.configuration.Configuration | ||
| import com.datadog.android.log.LogsConfiguration | ||
| import com.datadog.android.privacy.TrackingConsent | ||
| import com.datadog.android.rum.GlobalRumMonitor | ||
| import com.datadog.android.rum.RumConfiguration | ||
| import com.datadog.android.rum.RumMonitor | ||
| import com.datadog.android.trace.TraceConfiguration | ||
| import java.lang.IllegalArgumentException | ||
|
|
||
| /** | ||
|
|
@@ -45,11 +48,37 @@ interface DatadogWrapper { | |
| */ | ||
| fun initialize( | ||
| context: Context, | ||
| configuration: Configuration, | ||
| consent: TrackingConsent | ||
| ) | ||
|
|
||
| /** | ||
| * Enables the RUM feature of the SDK. | ||
| * | ||
| * @param configuration the configuration for the RUM feature | ||
| */ | ||
| fun enableRum( | ||
| configuration: RumConfiguration | ||
| ) | ||
|
|
||
| /** | ||
| * Enables the Logs feature of the SDK. | ||
| * | ||
| * @param configuration the configuration for the Logs feature | ||
| */ | ||
| fun enableLogs( | ||
| configuration: LogsConfiguration | ||
| ) | ||
|
|
||
| /** | ||
| * Enables the Trace feature of the SDK. | ||
| * | ||
| * @param configuration the configuration for the Trace feature | ||
| */ | ||
| fun enableTrace( | ||
| configuration: TraceConfiguration | ||
| ) | ||
|
|
||
| /** | ||
| * Sets the user information. | ||
| * | ||
|
|
@@ -66,13 +95,6 @@ interface DatadogWrapper { | |
| extraInfo: Map<String, Any?> | ||
| ) | ||
|
|
||
| /** | ||
| * Adds global attributes. | ||
| * | ||
|
|
@@ -109,4 +131,9 @@ interface DatadogWrapper { | |
| * Returns whether the SDK is initialized. | ||
| */ | ||
| fun isInitialized(): Boolean | ||
|
|
||
| /** | ||
| * Returns the RUM Monitor for the default SDK core. | ||
| */ | ||
| fun getRumMonitor(): RumMonitor | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,9 +20,8 @@ class DdLogsImplementation( | |
| ) { | ||
| private val reactNativeLogger: Logger by lazy { | ||
| logger ?: Logger.Builder() | ||
| .setLogcatLogsEnabled(true) | ||
| .setName("DdLogs") | ||
| .build() | ||
| } | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,7 +6,6 @@ | |
|
|
||
| package com.datadog.reactnative | ||
|
|
||
| import com.datadog.android.rum.RumActionType | ||
| import com.datadog.android.rum.RumAttributes | ||
| import com.datadog.android.rum.RumErrorSource | ||
|
|
@@ -19,7 +18,7 @@ import java.util.Locale | |
| * The entry point to use Datadog's RUM feature. | ||
| */ | ||
| @Suppress("TooManyFunctions") | ||
| class DdRumImplementation(private val datadog: DatadogWrapper = DatadogSDKWrapper()) { | ||
| /** | ||
| * Start tracking a RUM View. | ||
| * @param key The view unique key identifier. | ||
|
|
@@ -37,7 +36,7 @@ class DdRumImplementation { | |
| val attributes = context.toHashMap().toMutableMap().apply { | ||
| put(RumAttributes.INTERNAL_TIMESTAMP, timestampMs.toLong()) | ||
| } | ||
| datadog.getRumMonitor().startView( | ||
| key = key, | ||
| name = name, | ||
| attributes = attributes | ||
|
|
@@ -55,7 +54,7 @@ class DdRumImplementation { | |
| val attributes = context.toHashMap().toMutableMap().apply { | ||
| put(RumAttributes.INTERNAL_TIMESTAMP, timestampMs.toLong()) | ||
| } | ||
| datadog.getRumMonitor().stopView( | ||
| key = key, | ||
| attributes = attributes | ||
| ) | ||
|
|
@@ -79,7 +78,7 @@ class DdRumImplementation { | |
| val attributes = context.toHashMap().toMutableMap().apply { | ||
| put(RumAttributes.INTERNAL_TIMESTAMP, timestampMs.toLong()) | ||
| } | ||
| datadog.getRumMonitor().startAction( | ||
| type = type.asRumActionType(), | ||
| name = name, | ||
| attributes = attributes | ||
|
|
@@ -104,7 +103,7 @@ class DdRumImplementation { | |
| val attributes = context.toHashMap().toMutableMap().apply { | ||
| put(RumAttributes.INTERNAL_TIMESTAMP, timestampMs.toLong()) | ||
| } | ||
| datadog.getRumMonitor().stopAction( | ||
| type = type.asRumActionType(), | ||
| name = name, | ||
| attributes = attributes | ||
|
|
@@ -129,7 +128,7 @@ class DdRumImplementation { | |
| val attributes = context.toHashMap().toMutableMap().apply { | ||
| put(RumAttributes.INTERNAL_TIMESTAMP, timestampMs.toLong()) | ||
| } | ||
| datadog.getRumMonitor().addAction( | ||
| type = type.asRumActionType(), | ||
| name = name, | ||
| attributes = attributes | ||
|
|
@@ -157,7 +156,7 @@ class DdRumImplementation { | |
| val attributes = context.toHashMap().toMutableMap().apply { | ||
| put(RumAttributes.INTERNAL_TIMESTAMP, timestampMs.toLong()) | ||
| } | ||
| datadog.getRumMonitor().startResource( | ||
| key = key, | ||
| method = method, | ||
| url = url, | ||
|
|
@@ -193,7 +192,7 @@ class DdRumImplementation { | |
| } else { | ||
| size.toLong() | ||
| } | ||
| datadog.getRumMonitor().stopResource( | ||
| key = key, | ||
| statusCode = statusCode.toInt(), | ||
| kind = kind.asRumResourceKind(), | ||
|
|
@@ -223,7 +222,7 @@ class DdRumImplementation { | |
| val attributes = context.toHashMap().toMutableMap().apply { | ||
| put(RumAttributes.INTERNAL_TIMESTAMP, timestampMs.toLong()) | ||
| } | ||
| datadog.getRumMonitor().addErrorWithStacktrace( | ||
| message = message, | ||
| source = source.asErrorSource(), | ||
| stacktrace = stacktrace, | ||
|
|
@@ -237,28 +236,28 @@ class DdRumImplementation { | |
| * @param name The name of the new custom timing attribute. Timings can be nested up to 8 levels deep. Names using more than 8 levels will be sanitized by SDK. | ||
| */ | ||
| fun addTiming(name: String, promise: Promise) { | ||
| datadog.getRumMonitor().addTiming(name) | ||
| promise.resolve(null) | ||
| } | ||
|
|
||
| /** | ||
| * Stops the current RUM Session. | ||
| */ | ||
| fun stopSession(promise: Promise) { | ||
| datadog.getRumMonitor().stopSession() | ||
| promise.resolve(null) | ||
| } | ||
|
|
||
| /** | ||
| * Adds result of evaluating a feature flag to the view. | ||
| * Feature flag evaluations are local to the active view and are cleared when the view is stopped. | ||
| * @param name The name of the feature flag | ||
| * @param valueAsMap The value the feature flag evaluated to, encapsulated in a Map | ||
| */ | ||
| fun addFeatureFlagEvaluation(name: String, valueAsMap: ReadableMap, promise: Promise) { | ||
| val value = valueAsMap.toHashMap()["value"] | ||
| if (value != null) { | ||
| datadog.getRumMonitor().addFeatureFlagEvaluation(name, value) | ||
| } | ||
| promise.resolve(null) | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -29,7 +29,7 @@ package com.datadog.reactnative | |
| data class DdSdkConfiguration( | ||
| val clientToken: String, | ||
| val env: String, | ||
| val applicationId: String, | ||
| val nativeCrashReportEnabled: Boolean? = null, | ||
| val nativeLongTaskThresholdMs: Double? = null, | ||
| val longTaskThresholdMs: Double? = null, | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this option does not exist anymore and the file did not exist