@datadog/mobile-react-native 3.1.2 → 3.2.0
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/DatadogSDKReactNative.podspec +7 -7
- package/android/build.gradle +22 -7
- package/android/src/main/kotlin/com/datadog/reactnative/DdSdkImplementation.kt +1 -0
- package/android/src/main/kotlin/com/datadog/reactnative/DdSdkNativeInitialization.kt +5 -0
- package/android/src/main/kotlin/com/datadog/reactnative/SdkVersion.kt +1 -1
- package/android/src/test/kotlin/com/datadog/reactnative/DdSdkTest.kt +54 -0
- package/ios/Sources/AnyEncodable.swift +16 -83
- package/ios/Sources/Attributes.swift +5 -0
- package/ios/Sources/DdRumImplementation.swift +2 -1
- package/ios/Sources/DdSdkNativeInitialization.swift +8 -1
- package/ios/Sources/RUMMonitorInternalProtocol.swift +8 -1
- package/ios/Sources/SdkVersion.swift +1 -1
- package/lib/commonjs/rum/instrumentation/resourceTracking/distributedTracing/headers.js +3 -1
- package/lib/commonjs/rum/instrumentation/resourceTracking/distributedTracing/headers.js.map +1 -1
- package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.js +1 -0
- package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.js.map +1 -1
- package/lib/commonjs/trace/DdTrace.js +1 -1
- package/lib/commonjs/trace/DdTrace.js.map +1 -1
- package/lib/commonjs/version.js +1 -1
- package/lib/module/rum/instrumentation/resourceTracking/distributedTracing/headers.js +2 -0
- package/lib/module/rum/instrumentation/resourceTracking/distributedTracing/headers.js.map +1 -1
- package/lib/module/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.js +2 -1
- package/lib/module/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.js.map +1 -1
- package/lib/module/trace/DdTrace.js +1 -1
- package/lib/module/trace/DdTrace.js.map +1 -1
- package/lib/module/version.js +1 -1
- package/lib/typescript/rum/instrumentation/resourceTracking/distributedTracing/headers.d.ts +2 -0
- package/lib/typescript/rum/instrumentation/resourceTracking/distributedTracing/headers.d.ts.map +1 -1
- package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.d.ts.map +1 -1
- package/lib/typescript/trace/DdTrace.d.ts.map +1 -1
- package/lib/typescript/version.d.ts +1 -1
- package/package.json +2 -2
- package/src/rum/instrumentation/resourceTracking/distributedTracing/headers.ts +2 -0
- package/src/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.ts +10 -1
- package/src/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/__tests__/XHRProxy.test.ts +54 -1
- package/src/trace/DdTrace.ts +1 -4
- package/src/version.ts +1 -1
|
@@ -19,15 +19,15 @@ Pod::Spec.new do |s|
|
|
|
19
19
|
s.dependency "React-Core"
|
|
20
20
|
|
|
21
21
|
# /!\ Remember to keep the versions in sync with DatadogSDKReactNativeSessionReplay.podspec
|
|
22
|
-
s.dependency 'DatadogCore', '3.
|
|
23
|
-
s.dependency 'DatadogLogs', '3.
|
|
24
|
-
s.dependency 'DatadogTrace', '3.
|
|
25
|
-
s.dependency 'DatadogRUM', '3.
|
|
26
|
-
s.dependency 'DatadogCrashReporting', '3.
|
|
27
|
-
s.dependency 'DatadogFlags', '3.
|
|
22
|
+
s.dependency 'DatadogCore', '3.8.2'
|
|
23
|
+
s.dependency 'DatadogLogs', '3.8.2'
|
|
24
|
+
s.dependency 'DatadogTrace', '3.8.2'
|
|
25
|
+
s.dependency 'DatadogRUM', '3.8.2'
|
|
26
|
+
s.dependency 'DatadogCrashReporting', '3.8.2'
|
|
27
|
+
s.dependency 'DatadogFlags', '3.8.2'
|
|
28
28
|
|
|
29
29
|
# DatadogWebViewTracking is not available for tvOS
|
|
30
|
-
s.ios.dependency 'DatadogWebViewTracking', '3.
|
|
30
|
+
s.ios.dependency 'DatadogWebViewTracking', '3.8.2'
|
|
31
31
|
|
|
32
32
|
s.test_spec 'Tests' do |test_spec|
|
|
33
33
|
test_spec.source_files = 'ios/Tests/**/*.{swift,json}'
|
package/android/build.gradle
CHANGED
|
@@ -200,18 +200,33 @@ dependencies {
|
|
|
200
200
|
// This breaks builds if the React Native target is below 0.76.0. as it relies on Gradle 8.5.0.
|
|
201
201
|
// To avoid this, we enforce 1.0.0-beta01 on RN < 0.76.0
|
|
202
202
|
if (reactNativeMinorVersion < 76) {
|
|
203
|
-
implementation("com.datadoghq:dd-sdk-android-rum:3.
|
|
203
|
+
implementation("com.datadoghq:dd-sdk-android-rum:3.8.0") {
|
|
204
204
|
exclude group: "androidx.metrics", module: "metrics-performance"
|
|
205
205
|
}
|
|
206
206
|
implementation "androidx.metrics:metrics-performance:1.0.0-beta01"
|
|
207
|
+
// dd-sdk-android requires androidx.core:core and androidx.core:core-ktx
|
|
208
|
+
// From 3.8.0, it uses 1.15.0, which requires compileSdk 35.
|
|
209
|
+
// However, React Native versions below 0.76.0 use compileSdk 34,
|
|
210
|
+
// so we pin 1.13.1 on those, since it's the last version compatible with compileSdk 34.
|
|
211
|
+
// Use dependency constraints (strictly) so this requirement propagates to consumers.
|
|
212
|
+
implementation("androidx.core:core") {
|
|
213
|
+
version {
|
|
214
|
+
strictly("1.13.1")
|
|
215
|
+
}
|
|
216
|
+
}
|
|
217
|
+
implementation("androidx.core:core-ktx") {
|
|
218
|
+
version {
|
|
219
|
+
strictly("1.13.1")
|
|
220
|
+
}
|
|
221
|
+
}
|
|
207
222
|
} else {
|
|
208
|
-
implementation "com.datadoghq:dd-sdk-android-rum:3.
|
|
223
|
+
implementation "com.datadoghq:dd-sdk-android-rum:3.8.0"
|
|
209
224
|
}
|
|
210
|
-
implementation "com.datadoghq:dd-sdk-android-logs:3.
|
|
211
|
-
implementation "com.datadoghq:dd-sdk-android-trace:3.
|
|
212
|
-
implementation "com.datadoghq:dd-sdk-android-webview:3.
|
|
213
|
-
implementation "com.datadoghq:dd-sdk-android-ndk:3.
|
|
214
|
-
implementation "com.datadoghq:dd-sdk-android-flags:3.
|
|
225
|
+
implementation "com.datadoghq:dd-sdk-android-logs:3.8.0"
|
|
226
|
+
implementation "com.datadoghq:dd-sdk-android-trace:3.8.0"
|
|
227
|
+
implementation "com.datadoghq:dd-sdk-android-webview:3.8.0"
|
|
228
|
+
implementation "com.datadoghq:dd-sdk-android-ndk:3.8.0"
|
|
229
|
+
implementation "com.datadoghq:dd-sdk-android-flags:3.8.0"
|
|
215
230
|
implementation "com.google.code.gson:gson:2.10.0"
|
|
216
231
|
testImplementation "org.junit.platform:junit-platform-launcher:1.6.2"
|
|
217
232
|
testImplementation "org.junit.jupiter:junit-jupiter-api:5.6.2"
|
|
@@ -405,6 +405,7 @@ class DdSdkImplementation(
|
|
|
405
405
|
internal const val DEFAULT_APP_VERSION = "?"
|
|
406
406
|
internal const val DD_VERSION = "_dd.version"
|
|
407
407
|
internal const val DD_VERSION_SUFFIX = "_dd.version_suffix"
|
|
408
|
+
internal const val DD_NEEDS_CLEAR_TEXT_HTTP = "_dd.needsClearTextHttp"
|
|
408
409
|
internal const val DD_DROP_RESOURCE = "_dd.resource.drop_resource"
|
|
409
410
|
internal const val DD_DROP_ACTION = "_dd.action.drop_action"
|
|
410
411
|
internal const val MONITOR_JS_ERROR_MESSAGE = "Error monitoring JS refresh rate"
|
|
@@ -21,6 +21,7 @@ import com.datadog.android.log.LogsConfiguration
|
|
|
21
21
|
import com.datadog.android.privacy.TrackingConsent
|
|
22
22
|
import com.datadog.android.rum.Rum
|
|
23
23
|
import com.datadog.android.rum.RumConfiguration
|
|
24
|
+
import com.datadog.android._InternalProxy
|
|
24
25
|
import com.datadog.android.rum._RumInternalProxy
|
|
25
26
|
import com.datadog.android.rum.configuration.VitalsUpdateFrequency
|
|
26
27
|
import com.datadog.android.rum.metric.networksettled.TimeBasedInitialResourceIdentifier
|
|
@@ -313,6 +314,10 @@ class DdSdkNativeInitialization internal constructor(
|
|
|
313
314
|
|
|
314
315
|
configBuilder.setBatchProcessingLevel(buildBatchProcessingLevel(configuration.batchProcessingLevel))
|
|
315
316
|
|
|
317
|
+
if (additionalConfig?.get(DdSdkImplementation.DD_NEEDS_CLEAR_TEXT_HTTP) == true) {
|
|
318
|
+
_InternalProxy.allowClearTextHttp(configBuilder)
|
|
319
|
+
}
|
|
320
|
+
|
|
316
321
|
return configBuilder.build()
|
|
317
322
|
}
|
|
318
323
|
|
|
@@ -582,6 +582,60 @@ internal class DdSdkTest {
|
|
|
582
582
|
|
|
583
583
|
// endregion
|
|
584
584
|
|
|
585
|
+
// region initialize / needsClearTextHttp
|
|
586
|
+
|
|
587
|
+
@Test
|
|
588
|
+
fun `𝕄 initialize native SDK 𝕎 initialize() {needsClearTextHttp=true}`() {
|
|
589
|
+
// Given
|
|
590
|
+
val additionalConfig = (
|
|
591
|
+
fakeConfiguration.additionalConfiguration?.toMutableMap() ?: mutableMapOf()
|
|
592
|
+
).also { it[DdSdkImplementation.DD_NEEDS_CLEAR_TEXT_HTTP] = true }
|
|
593
|
+
val bridgeConfiguration = fakeConfiguration.copy(additionalConfiguration = additionalConfig)
|
|
594
|
+
val sdkConfigCaptor = argumentCaptor<Configuration>()
|
|
595
|
+
val rumConfigCaptor = argumentCaptor<RumConfiguration>()
|
|
596
|
+
val logsConfigCaptor = argumentCaptor<LogsConfiguration>()
|
|
597
|
+
val traceConfigCaptor = argumentCaptor<TraceConfiguration>()
|
|
598
|
+
|
|
599
|
+
val rumMock = org.mockito.Mockito.mockStatic(Rum::class.java)
|
|
600
|
+
val traceMock = org.mockito.Mockito.mockStatic(Trace::class.java)
|
|
601
|
+
val logsMock = org.mockito.Mockito.mockStatic(Logs::class.java)
|
|
602
|
+
|
|
603
|
+
try {
|
|
604
|
+
rumMock.`when`<Unit> { Rum.enable(any(), any()) }.then { }
|
|
605
|
+
logsMock.`when`<Unit> { Logs.enable(any(), any()) }.then { }
|
|
606
|
+
traceMock.`when`<Unit> { Trace.enable(any(), any()) }.then { }
|
|
607
|
+
|
|
608
|
+
// When
|
|
609
|
+
testedBridgeSdk.initialize(bridgeConfiguration.toReadableJavaOnlyMap(), mockPromise)
|
|
610
|
+
|
|
611
|
+
// Then
|
|
612
|
+
inOrder(mockDatadog) {
|
|
613
|
+
verify(mockDatadog).initialize(
|
|
614
|
+
same(mockContext),
|
|
615
|
+
sdkConfigCaptor.capture(),
|
|
616
|
+
any()
|
|
617
|
+
)
|
|
618
|
+
rumMock.verify { Rum.enable(rumConfigCaptor.capture(), any()) }
|
|
619
|
+
traceMock.verify { Trace.enable(traceConfigCaptor.capture(), any()) }
|
|
620
|
+
logsMock.verify { Logs.enable(logsConfigCaptor.capture(), any()) }
|
|
621
|
+
}
|
|
622
|
+
assertThat(sdkConfigCaptor.firstValue)
|
|
623
|
+
.hasField("coreConfig") {
|
|
624
|
+
it.hasFieldEqualTo("needsClearTextHttp", true)
|
|
625
|
+
it.hasFieldEqualTo("firstPartyHostsWithHeaderTypes", emptyMap<String, String>())
|
|
626
|
+
}
|
|
627
|
+
.hasFieldEqualTo("clientToken", fakeConfiguration.clientToken)
|
|
628
|
+
.hasFieldEqualTo("env", fakeConfiguration.env)
|
|
629
|
+
.hasFieldEqualTo("variant", "")
|
|
630
|
+
} finally {
|
|
631
|
+
rumMock.close()
|
|
632
|
+
logsMock.close()
|
|
633
|
+
traceMock.close()
|
|
634
|
+
}
|
|
635
|
+
}
|
|
636
|
+
|
|
637
|
+
// endregion
|
|
638
|
+
|
|
585
639
|
// region initialize / site
|
|
586
640
|
|
|
587
641
|
@Test
|
|
@@ -4,6 +4,7 @@
|
|
|
4
4
|
* Copyright 2019-2020 Datadog, Inc.
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
|
+
import DatadogInternal
|
|
7
8
|
import Foundation
|
|
8
9
|
|
|
9
10
|
internal func castAttributesToSwift(_ attributes: NSDictionary) -> [String: Encodable] {
|
|
@@ -29,39 +30,39 @@ internal func castValueToSwift(_ value: Any) -> Encodable {
|
|
|
29
30
|
// Otherwise, cast by preserving its encoded value (and loosing type information)
|
|
30
31
|
casted = castByPreservingEncodedValue(attributeValue: value)
|
|
31
32
|
}
|
|
32
|
-
|
|
33
|
+
|
|
33
34
|
return casted
|
|
34
35
|
}
|
|
35
36
|
|
|
36
37
|
/// Casts `Any` value to `Encodable` by preserving its type information.
|
|
37
38
|
private func castByPreservingTypeInformation(attributeValue: Any) -> Encodable? {
|
|
38
39
|
switch attributeValue {
|
|
39
|
-
case let string as String:
|
|
40
|
-
return string
|
|
41
|
-
case let number as NSNumber:
|
|
40
|
+
case let string as String: // unpacking `NSTaggedPointerString`
|
|
41
|
+
return string // cast to String
|
|
42
|
+
case let number as NSNumber: // unpacking `__NSCFNumber`
|
|
42
43
|
switch CFNumberGetType(number) {
|
|
43
44
|
case .charType:
|
|
44
|
-
return number.boolValue
|
|
45
|
+
return number.boolValue // cast to Bool
|
|
45
46
|
case .sInt8Type:
|
|
46
|
-
return number.int8Value
|
|
47
|
+
return number.int8Value // cast to Int8
|
|
47
48
|
case .sInt16Type:
|
|
48
|
-
return number.int16Value
|
|
49
|
+
return number.int16Value // cast to Int16
|
|
49
50
|
case .sInt32Type:
|
|
50
|
-
return number.int32Value
|
|
51
|
+
return number.int32Value // cast to Int32
|
|
51
52
|
case .sInt64Type:
|
|
52
|
-
return number.int64Value
|
|
53
|
+
return number.int64Value // cast to Int64
|
|
53
54
|
case .shortType:
|
|
54
|
-
return number.uint16Value
|
|
55
|
+
return number.uint16Value // cast to UInt 16
|
|
55
56
|
case .longType:
|
|
56
|
-
return number.uint32Value
|
|
57
|
+
return number.uint32Value // cast to UInt32
|
|
57
58
|
case .longLongType:
|
|
58
|
-
return number.uint64Value
|
|
59
|
+
return number.uint64Value // cast to UInt64
|
|
59
60
|
case .intType, .nsIntegerType, .cfIndexType:
|
|
60
|
-
return number.intValue
|
|
61
|
+
return number.intValue // cast to Int
|
|
61
62
|
case .floatType, .float32Type:
|
|
62
|
-
return number.floatValue
|
|
63
|
+
return number.floatValue // cast to Float
|
|
63
64
|
case .doubleType, .float64Type, .cgFloatType:
|
|
64
|
-
return number.doubleValue
|
|
65
|
+
return number.doubleValue // cast to Double
|
|
65
66
|
@unknown default:
|
|
66
67
|
return nil
|
|
67
68
|
}
|
|
@@ -75,71 +76,3 @@ private func castByPreservingTypeInformation(attributeValue: Any) -> Encodable?
|
|
|
75
76
|
private func castByPreservingEncodedValue(attributeValue: Any) -> Encodable {
|
|
76
77
|
return AnyEncodable(attributeValue)
|
|
77
78
|
}
|
|
78
|
-
|
|
79
|
-
/// Type erasing `Encodable` wrapper to bridge Objective-C's `Any` to Swift `Encodable`.
|
|
80
|
-
///
|
|
81
|
-
/// Inspired by `AnyCodable` by Flight-School (MIT):
|
|
82
|
-
/// https://github.com/Flight-School/AnyCodable/blob/master/Sources/AnyCodable/AnyEncodable.swift
|
|
83
|
-
internal class AnyEncodable: Encodable {
|
|
84
|
-
internal let value: Any
|
|
85
|
-
|
|
86
|
-
init(_ value: Any) {
|
|
87
|
-
self.value = value
|
|
88
|
-
}
|
|
89
|
-
|
|
90
|
-
func encode(to encoder: Encoder) throws {
|
|
91
|
-
var container = encoder.singleValueContainer()
|
|
92
|
-
|
|
93
|
-
switch value {
|
|
94
|
-
case let number as NSNumber:
|
|
95
|
-
try encodeNSNumber(number, into: &container)
|
|
96
|
-
case is NSNull, is Void:
|
|
97
|
-
try container.encodeNil()
|
|
98
|
-
case let string as String:
|
|
99
|
-
try container.encode(string)
|
|
100
|
-
case let date as Date:
|
|
101
|
-
try container.encode(date)
|
|
102
|
-
case let url as URL:
|
|
103
|
-
try container.encode(url)
|
|
104
|
-
case let array as [Any]:
|
|
105
|
-
try container.encode(array.map { AnyEncodable($0) })
|
|
106
|
-
case let dictionary as [String: Any]:
|
|
107
|
-
try container.encode(dictionary.mapValues { AnyEncodable($0) })
|
|
108
|
-
default:
|
|
109
|
-
let context = EncodingError.Context(
|
|
110
|
-
codingPath: container.codingPath,
|
|
111
|
-
debugDescription: "Value \(value) cannot be encoded - \(type(of: value)) is not supported by `AnyEncodable`."
|
|
112
|
-
)
|
|
113
|
-
throw EncodingError.invalidValue(value, context)
|
|
114
|
-
}
|
|
115
|
-
}
|
|
116
|
-
}
|
|
117
|
-
|
|
118
|
-
private func encodeNSNumber(_ nsnumber: NSNumber, into container: inout SingleValueEncodingContainer) throws {
|
|
119
|
-
switch CFNumberGetType(nsnumber) {
|
|
120
|
-
case .charType:
|
|
121
|
-
try container.encode(nsnumber.boolValue)
|
|
122
|
-
case .sInt8Type:
|
|
123
|
-
try container.encode(nsnumber.int8Value)
|
|
124
|
-
case .sInt16Type:
|
|
125
|
-
try container.encode(nsnumber.int16Value)
|
|
126
|
-
case .sInt32Type:
|
|
127
|
-
try container.encode(nsnumber.int32Value)
|
|
128
|
-
case .sInt64Type:
|
|
129
|
-
try container.encode(nsnumber.int64Value)
|
|
130
|
-
case .shortType:
|
|
131
|
-
try container.encode(nsnumber.uint16Value)
|
|
132
|
-
case .longType:
|
|
133
|
-
try container.encode(nsnumber.uint32Value)
|
|
134
|
-
case .longLongType:
|
|
135
|
-
try container.encode(nsnumber.uint64Value)
|
|
136
|
-
case .intType, .nsIntegerType, .cfIndexType:
|
|
137
|
-
try container.encode(nsnumber.intValue)
|
|
138
|
-
case .floatType, .float32Type:
|
|
139
|
-
try container.encode(nsnumber.floatValue)
|
|
140
|
-
case .doubleType, .float64Type, .cgFloatType:
|
|
141
|
-
try container.encode(nsnumber.doubleValue)
|
|
142
|
-
@unknown default:
|
|
143
|
-
return
|
|
144
|
-
}
|
|
145
|
-
}
|
|
@@ -99,6 +99,11 @@ internal struct InternalConfigurationAttributes {
|
|
|
99
99
|
/// Expects `NSString?` value
|
|
100
100
|
static let versionSuffix = "_dd.version_suffix"
|
|
101
101
|
|
|
102
|
+
/// Header key set by the JS layer to indicate the request origin.
|
|
103
|
+
static let trackedByHeaderKey = "x-datadog-tracked-by"
|
|
104
|
+
/// Header value set by the JS layer to indicate the request was tracked by React Native.
|
|
105
|
+
static let trackedByHeaderValue = "react-native"
|
|
106
|
+
|
|
102
107
|
/// Custom attribute of the resource passed from bridge SDK.
|
|
103
108
|
/// It flags the resource as dropped by the user so it can be dropped in the resource mapper.
|
|
104
109
|
/// Expects `Bool` value.
|
|
@@ -319,7 +319,8 @@ public class DdRumImplementation: NSObject {
|
|
|
319
319
|
download: download,
|
|
320
320
|
// no need to define the size here, because if it is missing,
|
|
321
321
|
// it will be taken from the command
|
|
322
|
-
|
|
322
|
+
responseBodySize: nil,
|
|
323
|
+
requestBodySize: nil,
|
|
323
324
|
attributes: [:]
|
|
324
325
|
)
|
|
325
326
|
}
|
|
@@ -169,7 +169,14 @@ public class DdSdkNativeInitialization: NSObject {
|
|
|
169
169
|
sampleRate: Float(
|
|
170
170
|
configuration.rumConfiguration?.resourceTraceSampleRate
|
|
171
171
|
?? DefaultConfiguration.resourceTraceSampleRate)
|
|
172
|
-
)
|
|
172
|
+
),
|
|
173
|
+
resourceAttributesProvider: { request, _, _, _ in
|
|
174
|
+
let trackedBy = request.value(forHTTPHeaderField: InternalConfigurationAttributes.trackedByHeaderKey)
|
|
175
|
+
if trackedBy == InternalConfigurationAttributes.trackedByHeaderValue {
|
|
176
|
+
return [InternalConfigurationAttributes.dropResource: true]
|
|
177
|
+
}
|
|
178
|
+
return nil
|
|
179
|
+
}
|
|
173
180
|
)
|
|
174
181
|
}
|
|
175
182
|
|
|
@@ -22,6 +22,12 @@ public protocol RUMMonitorInternalProtocol {
|
|
|
22
22
|
attributes: [AttributeKey: AttributeValue]
|
|
23
23
|
)
|
|
24
24
|
|
|
25
|
+
func setInternalViewAttribute(
|
|
26
|
+
at time: Date,
|
|
27
|
+
key: AttributeKey,
|
|
28
|
+
value: AttributeValue
|
|
29
|
+
)
|
|
30
|
+
|
|
25
31
|
func addResourceMetrics(
|
|
26
32
|
at time: Date,
|
|
27
33
|
resourceKey: String,
|
|
@@ -32,7 +38,8 @@ public protocol RUMMonitorInternalProtocol {
|
|
|
32
38
|
ssl: (start: Date, end: Date)?,
|
|
33
39
|
firstByte: (start: Date, end: Date)?,
|
|
34
40
|
download: (start: Date, end: Date)?,
|
|
35
|
-
|
|
41
|
+
responseBodySize: (encoded: Int64, decoded: Int64)?,
|
|
42
|
+
requestBodySize: (encoded: Int64, decoded: Int64)?,
|
|
36
43
|
attributes: [AttributeKey: AttributeValue]
|
|
37
44
|
)
|
|
38
45
|
}
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
-
exports.TRACE_ID_HEADER_KEY = exports.TRACESTATE_HEADER_KEY = exports.TRACECONTEXT_HEADER_KEY = exports.TAGS_HEADER_KEY = exports.SAMPLING_PRIORITY_HEADER_KEY = exports.PARENT_ID_HEADER_KEY = exports.ORIGIN_RUM = exports.ORIGIN_HEADER_KEY = exports.DD_TRACE_ID_TAG = exports.DD_RUM_USER_ID_TAG = exports.DD_RUM_SESSION_ID_TAG = exports.DD_RUM_ACCOUNT_ID_TAG = exports.BAGGAGE_HEADER_KEY = exports.B3_MULTI_TRACE_ID_HEADER_KEY = exports.B3_MULTI_SPAN_ID_HEADER_KEY = exports.B3_MULTI_SAMPLED_HEADER_KEY = exports.B3_HEADER_KEY = void 0;
|
|
6
|
+
exports.TRACKED_BY_HEADER_VALUE = exports.TRACKED_BY_HEADER_KEY = exports.TRACE_ID_HEADER_KEY = exports.TRACESTATE_HEADER_KEY = exports.TRACECONTEXT_HEADER_KEY = exports.TAGS_HEADER_KEY = exports.SAMPLING_PRIORITY_HEADER_KEY = exports.PARENT_ID_HEADER_KEY = exports.ORIGIN_RUM = exports.ORIGIN_HEADER_KEY = exports.DD_TRACE_ID_TAG = exports.DD_RUM_USER_ID_TAG = exports.DD_RUM_SESSION_ID_TAG = exports.DD_RUM_ACCOUNT_ID_TAG = exports.BAGGAGE_HEADER_KEY = exports.B3_MULTI_TRACE_ID_HEADER_KEY = exports.B3_MULTI_SPAN_ID_HEADER_KEY = exports.B3_MULTI_SAMPLED_HEADER_KEY = exports.B3_HEADER_KEY = void 0;
|
|
7
7
|
/*
|
|
8
8
|
* Unless explicitly stated otherwise all files in this repository are licensed under the Apache License Version 2.0. This product includes software developed at Datadog (https://www.datadoghq.com/).
|
|
9
9
|
* Copyright 2016-Present Datadog, Inc.
|
|
@@ -14,6 +14,8 @@ exports.TRACE_ID_HEADER_KEY = exports.TRACESTATE_HEADER_KEY = exports.TRACECONTE
|
|
|
14
14
|
*/
|
|
15
15
|
const SAMPLING_PRIORITY_HEADER_KEY = exports.SAMPLING_PRIORITY_HEADER_KEY = 'x-datadog-sampling-priority';
|
|
16
16
|
const ORIGIN_HEADER_KEY = exports.ORIGIN_HEADER_KEY = 'x-datadog-origin';
|
|
17
|
+
const TRACKED_BY_HEADER_KEY = exports.TRACKED_BY_HEADER_KEY = 'x-datadog-tracked-by';
|
|
18
|
+
const TRACKED_BY_HEADER_VALUE = exports.TRACKED_BY_HEADER_VALUE = 'react-native';
|
|
17
19
|
const ORIGIN_RUM = exports.ORIGIN_RUM = 'rum';
|
|
18
20
|
const TRACE_ID_HEADER_KEY = exports.TRACE_ID_HEADER_KEY = 'x-datadog-trace-id';
|
|
19
21
|
const PARENT_ID_HEADER_KEY = exports.PARENT_ID_HEADER_KEY = 'x-datadog-parent-id';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["SAMPLING_PRIORITY_HEADER_KEY","exports","ORIGIN_HEADER_KEY","ORIGIN_RUM","TRACE_ID_HEADER_KEY","PARENT_ID_HEADER_KEY","TAGS_HEADER_KEY","DD_TRACE_ID_TAG","DD_RUM_SESSION_ID_TAG","DD_RUM_USER_ID_TAG","DD_RUM_ACCOUNT_ID_TAG","TRACECONTEXT_HEADER_KEY","TRACESTATE_HEADER_KEY","BAGGAGE_HEADER_KEY","B3_HEADER_KEY","B3_MULTI_TRACE_ID_HEADER_KEY","B3_MULTI_SPAN_ID_HEADER_KEY","B3_MULTI_SAMPLED_HEADER_KEY"],"sourceRoot":"../../../../../../src","sources":["rum/instrumentation/resourceTracking/distributedTracing/headers.ts"],"mappings":";;;;;;AAAA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACO,MAAMA,4BAA4B,GAAAC,OAAA,CAAAD,4BAAA,GAAG,6BAA6B;AAClE,MAAME,iBAAiB,GAAAD,OAAA,CAAAC,iBAAA,GAAG,kBAAkB;AAC5C,MAAMC,
|
|
1
|
+
{"version":3,"names":["SAMPLING_PRIORITY_HEADER_KEY","exports","ORIGIN_HEADER_KEY","TRACKED_BY_HEADER_KEY","TRACKED_BY_HEADER_VALUE","ORIGIN_RUM","TRACE_ID_HEADER_KEY","PARENT_ID_HEADER_KEY","TAGS_HEADER_KEY","DD_TRACE_ID_TAG","DD_RUM_SESSION_ID_TAG","DD_RUM_USER_ID_TAG","DD_RUM_ACCOUNT_ID_TAG","TRACECONTEXT_HEADER_KEY","TRACESTATE_HEADER_KEY","BAGGAGE_HEADER_KEY","B3_HEADER_KEY","B3_MULTI_TRACE_ID_HEADER_KEY","B3_MULTI_SPAN_ID_HEADER_KEY","B3_MULTI_SAMPLED_HEADER_KEY"],"sourceRoot":"../../../../../../src","sources":["rum/instrumentation/resourceTracking/distributedTracing/headers.ts"],"mappings":";;;;;;AAAA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACO,MAAMA,4BAA4B,GAAAC,OAAA,CAAAD,4BAAA,GAAG,6BAA6B;AAClE,MAAME,iBAAiB,GAAAD,OAAA,CAAAC,iBAAA,GAAG,kBAAkB;AAC5C,MAAMC,qBAAqB,GAAAF,OAAA,CAAAE,qBAAA,GAAG,sBAAsB;AACpD,MAAMC,uBAAuB,GAAAH,OAAA,CAAAG,uBAAA,GAAG,cAAc;AAC9C,MAAMC,UAAU,GAAAJ,OAAA,CAAAI,UAAA,GAAG,KAAK;AACxB,MAAMC,mBAAmB,GAAAL,OAAA,CAAAK,mBAAA,GAAG,oBAAoB;AAChD,MAAMC,oBAAoB,GAAAN,OAAA,CAAAM,oBAAA,GAAG,qBAAqB;AAClD,MAAMC,eAAe,GAAAP,OAAA,CAAAO,eAAA,GAAG,gBAAgB;AACxC,MAAMC,eAAe,GAAAR,OAAA,CAAAQ,eAAA,GAAG,WAAW;AACnC,MAAMC,qBAAqB,GAAAT,OAAA,CAAAS,qBAAA,GAAG,YAAY;AAC1C,MAAMC,kBAAkB,GAAAV,OAAA,CAAAU,kBAAA,GAAG,SAAS;AACpC,MAAMC,qBAAqB,GAAAX,OAAA,CAAAW,qBAAA,GAAG,YAAY;;AAEjD;AACA;AACA;AACO,MAAMC,uBAAuB,GAAAZ,OAAA,CAAAY,uBAAA,GAAG,aAAa;AAC7C,MAAMC,qBAAqB,GAAAb,OAAA,CAAAa,qBAAA,GAAG,YAAY;AAC1C,MAAMC,kBAAkB,GAAAd,OAAA,CAAAc,kBAAA,GAAG,SAAS;AACpC,MAAMC,aAAa,GAAAf,OAAA,CAAAe,aAAA,GAAG,IAAI;AAC1B,MAAMC,4BAA4B,GAAAhB,OAAA,CAAAgB,4BAAA,GAAG,cAAc;AACnD,MAAMC,2BAA2B,GAAAjB,OAAA,CAAAiB,2BAAA,GAAG,aAAa;AACjD,MAAMC,2BAA2B,GAAAlB,OAAA,CAAAkB,2BAAA,GAAG,cAAc","ignoreList":[]}
|
|
@@ -108,6 +108,7 @@ const proxySend = providers => {
|
|
|
108
108
|
if (baggageHeader) {
|
|
109
109
|
this.setRequestHeader(_headers2.DATADOG_BAGGAGE_HEADER, baggageHeader);
|
|
110
110
|
}
|
|
111
|
+
this.setRequestHeader(_headers.TRACKED_BY_HEADER_KEY, _headers.TRACKED_BY_HEADER_VALUE);
|
|
111
112
|
}
|
|
112
113
|
proxyOnReadyStateChange(this, providers);
|
|
113
114
|
|
package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_Timer","require","_helper","_distributedTracingHeaders","_distributedTracing","_headers","_graphqlHeaders","_headers2","_RequestProxy","_ResourceReporter","_internalDevResourceBlocklist","_URLHostParser","_baggageHeaderUtils","_responseSize","RESPONSE_START_LABEL","XHRProxy","RequestProxy","constructor","providers","createWithResourceReporter","xhrType","XMLHttpRequest","resourceReporter","ResourceReporter","filterDevResource","onTrackingStart","context","originalXhrOpen","prototype","open","originalXhrSend","send","originalXhrSetRequestHeader","setRequestHeader","proxyRequests","onTrackingStop","exports","proxyOpen","proxySend","proxySetRequestHeader","firstPartyHostsRegexMap","tracingSamplingRate","method","url","hostname","URLHostParser","_datadog_xhr","reported","timer","Timer","graphql","tracingAttributes","getTracingAttributes","rumSessionId","getCachedSessionId","userId","getCachedUserId","accountId","getCachedAccountId","baggageHeaderEntries","Set","apply","arguments","start","tracingHeaders","getTracingHeadersFromAttributes","forEach","header","value","baggageHeader","formatBaggageHeader","DATADOG_BAGGAGE_HEADER","proxyOnReadyStateChange","xhrProxy","originalOnreadystatechange","onreadystatechange","readyState","DONE","reportXhr","HEADERS_RECEIVED","recordTick","responseSize","calculateResponseSize","key","startTime","stop","reportResource","request","kind","graphqlAttributes","response","statusCode","status","size","timings","stopTime","responseStartTime","hasTickFor","timeAt","undefined","resourceContext","sendRequestHeader","toLowerCase","isDatadogCustomHeader","DATADOG_GRAPH_QL_OPERATION_NAME_HEADER","operationName","DATADOG_GRAPH_QL_OPERATION_TYPE_HEADER","operationType","DATADOG_GRAPH_QL_VARIABLES_HEADER","variables","BAGGAGE_HEADER_KEY","add"],"sourceRoot":"../../../../../../../src","sources":["rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.ts"],"mappings":";;;;;;AAMA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,OAAA,GAAAD,OAAA;AAMA,IAAAE,0BAAA,GAAAF,OAAA;AACA,IAAAG,mBAAA,GAAAH,OAAA;AACA,IAAAI,QAAA,GAAAJ,OAAA;
|
|
1
|
+
{"version":3,"names":["_Timer","require","_helper","_distributedTracingHeaders","_distributedTracing","_headers","_graphqlHeaders","_headers2","_RequestProxy","_ResourceReporter","_internalDevResourceBlocklist","_URLHostParser","_baggageHeaderUtils","_responseSize","RESPONSE_START_LABEL","XHRProxy","RequestProxy","constructor","providers","createWithResourceReporter","xhrType","XMLHttpRequest","resourceReporter","ResourceReporter","filterDevResource","onTrackingStart","context","originalXhrOpen","prototype","open","originalXhrSend","send","originalXhrSetRequestHeader","setRequestHeader","proxyRequests","onTrackingStop","exports","proxyOpen","proxySend","proxySetRequestHeader","firstPartyHostsRegexMap","tracingSamplingRate","method","url","hostname","URLHostParser","_datadog_xhr","reported","timer","Timer","graphql","tracingAttributes","getTracingAttributes","rumSessionId","getCachedSessionId","userId","getCachedUserId","accountId","getCachedAccountId","baggageHeaderEntries","Set","apply","arguments","start","tracingHeaders","getTracingHeadersFromAttributes","forEach","header","value","baggageHeader","formatBaggageHeader","DATADOG_BAGGAGE_HEADER","TRACKED_BY_HEADER_KEY","TRACKED_BY_HEADER_VALUE","proxyOnReadyStateChange","xhrProxy","originalOnreadystatechange","onreadystatechange","readyState","DONE","reportXhr","HEADERS_RECEIVED","recordTick","responseSize","calculateResponseSize","key","startTime","stop","reportResource","request","kind","graphqlAttributes","response","statusCode","status","size","timings","stopTime","responseStartTime","hasTickFor","timeAt","undefined","resourceContext","sendRequestHeader","toLowerCase","isDatadogCustomHeader","DATADOG_GRAPH_QL_OPERATION_NAME_HEADER","operationName","DATADOG_GRAPH_QL_OPERATION_TYPE_HEADER","operationType","DATADOG_GRAPH_QL_VARIABLES_HEADER","variables","BAGGAGE_HEADER_KEY","add"],"sourceRoot":"../../../../../../../src","sources":["rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -23,7 +23,7 @@ class DdTraceWrapper {
|
|
|
23
23
|
nativeTrace = require('../specs/NativeDdTrace').default;
|
|
24
24
|
startSpan = (operation, context = {}, timestampMs = timeProvider.now()) => {
|
|
25
25
|
const spanId = (0, _bufferNativeCall.bufferNativeCallReturningId)(() => this.nativeTrace.startSpan(operation, (0, _attributesEncoding.encodeAttributes)(context), timestampMs));
|
|
26
|
-
_InternalLog.InternalLog.log(`Starting span “${operation}
|
|
26
|
+
_InternalLog.InternalLog.log(`Starting span “${operation}”`, _SdkVerbosity.SdkVerbosity.DEBUG);
|
|
27
27
|
return spanId;
|
|
28
28
|
};
|
|
29
29
|
finishSpan = (spanId, context = {}, timestampMs = timeProvider.now()) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_InternalLog","require","_SdkVerbosity","_attributesEncoding","_bufferNativeCall","_singletonUtils","_DefaultTimeProvider","TRACE_MODULE","timeProvider","DefaultTimeProvider","DdTraceWrapper","nativeTrace","default","startSpan","operation","context","timestampMs","now","spanId","bufferNativeCallReturningId","encodeAttributes","InternalLog","log","SdkVerbosity","DEBUG","finishSpan","bufferNativeCallWithId","id","DdTrace","exports","getGlobalInstance"],"sourceRoot":"../../../src","sources":["trace/DdTrace.ts"],"mappings":";;;;;;AAMA,IAAAA,YAAA,GAAAC,OAAA;AACA,IAAAC,aAAA,GAAAD,OAAA;AAEA,IAAAE,mBAAA,GAAAF,OAAA;AACA,IAAAG,iBAAA,GAAAH,OAAA;AAKA,IAAAI,eAAA,GAAAJ,OAAA;AACA,IAAAK,oBAAA,GAAAL,OAAA;AAhBA;AACA;AACA;AACA;AACA;;AAcA,MAAMM,YAAY,GAAG,+BAA+B;AAEpD,MAAMC,YAAY,GAAG,IAAIC,wCAAmB,CAAC,CAAC;AAE9C,MAAMC,cAAc,CAAwB;EACxC;EACQC,WAAW,GAAsBV,OAAO,CAAC,wBAAwB,CAAC,CACrEW,OAAO;EAEZC,SAAS,GAAGA,CACRC,SAAiB,EACjBC,OAAe,GAAG,CAAC,CAAC,EACpBC,WAAmB,GAAGR,YAAY,CAACS,GAAG,CAAC,CAAC,KACtB;IAClB,MAAMC,MAAM,GAAG,IAAAC,6CAA2B,EAAC,MACvC,IAAI,CAACR,WAAW,CAACE,SAAS,CACtBC,SAAS,EACT,IAAAM,oCAAgB,EAACL,OAAO,CAAC,EACzBC,WACJ,CACJ,CAAC;IACDK,wBAAW,CAACC,GAAG,
|
|
1
|
+
{"version":3,"names":["_InternalLog","require","_SdkVerbosity","_attributesEncoding","_bufferNativeCall","_singletonUtils","_DefaultTimeProvider","TRACE_MODULE","timeProvider","DefaultTimeProvider","DdTraceWrapper","nativeTrace","default","startSpan","operation","context","timestampMs","now","spanId","bufferNativeCallReturningId","encodeAttributes","InternalLog","log","SdkVerbosity","DEBUG","finishSpan","bufferNativeCallWithId","id","DdTrace","exports","getGlobalInstance"],"sourceRoot":"../../../src","sources":["trace/DdTrace.ts"],"mappings":";;;;;;AAMA,IAAAA,YAAA,GAAAC,OAAA;AACA,IAAAC,aAAA,GAAAD,OAAA;AAEA,IAAAE,mBAAA,GAAAF,OAAA;AACA,IAAAG,iBAAA,GAAAH,OAAA;AAKA,IAAAI,eAAA,GAAAJ,OAAA;AACA,IAAAK,oBAAA,GAAAL,OAAA;AAhBA;AACA;AACA;AACA;AACA;;AAcA,MAAMM,YAAY,GAAG,+BAA+B;AAEpD,MAAMC,YAAY,GAAG,IAAIC,wCAAmB,CAAC,CAAC;AAE9C,MAAMC,cAAc,CAAwB;EACxC;EACQC,WAAW,GAAsBV,OAAO,CAAC,wBAAwB,CAAC,CACrEW,OAAO;EAEZC,SAAS,GAAGA,CACRC,SAAiB,EACjBC,OAAe,GAAG,CAAC,CAAC,EACpBC,WAAmB,GAAGR,YAAY,CAACS,GAAG,CAAC,CAAC,KACtB;IAClB,MAAMC,MAAM,GAAG,IAAAC,6CAA2B,EAAC,MACvC,IAAI,CAACR,WAAW,CAACE,SAAS,CACtBC,SAAS,EACT,IAAAM,oCAAgB,EAACL,OAAO,CAAC,EACzBC,WACJ,CACJ,CAAC;IACDK,wBAAW,CAACC,GAAG,CAAC,kBAAkBR,SAAS,GAAG,EAAES,0BAAY,CAACC,KAAK,CAAC;IACnE,OAAON,MAAM;EACjB,CAAC;EAEDO,UAAU,GAAGA,CACTP,MAAc,EACdH,OAAe,GAAG,CAAC,CAAC,EACpBC,WAAmB,GAAGR,YAAY,CAACS,GAAG,CAAC,CAAC,KACxB;IAChBI,wBAAW,CAACC,GAAG,CAAC,mBAAmBJ,MAAM,EAAE,EAAEK,0BAAY,CAACC,KAAK,CAAC;IAChE,OAAO,IAAAE,wCAAsB,EACzBC,EAAE,IACE,IAAI,CAAChB,WAAW,CAACc,UAAU,CACvBE,EAAE,EACF,IAAAP,oCAAgB,EAACL,OAAO,CAAC,EACzBC,WACJ,CAAC,EACLE,MACJ,CAAC;EACL,CAAC;AACL;AAEO,MAAMU,OAAoB,GAAAC,OAAA,CAAAD,OAAA,GAAG,IAAAE,iCAAiB,EACjDvB,YAAY,EACZ,MAAM,IAAIG,cAAc,CAAC,CAC7B,CAAC","ignoreList":[]}
|
package/lib/commonjs/version.js
CHANGED
|
@@ -8,6 +8,8 @@
|
|
|
8
8
|
*/
|
|
9
9
|
export const SAMPLING_PRIORITY_HEADER_KEY = 'x-datadog-sampling-priority';
|
|
10
10
|
export const ORIGIN_HEADER_KEY = 'x-datadog-origin';
|
|
11
|
+
export const TRACKED_BY_HEADER_KEY = 'x-datadog-tracked-by';
|
|
12
|
+
export const TRACKED_BY_HEADER_VALUE = 'react-native';
|
|
11
13
|
export const ORIGIN_RUM = 'rum';
|
|
12
14
|
export const TRACE_ID_HEADER_KEY = 'x-datadog-trace-id';
|
|
13
15
|
export const PARENT_ID_HEADER_KEY = 'x-datadog-parent-id';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["SAMPLING_PRIORITY_HEADER_KEY","ORIGIN_HEADER_KEY","ORIGIN_RUM","TRACE_ID_HEADER_KEY","PARENT_ID_HEADER_KEY","TAGS_HEADER_KEY","DD_TRACE_ID_TAG","DD_RUM_SESSION_ID_TAG","DD_RUM_USER_ID_TAG","DD_RUM_ACCOUNT_ID_TAG","TRACECONTEXT_HEADER_KEY","TRACESTATE_HEADER_KEY","BAGGAGE_HEADER_KEY","B3_HEADER_KEY","B3_MULTI_TRACE_ID_HEADER_KEY","B3_MULTI_SPAN_ID_HEADER_KEY","B3_MULTI_SAMPLED_HEADER_KEY"],"sourceRoot":"../../../../../../src","sources":["rum/instrumentation/resourceTracking/distributedTracing/headers.ts"],"mappings":"AAAA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA,OAAO,MAAMA,4BAA4B,GAAG,6BAA6B;AACzE,OAAO,MAAMC,iBAAiB,GAAG,kBAAkB;AACnD,OAAO,MAAMC,UAAU,GAAG,KAAK;AAC/B,OAAO,MAAMC,mBAAmB,GAAG,oBAAoB;AACvD,OAAO,MAAMC,oBAAoB,GAAG,qBAAqB;AACzD,OAAO,MAAMC,eAAe,GAAG,gBAAgB;AAC/C,OAAO,MAAMC,eAAe,GAAG,WAAW;AAC1C,OAAO,MAAMC,qBAAqB,GAAG,YAAY;AACjD,OAAO,MAAMC,kBAAkB,GAAG,SAAS;AAC3C,OAAO,MAAMC,qBAAqB,GAAG,YAAY;;AAEjD;AACA;AACA;AACA,OAAO,MAAMC,uBAAuB,GAAG,aAAa;AACpD,OAAO,MAAMC,qBAAqB,GAAG,YAAY;AACjD,OAAO,MAAMC,kBAAkB,GAAG,SAAS;AAC3C,OAAO,MAAMC,aAAa,GAAG,IAAI;AACjC,OAAO,MAAMC,4BAA4B,GAAG,cAAc;AAC1D,OAAO,MAAMC,2BAA2B,GAAG,aAAa;AACxD,OAAO,MAAMC,2BAA2B,GAAG,cAAc","ignoreList":[]}
|
|
1
|
+
{"version":3,"names":["SAMPLING_PRIORITY_HEADER_KEY","ORIGIN_HEADER_KEY","TRACKED_BY_HEADER_KEY","TRACKED_BY_HEADER_VALUE","ORIGIN_RUM","TRACE_ID_HEADER_KEY","PARENT_ID_HEADER_KEY","TAGS_HEADER_KEY","DD_TRACE_ID_TAG","DD_RUM_SESSION_ID_TAG","DD_RUM_USER_ID_TAG","DD_RUM_ACCOUNT_ID_TAG","TRACECONTEXT_HEADER_KEY","TRACESTATE_HEADER_KEY","BAGGAGE_HEADER_KEY","B3_HEADER_KEY","B3_MULTI_TRACE_ID_HEADER_KEY","B3_MULTI_SPAN_ID_HEADER_KEY","B3_MULTI_SAMPLED_HEADER_KEY"],"sourceRoot":"../../../../../../src","sources":["rum/instrumentation/resourceTracking/distributedTracing/headers.ts"],"mappings":"AAAA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA,OAAO,MAAMA,4BAA4B,GAAG,6BAA6B;AACzE,OAAO,MAAMC,iBAAiB,GAAG,kBAAkB;AACnD,OAAO,MAAMC,qBAAqB,GAAG,sBAAsB;AAC3D,OAAO,MAAMC,uBAAuB,GAAG,cAAc;AACrD,OAAO,MAAMC,UAAU,GAAG,KAAK;AAC/B,OAAO,MAAMC,mBAAmB,GAAG,oBAAoB;AACvD,OAAO,MAAMC,oBAAoB,GAAG,qBAAqB;AACzD,OAAO,MAAMC,eAAe,GAAG,gBAAgB;AAC/C,OAAO,MAAMC,eAAe,GAAG,WAAW;AAC1C,OAAO,MAAMC,qBAAqB,GAAG,YAAY;AACjD,OAAO,MAAMC,kBAAkB,GAAG,SAAS;AAC3C,OAAO,MAAMC,qBAAqB,GAAG,YAAY;;AAEjD;AACA;AACA;AACA,OAAO,MAAMC,uBAAuB,GAAG,aAAa;AACpD,OAAO,MAAMC,qBAAqB,GAAG,YAAY;AACjD,OAAO,MAAMC,kBAAkB,GAAG,SAAS;AAC3C,OAAO,MAAMC,aAAa,GAAG,IAAI;AACjC,OAAO,MAAMC,4BAA4B,GAAG,cAAc;AAC1D,OAAO,MAAMC,2BAA2B,GAAG,aAAa;AACxD,OAAO,MAAMC,2BAA2B,GAAG,cAAc","ignoreList":[]}
|
|
@@ -8,7 +8,7 @@ import { Timer } from '../../../../../utils/Timer';
|
|
|
8
8
|
import { getCachedAccountId, getCachedSessionId, getCachedUserId } from '../../../../helper';
|
|
9
9
|
import { getTracingHeadersFromAttributes } from '../../distributedTracing/distributedTracingHeaders';
|
|
10
10
|
import { getTracingAttributes } from '../../distributedTracing/distributedTracing';
|
|
11
|
-
import { BAGGAGE_HEADER_KEY } from '../../distributedTracing/headers';
|
|
11
|
+
import { BAGGAGE_HEADER_KEY, TRACKED_BY_HEADER_KEY, TRACKED_BY_HEADER_VALUE } from '../../distributedTracing/headers';
|
|
12
12
|
import { DATADOG_GRAPH_QL_OPERATION_NAME_HEADER, DATADOG_GRAPH_QL_OPERATION_TYPE_HEADER, DATADOG_GRAPH_QL_VARIABLES_HEADER } from '../../graphql/graphqlHeaders';
|
|
13
13
|
import { DATADOG_BAGGAGE_HEADER, isDatadogCustomHeader } from '../../headers';
|
|
14
14
|
import { RequestProxy } from '../interfaces/RequestProxy';
|
|
@@ -101,6 +101,7 @@ const proxySend = providers => {
|
|
|
101
101
|
if (baggageHeader) {
|
|
102
102
|
this.setRequestHeader(DATADOG_BAGGAGE_HEADER, baggageHeader);
|
|
103
103
|
}
|
|
104
|
+
this.setRequestHeader(TRACKED_BY_HEADER_KEY, TRACKED_BY_HEADER_VALUE);
|
|
104
105
|
}
|
|
105
106
|
proxyOnReadyStateChange(this, providers);
|
|
106
107
|
|
package/lib/module/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["Timer","getCachedAccountId","getCachedSessionId","getCachedUserId","getTracingHeadersFromAttributes","getTracingAttributes","BAGGAGE_HEADER_KEY","DATADOG_GRAPH_QL_OPERATION_NAME_HEADER","DATADOG_GRAPH_QL_OPERATION_TYPE_HEADER","DATADOG_GRAPH_QL_VARIABLES_HEADER","DATADOG_BAGGAGE_HEADER","isDatadogCustomHeader","RequestProxy","ResourceReporter","filterDevResource","URLHostParser","formatBaggageHeader","calculateResponseSize","RESPONSE_START_LABEL","XHRProxy","constructor","providers","createWithResourceReporter","xhrType","XMLHttpRequest","resourceReporter","onTrackingStart","context","originalXhrOpen","prototype","open","originalXhrSend","send","originalXhrSetRequestHeader","setRequestHeader","proxyRequests","onTrackingStop","proxyOpen","proxySend","proxySetRequestHeader","firstPartyHostsRegexMap","tracingSamplingRate","method","url","hostname","_datadog_xhr","reported","timer","graphql","tracingAttributes","rumSessionId","userId","accountId","baggageHeaderEntries","Set","apply","arguments","start","tracingHeaders","forEach","header","value","baggageHeader","proxyOnReadyStateChange","xhrProxy","originalOnreadystatechange","onreadystatechange","readyState","DONE","reportXhr","HEADERS_RECEIVED","recordTick","responseSize","key","startTime","stop","reportResource","request","kind","graphqlAttributes","response","statusCode","status","size","timings","stopTime","responseStartTime","hasTickFor","timeAt","undefined","resourceContext","sendRequestHeader","toLowerCase","operationName","operationType","variables","add"],"sourceRoot":"../../../../../../../src","sources":["rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.ts"],"mappings":"AAAA;AACA;AACA;AACA;AACA;;AAEA,SAASA,KAAK,QAAQ,4BAA4B;AAClD,SACIC,kBAAkB,EAClBC,kBAAkB,EAClBC,eAAe,QACZ,oBAAoB;AAE3B,SAASC,+BAA+B,QAAQ,oDAAoD;AACpG,SAASC,oBAAoB,QAAQ,6CAA6C;AAClF,
|
|
1
|
+
{"version":3,"names":["Timer","getCachedAccountId","getCachedSessionId","getCachedUserId","getTracingHeadersFromAttributes","getTracingAttributes","BAGGAGE_HEADER_KEY","TRACKED_BY_HEADER_KEY","TRACKED_BY_HEADER_VALUE","DATADOG_GRAPH_QL_OPERATION_NAME_HEADER","DATADOG_GRAPH_QL_OPERATION_TYPE_HEADER","DATADOG_GRAPH_QL_VARIABLES_HEADER","DATADOG_BAGGAGE_HEADER","isDatadogCustomHeader","RequestProxy","ResourceReporter","filterDevResource","URLHostParser","formatBaggageHeader","calculateResponseSize","RESPONSE_START_LABEL","XHRProxy","constructor","providers","createWithResourceReporter","xhrType","XMLHttpRequest","resourceReporter","onTrackingStart","context","originalXhrOpen","prototype","open","originalXhrSend","send","originalXhrSetRequestHeader","setRequestHeader","proxyRequests","onTrackingStop","proxyOpen","proxySend","proxySetRequestHeader","firstPartyHostsRegexMap","tracingSamplingRate","method","url","hostname","_datadog_xhr","reported","timer","graphql","tracingAttributes","rumSessionId","userId","accountId","baggageHeaderEntries","Set","apply","arguments","start","tracingHeaders","forEach","header","value","baggageHeader","proxyOnReadyStateChange","xhrProxy","originalOnreadystatechange","onreadystatechange","readyState","DONE","reportXhr","HEADERS_RECEIVED","recordTick","responseSize","key","startTime","stop","reportResource","request","kind","graphqlAttributes","response","statusCode","status","size","timings","stopTime","responseStartTime","hasTickFor","timeAt","undefined","resourceContext","sendRequestHeader","toLowerCase","operationName","operationType","variables","add"],"sourceRoot":"../../../../../../../src","sources":["rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -17,7 +17,7 @@ class DdTraceWrapper {
|
|
|
17
17
|
nativeTrace = require('../specs/NativeDdTrace').default;
|
|
18
18
|
startSpan = (operation, context = {}, timestampMs = timeProvider.now()) => {
|
|
19
19
|
const spanId = bufferNativeCallReturningId(() => this.nativeTrace.startSpan(operation, encodeAttributes(context), timestampMs));
|
|
20
|
-
InternalLog.log(`Starting span “${operation}
|
|
20
|
+
InternalLog.log(`Starting span “${operation}”`, SdkVerbosity.DEBUG);
|
|
21
21
|
return spanId;
|
|
22
22
|
};
|
|
23
23
|
finishSpan = (spanId, context = {}, timestampMs = timeProvider.now()) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["InternalLog","SdkVerbosity","encodeAttributes","bufferNativeCallReturningId","bufferNativeCallWithId","getGlobalInstance","DefaultTimeProvider","TRACE_MODULE","timeProvider","DdTraceWrapper","nativeTrace","require","default","startSpan","operation","context","timestampMs","now","spanId","log","DEBUG","finishSpan","id","DdTrace"],"sourceRoot":"../../../src","sources":["trace/DdTrace.ts"],"mappings":"AAAA;AACA;AACA;AACA;AACA;;AAEA,SAASA,WAAW,QAAQ,gBAAgB;AAC5C,SAASC,YAAY,QAAQ,8BAA8B;AAE3D,SAASC,gBAAgB,QAAQ,8CAA8C;AAC/E,SACIC,2BAA2B,EAC3BC,sBAAsB,QACnB,gDAAgD;AAEvD,SAASC,iBAAiB,QAAQ,yBAAyB;AAC3D,SAASC,mBAAmB,QAAQ,4CAA4C;AAEhF,MAAMC,YAAY,GAAG,+BAA+B;AAEpD,MAAMC,YAAY,GAAG,IAAIF,mBAAmB,CAAC,CAAC;AAE9C,MAAMG,cAAc,CAAwB;EACxC;EACQC,WAAW,GAAsBC,OAAO,CAAC,wBAAwB,CAAC,CACrEC,OAAO;EAEZC,SAAS,GAAGA,CACRC,SAAiB,EACjBC,OAAe,GAAG,CAAC,CAAC,EACpBC,WAAmB,GAAGR,YAAY,CAACS,GAAG,CAAC,CAAC,KACtB;IAClB,MAAMC,MAAM,GAAGf,2BAA2B,CAAC,MACvC,IAAI,CAACO,WAAW,CAACG,SAAS,CACtBC,SAAS,EACTZ,gBAAgB,CAACa,OAAO,CAAC,EACzBC,WACJ,CACJ,CAAC;IACDhB,WAAW,CAACmB,GAAG,
|
|
1
|
+
{"version":3,"names":["InternalLog","SdkVerbosity","encodeAttributes","bufferNativeCallReturningId","bufferNativeCallWithId","getGlobalInstance","DefaultTimeProvider","TRACE_MODULE","timeProvider","DdTraceWrapper","nativeTrace","require","default","startSpan","operation","context","timestampMs","now","spanId","log","DEBUG","finishSpan","id","DdTrace"],"sourceRoot":"../../../src","sources":["trace/DdTrace.ts"],"mappings":"AAAA;AACA;AACA;AACA;AACA;;AAEA,SAASA,WAAW,QAAQ,gBAAgB;AAC5C,SAASC,YAAY,QAAQ,8BAA8B;AAE3D,SAASC,gBAAgB,QAAQ,8CAA8C;AAC/E,SACIC,2BAA2B,EAC3BC,sBAAsB,QACnB,gDAAgD;AAEvD,SAASC,iBAAiB,QAAQ,yBAAyB;AAC3D,SAASC,mBAAmB,QAAQ,4CAA4C;AAEhF,MAAMC,YAAY,GAAG,+BAA+B;AAEpD,MAAMC,YAAY,GAAG,IAAIF,mBAAmB,CAAC,CAAC;AAE9C,MAAMG,cAAc,CAAwB;EACxC;EACQC,WAAW,GAAsBC,OAAO,CAAC,wBAAwB,CAAC,CACrEC,OAAO;EAEZC,SAAS,GAAGA,CACRC,SAAiB,EACjBC,OAAe,GAAG,CAAC,CAAC,EACpBC,WAAmB,GAAGR,YAAY,CAACS,GAAG,CAAC,CAAC,KACtB;IAClB,MAAMC,MAAM,GAAGf,2BAA2B,CAAC,MACvC,IAAI,CAACO,WAAW,CAACG,SAAS,CACtBC,SAAS,EACTZ,gBAAgB,CAACa,OAAO,CAAC,EACzBC,WACJ,CACJ,CAAC;IACDhB,WAAW,CAACmB,GAAG,CAAC,kBAAkBL,SAAS,GAAG,EAAEb,YAAY,CAACmB,KAAK,CAAC;IACnE,OAAOF,MAAM;EACjB,CAAC;EAEDG,UAAU,GAAGA,CACTH,MAAc,EACdH,OAAe,GAAG,CAAC,CAAC,EACpBC,WAAmB,GAAGR,YAAY,CAACS,GAAG,CAAC,CAAC,KACxB;IAChBjB,WAAW,CAACmB,GAAG,CAAC,mBAAmBD,MAAM,EAAE,EAAEjB,YAAY,CAACmB,KAAK,CAAC;IAChE,OAAOhB,sBAAsB,CACzBkB,EAAE,IACE,IAAI,CAACZ,WAAW,CAACW,UAAU,CACvBC,EAAE,EACFpB,gBAAgB,CAACa,OAAO,CAAC,EACzBC,WACJ,CAAC,EACLE,MACJ,CAAC;EACL,CAAC;AACL;AAEA,OAAO,MAAMK,OAAoB,GAAGlB,iBAAiB,CACjDE,YAAY,EACZ,MAAM,IAAIE,cAAc,CAAC,CAC7B,CAAC","ignoreList":[]}
|
package/lib/module/version.js
CHANGED
|
@@ -3,6 +3,8 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export declare const SAMPLING_PRIORITY_HEADER_KEY = "x-datadog-sampling-priority";
|
|
5
5
|
export declare const ORIGIN_HEADER_KEY = "x-datadog-origin";
|
|
6
|
+
export declare const TRACKED_BY_HEADER_KEY = "x-datadog-tracked-by";
|
|
7
|
+
export declare const TRACKED_BY_HEADER_VALUE = "react-native";
|
|
6
8
|
export declare const ORIGIN_RUM = "rum";
|
|
7
9
|
export declare const TRACE_ID_HEADER_KEY = "x-datadog-trace-id";
|
|
8
10
|
export declare const PARENT_ID_HEADER_KEY = "x-datadog-parent-id";
|
package/lib/typescript/rum/instrumentation/resourceTracking/distributedTracing/headers.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"headers.d.ts","sourceRoot":"","sources":["../../../../../../src/rum/instrumentation/resourceTracking/distributedTracing/headers.ts"],"names":[],"mappings":"AAKA;;GAEG;AACH,eAAO,MAAM,4BAA4B,gCAAgC,CAAC;AAC1E,eAAO,MAAM,iBAAiB,qBAAqB,CAAC;AACpD,eAAO,MAAM,UAAU,QAAQ,CAAC;AAChC,eAAO,MAAM,mBAAmB,uBAAuB,CAAC;AACxD,eAAO,MAAM,oBAAoB,wBAAwB,CAAC;AAC1D,eAAO,MAAM,eAAe,mBAAmB,CAAC;AAChD,eAAO,MAAM,eAAe,cAAc,CAAC;AAC3C,eAAO,MAAM,qBAAqB,eAAe,CAAC;AAClD,eAAO,MAAM,kBAAkB,YAAY,CAAC;AAC5C,eAAO,MAAM,qBAAqB,eAAe,CAAC;AAElD;;GAEG;AACH,eAAO,MAAM,uBAAuB,gBAAgB,CAAC;AACrD,eAAO,MAAM,qBAAqB,eAAe,CAAC;AAClD,eAAO,MAAM,kBAAkB,YAAY,CAAC;AAC5C,eAAO,MAAM,aAAa,OAAO,CAAC;AAClC,eAAO,MAAM,4BAA4B,iBAAiB,CAAC;AAC3D,eAAO,MAAM,2BAA2B,gBAAgB,CAAC;AACzD,eAAO,MAAM,2BAA2B,iBAAiB,CAAC"}
|
|
1
|
+
{"version":3,"file":"headers.d.ts","sourceRoot":"","sources":["../../../../../../src/rum/instrumentation/resourceTracking/distributedTracing/headers.ts"],"names":[],"mappings":"AAKA;;GAEG;AACH,eAAO,MAAM,4BAA4B,gCAAgC,CAAC;AAC1E,eAAO,MAAM,iBAAiB,qBAAqB,CAAC;AACpD,eAAO,MAAM,qBAAqB,yBAAyB,CAAC;AAC5D,eAAO,MAAM,uBAAuB,iBAAiB,CAAC;AACtD,eAAO,MAAM,UAAU,QAAQ,CAAC;AAChC,eAAO,MAAM,mBAAmB,uBAAuB,CAAC;AACxD,eAAO,MAAM,oBAAoB,wBAAwB,CAAC;AAC1D,eAAO,MAAM,eAAe,mBAAmB,CAAC;AAChD,eAAO,MAAM,eAAe,cAAc,CAAC;AAC3C,eAAO,MAAM,qBAAqB,eAAe,CAAC;AAClD,eAAO,MAAM,kBAAkB,YAAY,CAAC;AAC5C,eAAO,MAAM,qBAAqB,eAAe,CAAC;AAElD;;GAEG;AACH,eAAO,MAAM,uBAAuB,gBAAgB,CAAC;AACrD,eAAO,MAAM,qBAAqB,eAAe,CAAC;AAClD,eAAO,MAAM,kBAAkB,YAAY,CAAC;AAC5C,eAAO,MAAM,aAAa,OAAO,CAAC;AAClC,eAAO,MAAM,4BAA4B,iBAAiB,CAAC;AAC3D,eAAO,MAAM,2BAA2B,gBAAgB,CAAC;AACzD,eAAO,MAAM,2BAA2B,iBAAiB,CAAC"}
|
package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"XHRProxy.d.ts","sourceRoot":"","sources":["../../../../../../../src/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"XHRProxy.d.ts","sourceRoot":"","sources":["../../../../../../../src/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.ts"],"names":[],"mappings":"AA0BA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAE1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,uCAAuC,CAAC;AA0BzE,UAAU,iBAAiB;IACvB,OAAO,EAAE,OAAO,cAAc,CAAC;IAC/B,gBAAgB,EAAE,gBAAgB,CAAC;CACtC;AAED;;GAEG;AACH,qBAAa,QAAS,SAAQ,YAAY;IACtC,OAAO,CAAC,SAAS,CAAoB;IACrC,OAAO,CAAC,MAAM,CAAC,eAAe,CAAuC;IACrE,OAAO,CAAC,MAAM,CAAC,eAAe,CAAuC;IACrE,OAAO,CAAC,MAAM,CAAC,2BAA2B,CAAmD;gBAEjF,SAAS,EAAE,iBAAiB;IAKxC,MAAM,CAAC,0BAA0B;IAOjC,eAAe,YAAa,mBAAmB,UAK7C;IAEF,cAAc,aAKZ;CACL"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DdTrace.d.ts","sourceRoot":"","sources":["../../../src/trace/DdTrace.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"DdTrace.d.ts","sourceRoot":"","sources":["../../../src/trace/DdTrace.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AA+C5C,eAAO,MAAM,OAAO,EAAE,WAGrB,CAAC"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const version = "3.
|
|
1
|
+
export declare const version = "3.2.0";
|
|
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.
|
|
3
|
+
"version": "3.2.0",
|
|
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": "f536944e1d1f58d7e75b28bbed9dfb99288e1816"
|
|
122
122
|
}
|
|
@@ -8,6 +8,8 @@
|
|
|
8
8
|
*/
|
|
9
9
|
export const SAMPLING_PRIORITY_HEADER_KEY = 'x-datadog-sampling-priority';
|
|
10
10
|
export const ORIGIN_HEADER_KEY = 'x-datadog-origin';
|
|
11
|
+
export const TRACKED_BY_HEADER_KEY = 'x-datadog-tracked-by';
|
|
12
|
+
export const TRACKED_BY_HEADER_VALUE = 'react-native';
|
|
11
13
|
export const ORIGIN_RUM = 'rum';
|
|
12
14
|
export const TRACE_ID_HEADER_KEY = 'x-datadog-trace-id';
|
|
13
15
|
export const PARENT_ID_HEADER_KEY = 'x-datadog-parent-id';
|
|
@@ -13,7 +13,11 @@ import {
|
|
|
13
13
|
import type { DdRumResourceTracingAttributes } from '../../distributedTracing/distributedTracingAttributes';
|
|
14
14
|
import { getTracingHeadersFromAttributes } from '../../distributedTracing/distributedTracingHeaders';
|
|
15
15
|
import { getTracingAttributes } from '../../distributedTracing/distributedTracing';
|
|
16
|
-
import {
|
|
16
|
+
import {
|
|
17
|
+
BAGGAGE_HEADER_KEY,
|
|
18
|
+
TRACKED_BY_HEADER_KEY,
|
|
19
|
+
TRACKED_BY_HEADER_VALUE
|
|
20
|
+
} from '../../distributedTracing/headers';
|
|
17
21
|
import {
|
|
18
22
|
DATADOG_GRAPH_QL_OPERATION_NAME_HEADER,
|
|
19
23
|
DATADOG_GRAPH_QL_OPERATION_TYPE_HEADER,
|
|
@@ -161,6 +165,11 @@ const proxySend = (providers: XHRProxyProviders): void => {
|
|
|
161
165
|
if (baggageHeader) {
|
|
162
166
|
this.setRequestHeader(DATADOG_BAGGAGE_HEADER, baggageHeader);
|
|
163
167
|
}
|
|
168
|
+
|
|
169
|
+
this.setRequestHeader(
|
|
170
|
+
TRACKED_BY_HEADER_KEY,
|
|
171
|
+
TRACKED_BY_HEADER_VALUE
|
|
172
|
+
);
|
|
164
173
|
}
|
|
165
174
|
|
|
166
175
|
proxyOnReadyStateChange(this, providers);
|
package/src/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/__tests__/XHRProxy.test.ts
CHANGED
|
@@ -33,7 +33,9 @@ import {
|
|
|
33
33
|
ORIGIN_HEADER_KEY,
|
|
34
34
|
TRACESTATE_HEADER_KEY,
|
|
35
35
|
TAGS_HEADER_KEY,
|
|
36
|
-
BAGGAGE_HEADER_KEY
|
|
36
|
+
BAGGAGE_HEADER_KEY,
|
|
37
|
+
TRACKED_BY_HEADER_KEY,
|
|
38
|
+
TRACKED_BY_HEADER_VALUE
|
|
37
39
|
} from '../../../distributedTracing/headers';
|
|
38
40
|
import {
|
|
39
41
|
DATADOG_GRAPH_QL_OPERATION_NAME_HEADER,
|
|
@@ -452,6 +454,57 @@ describe('XHRProxy', () => {
|
|
|
452
454
|
);
|
|
453
455
|
});
|
|
454
456
|
|
|
457
|
+
it('adds the x-datadog-tracked-by header for first party host requests', async () => {
|
|
458
|
+
// GIVEN
|
|
459
|
+
const method = 'GET';
|
|
460
|
+
const url = 'https://api.example.com/v2/user';
|
|
461
|
+
xhrProxy.onTrackingStart({
|
|
462
|
+
tracingSamplingRate: 100,
|
|
463
|
+
firstPartyHostsRegexMap: firstPartyHostsRegexMapBuilder([
|
|
464
|
+
{
|
|
465
|
+
match: 'api.example.com',
|
|
466
|
+
propagatorTypes: [PropagatorType.DATADOG]
|
|
467
|
+
}
|
|
468
|
+
])
|
|
469
|
+
});
|
|
470
|
+
|
|
471
|
+
// WHEN
|
|
472
|
+
const xhr = new XMLHttpRequestMock();
|
|
473
|
+
xhr.open(method, url);
|
|
474
|
+
xhr.send();
|
|
475
|
+
xhr.notifyResponseArrived();
|
|
476
|
+
xhr.complete(200, 'ok');
|
|
477
|
+
await flushPromises();
|
|
478
|
+
|
|
479
|
+
// THEN
|
|
480
|
+
expect(xhr.requestHeaders.get(TRACKED_BY_HEADER_KEY)).toBe(
|
|
481
|
+
TRACKED_BY_HEADER_VALUE
|
|
482
|
+
);
|
|
483
|
+
});
|
|
484
|
+
|
|
485
|
+
it('adds the x-datadog-tracked-by header for non-first party host requests', async () => {
|
|
486
|
+
// GIVEN
|
|
487
|
+
const method = 'GET';
|
|
488
|
+
const url = 'https://api.example.com/v2/user';
|
|
489
|
+
xhrProxy.onTrackingStart({
|
|
490
|
+
tracingSamplingRate: 100,
|
|
491
|
+
firstPartyHostsRegexMap: firstPartyHostsRegexMapBuilder([])
|
|
492
|
+
});
|
|
493
|
+
|
|
494
|
+
// WHEN
|
|
495
|
+
const xhr = new XMLHttpRequestMock();
|
|
496
|
+
xhr.open(method, url);
|
|
497
|
+
xhr.send();
|
|
498
|
+
xhr.notifyResponseArrived();
|
|
499
|
+
xhr.complete(200, 'ok');
|
|
500
|
+
await flushPromises();
|
|
501
|
+
|
|
502
|
+
// THEN
|
|
503
|
+
expect(xhr.requestHeaders.get(TRACKED_BY_HEADER_KEY)).toBe(
|
|
504
|
+
TRACKED_BY_HEADER_VALUE
|
|
505
|
+
);
|
|
506
|
+
});
|
|
507
|
+
|
|
455
508
|
it('adds tracecontext request headers when the host is instrumented with tracecontext and request is sampled', async () => {
|
|
456
509
|
// GIVEN
|
|
457
510
|
const method = 'GET';
|
package/src/trace/DdTrace.ts
CHANGED
|
@@ -37,10 +37,7 @@ class DdTraceWrapper implements DdTraceType {
|
|
|
37
37
|
timestampMs
|
|
38
38
|
)
|
|
39
39
|
);
|
|
40
|
-
InternalLog.log(
|
|
41
|
-
`Starting span “${operation}” #${spanId}`,
|
|
42
|
-
SdkVerbosity.DEBUG
|
|
43
|
-
);
|
|
40
|
+
InternalLog.log(`Starting span “${operation}”`, SdkVerbosity.DEBUG);
|
|
44
41
|
return spanId;
|
|
45
42
|
};
|
|
46
43
|
|
package/src/version.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
// generated by genversion
|
|
2
|
-
export const version = '3.
|
|
2
|
+
export const version = '3.2.0';
|