@datadog/mobile-react-native 3.0.0 → 3.0.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/android/build.gradle +1 -0
- package/android/src/main/kotlin/com/datadog/reactnative/DdSdkImplementation.kt +5 -0
- package/android/src/main/kotlin/com/datadog/reactnative/DdSdkNativeInitialization.kt +7 -0
- package/android/src/main/kotlin/com/datadog/reactnative/SdkVersion.kt +1 -1
- package/ios/Sources/SdkVersion.swift +1 -1
- package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/baggageHeaderUtils.js +35 -1
- package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/baggageHeaderUtils.js.map +1 -1
- package/lib/commonjs/version.js +1 -1
- package/lib/module/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/baggageHeaderUtils.js +35 -1
- package/lib/module/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/baggageHeaderUtils.js.map +1 -1
- package/lib/module/version.js +1 -1
- package/lib/typescript/version.d.ts +1 -1
- package/package.json +2 -2
- package/src/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/baggageHeaderUtils.ts +35 -1
- package/src/version.ts +1 -1
package/android/build.gradle
CHANGED
|
@@ -210,6 +210,7 @@ dependencies {
|
|
|
210
210
|
implementation "com.datadoghq:dd-sdk-android-logs:3.4.0"
|
|
211
211
|
implementation "com.datadoghq:dd-sdk-android-trace:3.4.0"
|
|
212
212
|
implementation "com.datadoghq:dd-sdk-android-webview:3.4.0"
|
|
213
|
+
implementation "com.datadoghq:dd-sdk-android-ndk:3.4.0"
|
|
213
214
|
implementation "com.google.code.gson:gson:2.10.0"
|
|
214
215
|
testImplementation "org.junit.platform:junit-platform-launcher:1.6.2"
|
|
215
216
|
testImplementation "org.junit.jupiter:junit-jupiter-api:5.6.2"
|
|
@@ -48,6 +48,11 @@ class DdSdkImplementation(
|
|
|
48
48
|
val nativeInitialization = DdSdkNativeInitialization(appContext, datadog, ddTelemetry)
|
|
49
49
|
nativeInitialization.initialize(ddSdkConfiguration)
|
|
50
50
|
|
|
51
|
+
val activity = reactContext.currentActivity
|
|
52
|
+
if (ddSdkConfiguration.rumConfiguration != null && activity != null) {
|
|
53
|
+
datadog.getRumMonitor()._getInternal()?.enableJankStatsTracking(activity)
|
|
54
|
+
}
|
|
55
|
+
|
|
51
56
|
this.frameRateProvider = createFrameRateProvider(ddSdkConfiguration)
|
|
52
57
|
|
|
53
58
|
reactContext.addLifecycleEventListener(object : LifecycleEventListener {
|
|
@@ -30,6 +30,7 @@ import com.datadog.android.rum.tracking.ActivityViewTrackingStrategy
|
|
|
30
30
|
import com.datadog.android.telemetry.model.TelemetryConfigurationEvent
|
|
31
31
|
import com.datadog.android.trace.Trace
|
|
32
32
|
import com.datadog.android.trace.TraceConfiguration
|
|
33
|
+
import com.datadog.android.ndk.NdkCrashReports
|
|
33
34
|
import com.google.gson.Gson
|
|
34
35
|
import java.util.Locale
|
|
35
36
|
import kotlin.time.Duration.Companion.seconds
|
|
@@ -44,12 +45,14 @@ class DdSdkNativeInitialization internal constructor(
|
|
|
44
45
|
private val ddTelemetry: DdTelemetry = DdTelemetry(),
|
|
45
46
|
private val jsonFileReader: JSONFileReader = JSONFileReader()
|
|
46
47
|
) {
|
|
48
|
+
@Suppress("CyclomaticComplexMethod")
|
|
47
49
|
internal fun initialize(ddSdkConfiguration: DdSdkConfiguration) {
|
|
48
50
|
val sdkConfiguration = buildSdkConfiguration(ddSdkConfiguration)
|
|
49
51
|
val trackingConsent = buildTrackingConsent(ddSdkConfiguration.trackingConsent)
|
|
50
52
|
var rumConfiguration: RumConfiguration? = null
|
|
51
53
|
var logsConfiguration: LogsConfiguration? = null
|
|
52
54
|
var traceConfiguration: TraceConfiguration? = null
|
|
55
|
+
val nativeCrashReportEnabled = ddSdkConfiguration.rumConfiguration?.nativeCrashReportEnabled ?: false
|
|
53
56
|
|
|
54
57
|
if (ddSdkConfiguration.rumConfiguration != null) {
|
|
55
58
|
rumConfiguration = buildRumConfiguration(ddSdkConfiguration)
|
|
@@ -88,6 +91,10 @@ class DdSdkNativeInitialization internal constructor(
|
|
|
88
91
|
if (traceConfiguration != null) {
|
|
89
92
|
Trace.enable(traceConfiguration, Datadog.getInstance())
|
|
90
93
|
}
|
|
94
|
+
|
|
95
|
+
if (nativeCrashReportEnabled) {
|
|
96
|
+
NdkCrashReports.enable()
|
|
97
|
+
}
|
|
91
98
|
}
|
|
92
99
|
|
|
93
100
|
private fun configureRumAndTracesForLogs(configuration: DdSdkConfiguration) {
|
|
@@ -99,13 +99,47 @@ function formatBaggageHeader(entries) {
|
|
|
99
99
|
return null;
|
|
100
100
|
}
|
|
101
101
|
const headerValue = formattedParts.join(',');
|
|
102
|
-
const byteLength =
|
|
102
|
+
const byteLength = utf8ByteLength(headerValue);
|
|
103
103
|
if (byteLength > MAX_BYTES) {
|
|
104
104
|
_InternalLog.InternalLog.log(`Baggage header too large: ${byteLength} bytes > ${MAX_BYTES} - entries may be dropped (https://www.w3.org/TR/baggage/#limits)`, _SdkVerbosity.SdkVerbosity.WARN);
|
|
105
105
|
}
|
|
106
106
|
return headerValue;
|
|
107
107
|
}
|
|
108
108
|
|
|
109
|
+
/**
|
|
110
|
+
* Returns the number of bytes needed to encode a string in UTF-8.
|
|
111
|
+
*
|
|
112
|
+
* Useful as a lightweight alternative to Node.js `Buffer.byteLength()`
|
|
113
|
+
* for older environments that do not support it.
|
|
114
|
+
*
|
|
115
|
+
* @param text - The input string.
|
|
116
|
+
* @returns The UTF-8 byte length of the string.
|
|
117
|
+
*/
|
|
118
|
+
function utf8ByteLength(text) {
|
|
119
|
+
let byteLength = text.length;
|
|
120
|
+
for (let i = text.length - 1; i >= 0; i--) {
|
|
121
|
+
const code = text.charCodeAt(i);
|
|
122
|
+
|
|
123
|
+
// 2-byte characters (U+0080 to U+07FF)
|
|
124
|
+
if (code > 0x7f && code <= 0x7ff) {
|
|
125
|
+
byteLength++;
|
|
126
|
+
}
|
|
127
|
+
// 3-byte characters (U+0800 to U+FFFF)
|
|
128
|
+
else if (code > 0x7ff && code <= 0xffff) {
|
|
129
|
+
byteLength += 2;
|
|
130
|
+
}
|
|
131
|
+
|
|
132
|
+
// Handle surrogate pairs (4-byte characters, e.g. emoji)
|
|
133
|
+
// These characters already count as 2 in the initial length
|
|
134
|
+
// Encountering the low surrogate already accounts for the full 4 bytes
|
|
135
|
+
// (2 from the initial length + 2 for the 3-byte characters logic above)
|
|
136
|
+
if (code >= 0xdc00 && code <= 0xdfff) {
|
|
137
|
+
i--; // prevents double counting the same character by skipping high surrogate
|
|
138
|
+
}
|
|
139
|
+
}
|
|
140
|
+
return byteLength;
|
|
141
|
+
}
|
|
142
|
+
|
|
109
143
|
/**
|
|
110
144
|
* Returns a set of valid baggage header characters.
|
|
111
145
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_InternalLog","require","_SdkVerbosity","_headers","MAX_MEMBERS","MAX_BYTES","TOKEN_REGEX","baggageHeaderSafeChars","formatBaggageHeader","entries","formattedParts","rawEntry","includes","InternalLog","log","SdkVerbosity","ERROR","mainPart","rawProperties","split","idx","indexOf","rawKey","slice","trim","rawValue","isDatadogKey","isDatadogPropertyKey","encodedValue","encodeValue","test","WARN","isCompliantBaggageValue","properties","rawProperty","trimmed","eqIdx","propKey","push","propVal","joinedProps","length","join","headerValue","byteLength","
|
|
1
|
+
{"version":3,"names":["_InternalLog","require","_SdkVerbosity","_headers","MAX_MEMBERS","MAX_BYTES","TOKEN_REGEX","baggageHeaderSafeChars","formatBaggageHeader","entries","formattedParts","rawEntry","includes","InternalLog","log","SdkVerbosity","ERROR","mainPart","rawProperties","split","idx","indexOf","rawKey","slice","trim","rawValue","isDatadogKey","isDatadogPropertyKey","encodedValue","encodeValue","test","WARN","isCompliantBaggageValue","properties","rawProperty","trimmed","eqIdx","propKey","push","propVal","joinedProps","length","join","headerValue","byteLength","utf8ByteLength","text","i","code","charCodeAt","getBaggageHeaderSafeChars","safeChars","Set","c","add","String","fromCharCode","key","DD_RUM_SESSION_ID_TAG","DD_RUM_USER_ID_TAG","DD_RUM_ACCOUNT_ID_TAG","raw","decoded","tryDecodeValue","result","ch","Array","from","has","utf8Bytes","Buffer","value","toString","toUpperCase","padStart","decodeURIComponent","isHexDigit","h1","h2"],"sourceRoot":"../../../../../../../src","sources":["rum/instrumentation/resourceTracking/requestProxy/XHRProxy/baggageHeaderUtils.ts"],"mappings":"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","ignoreList":[]}
|
package/lib/commonjs/version.js
CHANGED
package/lib/module/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/baggageHeaderUtils.js
CHANGED
|
@@ -94,13 +94,47 @@ export function formatBaggageHeader(entries) {
|
|
|
94
94
|
return null;
|
|
95
95
|
}
|
|
96
96
|
const headerValue = formattedParts.join(',');
|
|
97
|
-
const byteLength =
|
|
97
|
+
const byteLength = utf8ByteLength(headerValue);
|
|
98
98
|
if (byteLength > MAX_BYTES) {
|
|
99
99
|
InternalLog.log(`Baggage header too large: ${byteLength} bytes > ${MAX_BYTES} - entries may be dropped (https://www.w3.org/TR/baggage/#limits)`, SdkVerbosity.WARN);
|
|
100
100
|
}
|
|
101
101
|
return headerValue;
|
|
102
102
|
}
|
|
103
103
|
|
|
104
|
+
/**
|
|
105
|
+
* Returns the number of bytes needed to encode a string in UTF-8.
|
|
106
|
+
*
|
|
107
|
+
* Useful as a lightweight alternative to Node.js `Buffer.byteLength()`
|
|
108
|
+
* for older environments that do not support it.
|
|
109
|
+
*
|
|
110
|
+
* @param text - The input string.
|
|
111
|
+
* @returns The UTF-8 byte length of the string.
|
|
112
|
+
*/
|
|
113
|
+
function utf8ByteLength(text) {
|
|
114
|
+
let byteLength = text.length;
|
|
115
|
+
for (let i = text.length - 1; i >= 0; i--) {
|
|
116
|
+
const code = text.charCodeAt(i);
|
|
117
|
+
|
|
118
|
+
// 2-byte characters (U+0080 to U+07FF)
|
|
119
|
+
if (code > 0x7f && code <= 0x7ff) {
|
|
120
|
+
byteLength++;
|
|
121
|
+
}
|
|
122
|
+
// 3-byte characters (U+0800 to U+FFFF)
|
|
123
|
+
else if (code > 0x7ff && code <= 0xffff) {
|
|
124
|
+
byteLength += 2;
|
|
125
|
+
}
|
|
126
|
+
|
|
127
|
+
// Handle surrogate pairs (4-byte characters, e.g. emoji)
|
|
128
|
+
// These characters already count as 2 in the initial length
|
|
129
|
+
// Encountering the low surrogate already accounts for the full 4 bytes
|
|
130
|
+
// (2 from the initial length + 2 for the 3-byte characters logic above)
|
|
131
|
+
if (code >= 0xdc00 && code <= 0xdfff) {
|
|
132
|
+
i--; // prevents double counting the same character by skipping high surrogate
|
|
133
|
+
}
|
|
134
|
+
}
|
|
135
|
+
return byteLength;
|
|
136
|
+
}
|
|
137
|
+
|
|
104
138
|
/**
|
|
105
139
|
* Returns a set of valid baggage header characters.
|
|
106
140
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["InternalLog","SdkVerbosity","DD_RUM_ACCOUNT_ID_TAG","DD_RUM_SESSION_ID_TAG","DD_RUM_USER_ID_TAG","MAX_MEMBERS","MAX_BYTES","TOKEN_REGEX","baggageHeaderSafeChars","formatBaggageHeader","entries","formattedParts","rawEntry","includes","log","ERROR","mainPart","rawProperties","split","idx","indexOf","rawKey","slice","trim","rawValue","isDatadogKey","isDatadogPropertyKey","encodedValue","encodeValue","test","WARN","isCompliantBaggageValue","properties","rawProperty","trimmed","eqIdx","propKey","push","propVal","joinedProps","length","join","headerValue","byteLength","
|
|
1
|
+
{"version":3,"names":["InternalLog","SdkVerbosity","DD_RUM_ACCOUNT_ID_TAG","DD_RUM_SESSION_ID_TAG","DD_RUM_USER_ID_TAG","MAX_MEMBERS","MAX_BYTES","TOKEN_REGEX","baggageHeaderSafeChars","formatBaggageHeader","entries","formattedParts","rawEntry","includes","log","ERROR","mainPart","rawProperties","split","idx","indexOf","rawKey","slice","trim","rawValue","isDatadogKey","isDatadogPropertyKey","encodedValue","encodeValue","test","WARN","isCompliantBaggageValue","properties","rawProperty","trimmed","eqIdx","propKey","push","propVal","joinedProps","length","join","headerValue","byteLength","utf8ByteLength","text","i","code","charCodeAt","getBaggageHeaderSafeChars","safeChars","Set","c","add","String","fromCharCode","key","raw","decoded","tryDecodeValue","result","ch","Array","from","has","utf8Bytes","Buffer","value","toString","toUpperCase","padStart","decodeURIComponent","isHexDigit","h1","h2"],"sourceRoot":"../../../../../../../src","sources":["rum/instrumentation/resourceTracking/requestProxy/XHRProxy/baggageHeaderUtils.ts"],"mappings":"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","ignoreList":[]}
|
package/lib/module/version.js
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const version = "3.0.
|
|
1
|
+
export declare const version = "3.0.2";
|
|
2
2
|
//# sourceMappingURL=version.d.ts.map
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@datadog/mobile-react-native",
|
|
3
|
-
"version": "3.0.
|
|
3
|
+
"version": "3.0.2",
|
|
4
4
|
"description": "A client-side React Native module to interact with Datadog",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"datadog",
|
|
@@ -118,5 +118,5 @@
|
|
|
118
118
|
"dependencies": {
|
|
119
119
|
"big-integer": "^1.6.52"
|
|
120
120
|
},
|
|
121
|
-
"gitHead": "
|
|
121
|
+
"gitHead": "5ba4e339092388a29f5fe19df8a21451ed89f083"
|
|
122
122
|
}
|
package/src/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/baggageHeaderUtils.ts
CHANGED
|
@@ -126,7 +126,7 @@ export function formatBaggageHeader(entries: Set<string>): string | null {
|
|
|
126
126
|
}
|
|
127
127
|
|
|
128
128
|
const headerValue = formattedParts.join(',');
|
|
129
|
-
const byteLength =
|
|
129
|
+
const byteLength = utf8ByteLength(headerValue);
|
|
130
130
|
|
|
131
131
|
if (byteLength > MAX_BYTES) {
|
|
132
132
|
InternalLog.log(
|
|
@@ -138,6 +138,40 @@ export function formatBaggageHeader(entries: Set<string>): string | null {
|
|
|
138
138
|
return headerValue;
|
|
139
139
|
}
|
|
140
140
|
|
|
141
|
+
/**
|
|
142
|
+
* Returns the number of bytes needed to encode a string in UTF-8.
|
|
143
|
+
*
|
|
144
|
+
* Useful as a lightweight alternative to Node.js `Buffer.byteLength()`
|
|
145
|
+
* for older environments that do not support it.
|
|
146
|
+
*
|
|
147
|
+
* @param text - The input string.
|
|
148
|
+
* @returns The UTF-8 byte length of the string.
|
|
149
|
+
*/
|
|
150
|
+
function utf8ByteLength(text: string): number {
|
|
151
|
+
let byteLength = text.length;
|
|
152
|
+
for (let i = text.length - 1; i >= 0; i--) {
|
|
153
|
+
const code = text.charCodeAt(i);
|
|
154
|
+
|
|
155
|
+
// 2-byte characters (U+0080 to U+07FF)
|
|
156
|
+
if (code > 0x7f && code <= 0x7ff) {
|
|
157
|
+
byteLength++;
|
|
158
|
+
}
|
|
159
|
+
// 3-byte characters (U+0800 to U+FFFF)
|
|
160
|
+
else if (code > 0x7ff && code <= 0xffff) {
|
|
161
|
+
byteLength += 2;
|
|
162
|
+
}
|
|
163
|
+
|
|
164
|
+
// Handle surrogate pairs (4-byte characters, e.g. emoji)
|
|
165
|
+
// These characters already count as 2 in the initial length
|
|
166
|
+
// Encountering the low surrogate already accounts for the full 4 bytes
|
|
167
|
+
// (2 from the initial length + 2 for the 3-byte characters logic above)
|
|
168
|
+
if (code >= 0xdc00 && code <= 0xdfff) {
|
|
169
|
+
i--; // prevents double counting the same character by skipping high surrogate
|
|
170
|
+
}
|
|
171
|
+
}
|
|
172
|
+
return byteLength;
|
|
173
|
+
}
|
|
174
|
+
|
|
141
175
|
/**
|
|
142
176
|
* Returns a set of valid baggage header characters.
|
|
143
177
|
*/
|
package/src/version.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
// generated by genversion
|
|
2
|
-
export const version = '3.0.
|
|
2
|
+
export const version = '3.0.2';
|