@datadog/mobile-react-native 2.6.6 → 2.7.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/android/src/main/kotlin/com/datadog/reactnative/SdkVersion.kt +1 -1
- package/ios/Sources/SdkVersion.swift +1 -1
- package/lib/commonjs/rum/instrumentation/resourceTracking/distributedTracing/distributedTracingHeaders.js +16 -24
- package/lib/commonjs/rum/instrumentation/resourceTracking/distributedTracing/distributedTracingHeaders.js.map +1 -1
- package/lib/commonjs/version.js +1 -1
- package/lib/module/rum/instrumentation/resourceTracking/distributedTracing/distributedTracingHeaders.js +15 -23
- package/lib/module/rum/instrumentation/resourceTracking/distributedTracing/distributedTracingHeaders.js.map +1 -1
- package/lib/module/version.js +1 -1
- package/lib/typescript/rum/instrumentation/resourceTracking/distributedTracing/distributedTracingHeaders.d.ts +2 -1
- package/lib/typescript/rum/instrumentation/resourceTracking/distributedTracing/distributedTracingHeaders.d.ts.map +1 -1
- package/lib/typescript/version.d.ts +1 -1
- package/package.json +2 -2
- package/src/rum/__tests__/DdRum.test.ts +28 -0
- package/src/rum/instrumentation/resourceTracking/distributedTracing/distributedTracingHeaders.ts +17 -30
- package/src/version.ts +1 -1
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
-
exports.getTracingHeadersFromAttributes = exports.getTracingContextForPropagators = exports.getTracingContext = 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_SESSION_ID_TAG = 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.getTracingHeadersFromAttributes = exports.getTracingContextForPropagators = exports.getTracingContext = 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_SESSION_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
|
var _types = require("../../../types");
|
|
8
8
|
var _URLHostParser = require("../requestProxy/XHRProxy/URLHostParser");
|
|
9
9
|
var _DatadogTracingContext = require("./DatadogTracingContext");
|
|
@@ -26,13 +26,14 @@ const TRACE_ID_HEADER_KEY = exports.TRACE_ID_HEADER_KEY = 'x-datadog-trace-id';
|
|
|
26
26
|
const PARENT_ID_HEADER_KEY = exports.PARENT_ID_HEADER_KEY = 'x-datadog-parent-id';
|
|
27
27
|
const TAGS_HEADER_KEY = exports.TAGS_HEADER_KEY = 'x-datadog-tags';
|
|
28
28
|
const DD_TRACE_ID_TAG = exports.DD_TRACE_ID_TAG = '_dd.p.tid';
|
|
29
|
-
const DD_RUM_SESSION_ID_TAG = exports.DD_RUM_SESSION_ID_TAG = '
|
|
29
|
+
const DD_RUM_SESSION_ID_TAG = exports.DD_RUM_SESSION_ID_TAG = 'session.id';
|
|
30
30
|
|
|
31
31
|
/**
|
|
32
32
|
* OTel headers
|
|
33
33
|
*/
|
|
34
34
|
const TRACECONTEXT_HEADER_KEY = exports.TRACECONTEXT_HEADER_KEY = 'traceparent';
|
|
35
35
|
const TRACESTATE_HEADER_KEY = exports.TRACESTATE_HEADER_KEY = 'tracestate';
|
|
36
|
+
const BAGGAGE_HEADER_KEY = exports.BAGGAGE_HEADER_KEY = 'baggage';
|
|
36
37
|
const B3_HEADER_KEY = exports.B3_HEADER_KEY = 'b3';
|
|
37
38
|
const B3_MULTI_TRACE_ID_HEADER_KEY = exports.B3_MULTI_TRACE_ID_HEADER_KEY = 'X-B3-TraceId';
|
|
38
39
|
const B3_MULTI_SPAN_ID_HEADER_KEY = exports.B3_MULTI_SPAN_ID_HEADER_KEY = 'X-B3-SpanId';
|
|
@@ -59,17 +60,10 @@ const getTracingHeadersFromAttributes = tracingAttributes => {
|
|
|
59
60
|
header: PARENT_ID_HEADER_KEY,
|
|
60
61
|
value: tracingAttributes.spanId.toString(_TracingIdentifier.TracingIdFormat.decimal)
|
|
61
62
|
});
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
});
|
|
67
|
-
} else {
|
|
68
|
-
headers.push({
|
|
69
|
-
header: TAGS_HEADER_KEY,
|
|
70
|
-
value: `${DD_TRACE_ID_TAG}=${tracingAttributes.traceId.toString(_TracingIdentifier.TracingIdFormat.paddedHighHex)}`
|
|
71
|
-
});
|
|
72
|
-
}
|
|
63
|
+
headers.push({
|
|
64
|
+
header: TAGS_HEADER_KEY,
|
|
65
|
+
value: `${DD_TRACE_ID_TAG}=${tracingAttributes.traceId.toString(_TracingIdentifier.TracingIdFormat.paddedHighHex)}`
|
|
66
|
+
});
|
|
73
67
|
break;
|
|
74
68
|
}
|
|
75
69
|
case _types.PropagatorType.TRACECONTEXT:
|
|
@@ -87,8 +81,7 @@ const getTracingHeadersFromAttributes = tracingAttributes => {
|
|
|
87
81
|
header: TRACESTATE_HEADER_KEY,
|
|
88
82
|
value: generateTraceStateHeader({
|
|
89
83
|
parentId: tracingAttributes.spanId,
|
|
90
|
-
isSampled
|
|
91
|
-
rumSessionId: tracingAttributes.rumSessionId
|
|
84
|
+
isSampled
|
|
92
85
|
})
|
|
93
86
|
});
|
|
94
87
|
break;
|
|
@@ -119,6 +112,12 @@ const getTracingHeadersFromAttributes = tracingAttributes => {
|
|
|
119
112
|
});
|
|
120
113
|
}
|
|
121
114
|
}
|
|
115
|
+
if (tracingAttributes.rumSessionId) {
|
|
116
|
+
headers.push({
|
|
117
|
+
header: BAGGAGE_HEADER_KEY,
|
|
118
|
+
value: `${DD_RUM_SESSION_ID_TAG}=${tracingAttributes.rumSessionId}`
|
|
119
|
+
});
|
|
120
|
+
}
|
|
122
121
|
});
|
|
123
122
|
return headers;
|
|
124
123
|
};
|
|
@@ -164,19 +163,12 @@ const generateTraceContextHeader = ({
|
|
|
164
163
|
};
|
|
165
164
|
const generateTraceStateHeader = ({
|
|
166
165
|
parentId,
|
|
167
|
-
isSampled
|
|
168
|
-
rumSessionId
|
|
166
|
+
isSampled
|
|
169
167
|
}) => {
|
|
170
168
|
const sampled = `s:${isSampled ? '1' : '0'}`;
|
|
171
169
|
const origin = 'o:rum';
|
|
172
170
|
const parent = `p:${parentId.toString(_TracingIdentifier.TracingIdFormat.paddedHex)}`;
|
|
173
|
-
|
|
174
|
-
if (rumSessionId) {
|
|
175
|
-
const session = `t.rsid:${rumSessionId}`;
|
|
176
|
-
return `${baseHeaderValue};${session}`;
|
|
177
|
-
} else {
|
|
178
|
-
return baseHeaderValue;
|
|
179
|
-
}
|
|
171
|
+
return `dd=${sampled};${origin};${parent}`;
|
|
180
172
|
};
|
|
181
173
|
const generateB3Header = ({
|
|
182
174
|
traceId,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_types","require","_URLHostParser","_DatadogTracingContext","_TracingIdentifier","_distributedTracing","_firstPartyHosts","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","TRACECONTEXT_HEADER_KEY","TRACESTATE_HEADER_KEY","B3_HEADER_KEY","B3_MULTI_TRACE_ID_HEADER_KEY","B3_MULTI_SPAN_ID_HEADER_KEY","B3_MULTI_SAMPLED_HEADER_KEY","getTracingHeadersFromAttributes","tracingAttributes","headers","tracingStrategy","propagatorTypes","forEach","propagator","PropagatorType","DATADOG","push","header","value","samplingPriorityHeader","traceId","toString","TracingIdFormat","lowDecimal","spanId","decimal","
|
|
1
|
+
{"version":3,"names":["_types","require","_URLHostParser","_DatadogTracingContext","_TracingIdentifier","_distributedTracing","_firstPartyHosts","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","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","getTracingHeadersFromAttributes","tracingAttributes","headers","tracingStrategy","propagatorTypes","forEach","propagator","PropagatorType","DATADOG","push","header","value","samplingPriorityHeader","traceId","toString","TracingIdFormat","lowDecimal","spanId","decimal","paddedHighHex","TRACECONTEXT","isSampled","generateTraceContextHeader","version","parentId","generateTraceStateHeader","B3","generateB3Header","B3MULTI","paddedHex","rumSessionId","getTracingContext","url","tracingSamplingRate","firstPartyHosts","hostname","URLHostParser","firstPartyHostsRegexMap","firstPartyHostsRegexMapBuilder","getTracingAttributes","getTracingContextForAttributes","getTracingContextForPropagators","propagators","generateTracingAttributesWithSampling","requestHeaders","resourceContext","DatadogTracingContext","flags","sampled","origin","parent","join"],"sourceRoot":"../../../../../../src","sources":["rum/instrumentation/resourceTracking/distributedTracing/distributedTracingHeaders.ts"],"mappings":"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","ignoreList":[]}
|
package/lib/commonjs/version.js
CHANGED
|
@@ -20,13 +20,14 @@ export const TRACE_ID_HEADER_KEY = 'x-datadog-trace-id';
|
|
|
20
20
|
export const PARENT_ID_HEADER_KEY = 'x-datadog-parent-id';
|
|
21
21
|
export const TAGS_HEADER_KEY = 'x-datadog-tags';
|
|
22
22
|
export const DD_TRACE_ID_TAG = '_dd.p.tid';
|
|
23
|
-
export const DD_RUM_SESSION_ID_TAG = '
|
|
23
|
+
export const DD_RUM_SESSION_ID_TAG = 'session.id';
|
|
24
24
|
|
|
25
25
|
/**
|
|
26
26
|
* OTel headers
|
|
27
27
|
*/
|
|
28
28
|
export const TRACECONTEXT_HEADER_KEY = 'traceparent';
|
|
29
29
|
export const TRACESTATE_HEADER_KEY = 'tracestate';
|
|
30
|
+
export const BAGGAGE_HEADER_KEY = 'baggage';
|
|
30
31
|
export const B3_HEADER_KEY = 'b3';
|
|
31
32
|
export const B3_MULTI_TRACE_ID_HEADER_KEY = 'X-B3-TraceId';
|
|
32
33
|
export const B3_MULTI_SPAN_ID_HEADER_KEY = 'X-B3-SpanId';
|
|
@@ -53,17 +54,10 @@ export const getTracingHeadersFromAttributes = tracingAttributes => {
|
|
|
53
54
|
header: PARENT_ID_HEADER_KEY,
|
|
54
55
|
value: tracingAttributes.spanId.toString(TracingIdFormat.decimal)
|
|
55
56
|
});
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
});
|
|
61
|
-
} else {
|
|
62
|
-
headers.push({
|
|
63
|
-
header: TAGS_HEADER_KEY,
|
|
64
|
-
value: `${DD_TRACE_ID_TAG}=${tracingAttributes.traceId.toString(TracingIdFormat.paddedHighHex)}`
|
|
65
|
-
});
|
|
66
|
-
}
|
|
57
|
+
headers.push({
|
|
58
|
+
header: TAGS_HEADER_KEY,
|
|
59
|
+
value: `${DD_TRACE_ID_TAG}=${tracingAttributes.traceId.toString(TracingIdFormat.paddedHighHex)}`
|
|
60
|
+
});
|
|
67
61
|
break;
|
|
68
62
|
}
|
|
69
63
|
case PropagatorType.TRACECONTEXT:
|
|
@@ -81,8 +75,7 @@ export const getTracingHeadersFromAttributes = tracingAttributes => {
|
|
|
81
75
|
header: TRACESTATE_HEADER_KEY,
|
|
82
76
|
value: generateTraceStateHeader({
|
|
83
77
|
parentId: tracingAttributes.spanId,
|
|
84
|
-
isSampled
|
|
85
|
-
rumSessionId: tracingAttributes.rumSessionId
|
|
78
|
+
isSampled
|
|
86
79
|
})
|
|
87
80
|
});
|
|
88
81
|
break;
|
|
@@ -113,6 +106,12 @@ export const getTracingHeadersFromAttributes = tracingAttributes => {
|
|
|
113
106
|
});
|
|
114
107
|
}
|
|
115
108
|
}
|
|
109
|
+
if (tracingAttributes.rumSessionId) {
|
|
110
|
+
headers.push({
|
|
111
|
+
header: BAGGAGE_HEADER_KEY,
|
|
112
|
+
value: `${DD_RUM_SESSION_ID_TAG}=${tracingAttributes.rumSessionId}`
|
|
113
|
+
});
|
|
114
|
+
}
|
|
116
115
|
});
|
|
117
116
|
return headers;
|
|
118
117
|
};
|
|
@@ -155,19 +154,12 @@ const generateTraceContextHeader = ({
|
|
|
155
154
|
};
|
|
156
155
|
const generateTraceStateHeader = ({
|
|
157
156
|
parentId,
|
|
158
|
-
isSampled
|
|
159
|
-
rumSessionId
|
|
157
|
+
isSampled
|
|
160
158
|
}) => {
|
|
161
159
|
const sampled = `s:${isSampled ? '1' : '0'}`;
|
|
162
160
|
const origin = 'o:rum';
|
|
163
161
|
const parent = `p:${parentId.toString(TracingIdFormat.paddedHex)}`;
|
|
164
|
-
|
|
165
|
-
if (rumSessionId) {
|
|
166
|
-
const session = `t.rsid:${rumSessionId}`;
|
|
167
|
-
return `${baseHeaderValue};${session}`;
|
|
168
|
-
} else {
|
|
169
|
-
return baseHeaderValue;
|
|
170
|
-
}
|
|
162
|
+
return `dd=${sampled};${origin};${parent}`;
|
|
171
163
|
};
|
|
172
164
|
const generateB3Header = ({
|
|
173
165
|
traceId,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["PropagatorType","URLHostParser","DatadogTracingContext","TracingIdFormat","generateTracingAttributesWithSampling","getTracingAttributes","firstPartyHostsRegexMapBuilder","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","TRACECONTEXT_HEADER_KEY","TRACESTATE_HEADER_KEY","B3_HEADER_KEY","B3_MULTI_TRACE_ID_HEADER_KEY","B3_MULTI_SPAN_ID_HEADER_KEY","B3_MULTI_SAMPLED_HEADER_KEY","getTracingHeadersFromAttributes","tracingAttributes","headers","tracingStrategy","propagatorTypes","forEach","propagator","DATADOG","push","header","value","samplingPriorityHeader","traceId","toString","lowDecimal","spanId","decimal","
|
|
1
|
+
{"version":3,"names":["PropagatorType","URLHostParser","DatadogTracingContext","TracingIdFormat","generateTracingAttributesWithSampling","getTracingAttributes","firstPartyHostsRegexMapBuilder","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","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","getTracingHeadersFromAttributes","tracingAttributes","headers","tracingStrategy","propagatorTypes","forEach","propagator","DATADOG","push","header","value","samplingPriorityHeader","traceId","toString","lowDecimal","spanId","decimal","paddedHighHex","TRACECONTEXT","isSampled","generateTraceContextHeader","version","parentId","generateTraceStateHeader","B3","generateB3Header","B3MULTI","paddedHex","rumSessionId","getTracingContext","url","tracingSamplingRate","firstPartyHosts","hostname","firstPartyHostsRegexMap","getTracingContextForAttributes","getTracingContextForPropagators","propagators","requestHeaders","resourceContext","flags","sampled","origin","parent","join"],"sourceRoot":"../../../../../../src","sources":["rum/instrumentation/resourceTracking/distributedTracing/distributedTracingHeaders.ts"],"mappings":"AAAA;AACA;AACA;AACA;AACA;;AAEA,SAASA,cAAc,QAAQ,gBAAgB;AAE/C,SAASC,aAAa,QAAQ,wCAAwC;AAEtE,SAASC,qBAAqB,QAAQ,yBAAyB;AAC/D,SAASC,eAAe,QAAQ,qBAAqB;AAErD,SACIC,qCAAqC,EACrCC,oBAAoB,QACjB,sBAAsB;AAE7B,SAASC,8BAA8B,QAAQ,mBAAmB;AAElE,OAAO,MAAMC,4BAA4B,GAAG,6BAA6B;AACzE;AACA;AACA;AACA,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;;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;AAEzD,OAAO,MAAMC,+BAA+B,GACxCC,iBAAiD,IACX;EACtC,MAAMC,OAA4C,GAAG,EAAE;EACvD,IAAID,iBAAiB,CAACE,eAAe,KAAK,SAAS,EAAE;IACjD,OAAOD,OAAO;EAClB;EACAD,iBAAiB,CAACG,eAAe,CAACC,OAAO,CAACC,UAAU,IAAI;IACpD,QAAQA,UAAU;MACd,KAAK5B,cAAc,CAAC6B,OAAO;QAAE;UACzBL,OAAO,CAACM,IAAI,CACR;YACIC,MAAM,EAAEvB,iBAAiB;YACzBwB,KAAK,EAAEvB;UACX,CAAC,EACD;YACIsB,MAAM,EAAExB,4BAA4B;YACpCyB,KAAK,EAAET,iBAAiB,CAACU;UAC7B,CAAC,EACD;YACIF,MAAM,EAAErB,mBAAmB;YAC3BsB,KAAK,EAAET,iBAAiB,CAACW,OAAO,CAACC,QAAQ,CACrChC,eAAe,CAACiC,UACpB;UACJ,CAAC,EACD;YACIL,MAAM,EAAEpB,oBAAoB;YAC5BqB,KAAK,EAAET,iBAAiB,CAACc,MAAM,CAACF,QAAQ,CACpChC,eAAe,CAACmC,OACpB;UACJ,CACJ,CAAC;UACDd,OAAO,CAACM,IAAI,CAAC;YACTC,MAAM,EAAEnB,eAAe;YACvBoB,KAAK,EAAE,GAAGnB,eAAe,IAAIU,iBAAiB,CAACW,OAAO,CAACC,QAAQ,CAC3DhC,eAAe,CAACoC,aACpB,CAAC;UACL,CAAC,CAAC;UACF;QACJ;MACA,KAAKvC,cAAc,CAACwC,YAAY;QAAE;UAC9B,MAAMC,SAAS,GACXlB,iBAAiB,CAACU,sBAAsB,KAAK,GAAG;UACpDT,OAAO,CAACM,IAAI,CACR;YACIC,MAAM,EAAEhB,uBAAuB;YAC/BiB,KAAK,EAAEU,0BAA0B,CAAC;cAC9BC,OAAO,EAAE,IAAI;cACbT,OAAO,EAAEX,iBAAiB,CAACW,OAAO;cAClCU,QAAQ,EAAErB,iBAAiB,CAACc,MAAM;cAClCI;YACJ,CAAC;UACL,CAAC,EACD;YACIV,MAAM,EAAEf,qBAAqB;YAC7BgB,KAAK,EAAEa,wBAAwB,CAAC;cAC5BD,QAAQ,EAAErB,iBAAiB,CAACc,MAAM;cAClCI;YACJ,CAAC;UACL,CACJ,CAAC;UACD;QACJ;MACA,KAAKzC,cAAc,CAAC8C,EAAE;QAAE;UACpBtB,OAAO,CAACM,IAAI,CAAC;YACTC,MAAM,EAAEb,aAAa;YACrBc,KAAK,EAAEe,gBAAgB,CAAC;cACpBb,OAAO,EAAEX,iBAAiB,CAACW,OAAO;cAClCG,MAAM,EAAEd,iBAAiB,CAACc,MAAM;cAChCI,SAAS,EACLlB,iBAAiB,CAACU,sBAAsB,KAAK;YACrD,CAAC;UACL,CAAC,CAAC;UACF;QACJ;MACA,KAAKjC,cAAc,CAACgD,OAAO;QAAE;UACzBxB,OAAO,CAACM,IAAI,CACR;YACIC,MAAM,EAAEZ,4BAA4B;YACpCa,KAAK,EAAET,iBAAiB,CAACW,OAAO,CAACC,QAAQ,CACrChC,eAAe,CAAC8C,SACpB;UACJ,CAAC,EACD;YACIlB,MAAM,EAAEX,2BAA2B;YACnCY,KAAK,EAAET,iBAAiB,CAACc,MAAM,CAACF,QAAQ,CACpChC,eAAe,CAAC8C,SACpB;UACJ,CAAC,EACD;YACIlB,MAAM,EAAEV,2BAA2B;YACnCW,KAAK,EAAET,iBAAiB,CAACU;UAC7B,CACJ,CAAC;QACL;IACJ;IACA,IAAIV,iBAAiB,CAAC2B,YAAY,EAAE;MAChC1B,OAAO,CAACM,IAAI,CAAC;QACTC,MAAM,EAAEd,kBAAkB;QAC1Be,KAAK,EAAE,GAAGlB,qBAAqB,IAAIS,iBAAiB,CAAC2B,YAAY;MACrE,CAAC,CAAC;IACN;EACJ,CAAC,CAAC;EAEF,OAAO1B,OAAO;AAClB,CAAC;AAED,OAAO,MAAM2B,iBAAiB,GAAGA,CAC7BC,GAAW,EACXC,mBAA2B,EAC3BC,eAAiC,EACjCJ,YAA2B,KACH;EACxB,MAAMK,QAAQ,GAAGtD,aAAa,CAACmD,GAAG,CAAC;EACnC,MAAMI,uBAAuB,GAAGlD,8BAA8B,CAC1DgD,eACJ,CAAC;EACD,MAAM/B,iBAAiB,GAAGlB,oBAAoB,CAAC;IAC3CkD,QAAQ;IACRC,uBAAuB;IACvBH,mBAAmB;IACnBH;EACJ,CAAC,CAAC;EAEF,OAAOO,8BAA8B,CACjClC,iBAAiB,EACjB8B,mBACJ,CAAC;AACL,CAAC;AAED,OAAO,MAAMK,+BAA+B,GAAGA,CAC3CC,WAA6B,EAC7BN,mBAA2B,EAC3BH,YAA2B,KACH;EACxB,OAAOO,8BAA8B,CACjCrD,qCAAqC,CACjCiD,mBAAmB,EACnBM,WAAW,EACXT,YACJ,CAAC,EACDG,mBACJ,CAAC;AACL,CAAC;AAED,MAAMI,8BAA8B,GAAGA,CACnClC,iBAAiD,EACjD8B,mBAA2B,KACH;EACxB,MAAMO,cAAc,GAAGtC,+BAA+B,CAACC,iBAAiB,CAAC;EACzE,MAAMsC,eAAgD,GAAG,CAAC,CAAC;EAE3D,MAAMxB,MAAM,GAAGd,iBAAiB,CAACc,MAAM;EACvC,IAAIA,MAAM,EAAE;IACRwB,eAAe,CAAC,aAAa,CAAC,GAAGxB,MAAM,CAACF,QAAQ,CAC5ChC,eAAe,CAACmC,OACpB,CAAC;EACL;EAEA,MAAMJ,OAAO,GAAGX,iBAAiB,CAACW,OAAO;EACzC,IAAIA,OAAO,EAAE;IACT2B,eAAe,CAAC,cAAc,CAAC,GAAG3B,OAAO,CAACC,QAAQ,CAC9ChC,eAAe,CAAC8C,SACpB,CAAC;EACL;EAEAY,eAAe,CAAC,cAAc,CAAC,GAAGR,mBAAmB,GAAG,GAAG;EAE3D,OAAO,IAAInD,qBAAqB,CAC5B0D,cAAc,EACdC,eAAe,EACftC,iBAAiB,CAACW,OAAO,EACzBX,iBAAiB,CAACc,MACtB,CAAC;AACL,CAAC;AAED,MAAMK,0BAA0B,GAAGA,CAAC;EAChCC,OAAO;EACPT,OAAO;EACPU,QAAQ;EACRH;AAMJ,CAAC,KAAK;EACF,MAAMqB,KAAK,GAAGrB,SAAS,GAAG,IAAI,GAAG,IAAI;EACrC,OAAO,GAAGE,OAAO,IAAIT,OAAO,CAACC,QAAQ,CACjChC,eAAe,CAAC8C,SACpB,CAAC,IAAIL,QAAQ,CAACT,QAAQ,CAAChC,eAAe,CAAC8C,SAAS,CAAC,IAAIa,KAAK,EAAE;AAChE,CAAC;AAED,MAAMjB,wBAAwB,GAAGA,CAAC;EAC9BD,QAAQ;EACRH;AAIJ,CAAC,KAAK;EACF,MAAMsB,OAAO,GAAG,KAAKtB,SAAS,GAAG,GAAG,GAAG,GAAG,EAAE;EAC5C,MAAMuB,MAAM,GAAG,OAAO;EACtB,MAAMC,MAAM,GAAG,KAAKrB,QAAQ,CAACT,QAAQ,CAAChC,eAAe,CAAC8C,SAAS,CAAC,EAAE;EAClE,OAAO,MAAMc,OAAO,IAAIC,MAAM,IAAIC,MAAM,EAAE;AAC9C,CAAC;AAED,MAAMlB,gBAAgB,GAAGA,CAAC;EACtBb,OAAO;EACPG,MAAM;EACNI;AAKJ,CAAC,KAAK;EACF,OAAO,CACHP,OAAO,CAACC,QAAQ,CAAChC,eAAe,CAAC8C,SAAS,CAAC,EAC3CZ,MAAM,CAACF,QAAQ,CAAChC,eAAe,CAAC8C,SAAS,CAAC,EAC1CR,SAAS,GAAG,GAAG,GAAG,GAAG,CACxB,CAACyB,IAAI,CAAC,GAAG,CAAC;AACf,CAAC","ignoreList":[]}
|
package/lib/module/version.js
CHANGED
|
@@ -12,12 +12,13 @@ export declare const TRACE_ID_HEADER_KEY = "x-datadog-trace-id";
|
|
|
12
12
|
export declare const PARENT_ID_HEADER_KEY = "x-datadog-parent-id";
|
|
13
13
|
export declare const TAGS_HEADER_KEY = "x-datadog-tags";
|
|
14
14
|
export declare const DD_TRACE_ID_TAG = "_dd.p.tid";
|
|
15
|
-
export declare const DD_RUM_SESSION_ID_TAG = "
|
|
15
|
+
export declare const DD_RUM_SESSION_ID_TAG = "session.id";
|
|
16
16
|
/**
|
|
17
17
|
* OTel headers
|
|
18
18
|
*/
|
|
19
19
|
export declare const TRACECONTEXT_HEADER_KEY = "traceparent";
|
|
20
20
|
export declare const TRACESTATE_HEADER_KEY = "tracestate";
|
|
21
|
+
export declare const BAGGAGE_HEADER_KEY = "baggage";
|
|
21
22
|
export declare const B3_HEADER_KEY = "b3";
|
|
22
23
|
export declare const B3_MULTI_TRACE_ID_HEADER_KEY = "X-B3-TraceId";
|
|
23
24
|
export declare const B3_MULTI_SPAN_ID_HEADER_KEY = "X-B3-SpanId";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"distributedTracingHeaders.d.ts","sourceRoot":"","sources":["../../../../../../src/rum/instrumentation/resourceTracking/distributedTracing/distributedTracingHeaders.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAGrD,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAOhE,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,sBAAsB,CAAC;AAG3E,eAAO,MAAM,4BAA4B,gCAAgC,CAAC;AAC1E;;GAEG;AACH,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;AAElD;;GAEG;AACH,eAAO,MAAM,uBAAuB,gBAAgB,CAAC;AACrD,eAAO,MAAM,qBAAqB,eAAe,CAAC;AAClD,eAAO,MAAM,aAAa,OAAO,CAAC;AAClC,eAAO,MAAM,4BAA4B,iBAAiB,CAAC;AAC3D,eAAO,MAAM,2BAA2B,gBAAgB,CAAC;AACzD,eAAO,MAAM,2BAA2B,iBAAiB,CAAC;AAE1D,eAAO,MAAM,+BAA+B,sBACrB,8BAA8B,KAClD;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,
|
|
1
|
+
{"version":3,"file":"distributedTracingHeaders.d.ts","sourceRoot":"","sources":["../../../../../../src/rum/instrumentation/resourceTracking/distributedTracing/distributedTracingHeaders.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAGrD,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAOhE,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,sBAAsB,CAAC;AAG3E,eAAO,MAAM,4BAA4B,gCAAgC,CAAC;AAC1E;;GAEG;AACH,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;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;AAE1D,eAAO,MAAM,+BAA+B,sBACrB,8BAA8B,KAClD;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,EAuGnC,CAAC;AAEF,eAAO,MAAM,iBAAiB,QACrB,MAAM,uBACU,MAAM,mBACV,cAAc,EAAE,gBACnB,MAAM,GAAG,IAAI,KAC5B,qBAgBF,CAAC;AAEF,eAAO,MAAM,+BAA+B,gBAC3B,cAAc,EAAE,uBACR,MAAM,gBACb,MAAM,GAAG,IAAI,KAC5B,qBASF,CAAC"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const version = "2.
|
|
1
|
+
export declare const version = "2.7.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": "2.
|
|
3
|
+
"version": "2.7.0",
|
|
4
4
|
"description": "A client-side React Native module to interact with Datadog",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"datadog",
|
|
@@ -100,5 +100,5 @@
|
|
|
100
100
|
"dependencies": {
|
|
101
101
|
"big-integer": "^1.6.52"
|
|
102
102
|
},
|
|
103
|
-
"gitHead": "
|
|
103
|
+
"gitHead": "a0d4f136f343b5d72ab7f79f442a6d75294e26c1"
|
|
104
104
|
}
|
|
@@ -20,6 +20,7 @@ import { DatadogTracingContext } from '../instrumentation/resourceTracking/distr
|
|
|
20
20
|
import { DatadogTracingIdentifier } from '../instrumentation/resourceTracking/distributedTracing/DatadogTracingIdentifier';
|
|
21
21
|
import { TracingIdFormat } from '../instrumentation/resourceTracking/distributedTracing/TracingIdentifier';
|
|
22
22
|
import { TracingIdentifierUtils } from '../instrumentation/resourceTracking/distributedTracing/__tests__/__utils__/TracingIdentifierUtils';
|
|
23
|
+
import { setCachedRumSessionId } from '../sessionId/sessionIdHelper';
|
|
23
24
|
import type { FirstPartyHost } from '../types';
|
|
24
25
|
import { ErrorSource, PropagatorType, RumActionType } from '../types';
|
|
25
26
|
|
|
@@ -46,6 +47,7 @@ describe('DdRum', () => {
|
|
|
46
47
|
beforeEach(() => {
|
|
47
48
|
jest.clearAllMocks();
|
|
48
49
|
BufferSingleton.onInitialization();
|
|
50
|
+
setCachedRumSessionId(null);
|
|
49
51
|
});
|
|
50
52
|
|
|
51
53
|
describe('Context validation', () => {
|
|
@@ -980,6 +982,32 @@ describe('DdRum', () => {
|
|
|
980
982
|
}
|
|
981
983
|
});
|
|
982
984
|
|
|
985
|
+
it('tracing context contains RUM session ID in baggage when RUM Session ID is cached', () => {
|
|
986
|
+
for (let i = 0; i < 100; i++) {
|
|
987
|
+
const randomSessionId = `test-${Math.random()}`;
|
|
988
|
+
setCachedRumSessionId(randomSessionId);
|
|
989
|
+
|
|
990
|
+
const tracingContext = DdRum.getTracingContextForPropagators(
|
|
991
|
+
[
|
|
992
|
+
PropagatorType.DATADOG,
|
|
993
|
+
PropagatorType.TRACECONTEXT,
|
|
994
|
+
PropagatorType.B3MULTI,
|
|
995
|
+
PropagatorType.B3
|
|
996
|
+
],
|
|
997
|
+
100
|
|
998
|
+
);
|
|
999
|
+
|
|
1000
|
+
const requestHeaders = tracingContext.getHeadersForRequest();
|
|
1001
|
+
expect(requestHeaders).toHaveProperty('baggage');
|
|
1002
|
+
expect(requestHeaders['baggage']).toBe(
|
|
1003
|
+
`session.id=${randomSessionId}`
|
|
1004
|
+
);
|
|
1005
|
+
|
|
1006
|
+
const resourceContext = tracingContext.getRumResourceContext();
|
|
1007
|
+
expect(resourceContext['baggage']).toBeUndefined();
|
|
1008
|
+
}
|
|
1009
|
+
});
|
|
1010
|
+
|
|
983
1011
|
it('injects headers and context correctly with all propagators and sampling rate (50% 0, 50% 100)', () => {
|
|
984
1012
|
for (let i = 0; i < 100; i++) {
|
|
985
1013
|
const tracingSamplingRate =
|
package/src/rum/instrumentation/resourceTracking/distributedTracing/distributedTracingHeaders.ts
CHANGED
|
@@ -28,13 +28,14 @@ export const TRACE_ID_HEADER_KEY = 'x-datadog-trace-id';
|
|
|
28
28
|
export const PARENT_ID_HEADER_KEY = 'x-datadog-parent-id';
|
|
29
29
|
export const TAGS_HEADER_KEY = 'x-datadog-tags';
|
|
30
30
|
export const DD_TRACE_ID_TAG = '_dd.p.tid';
|
|
31
|
-
export const DD_RUM_SESSION_ID_TAG = '
|
|
31
|
+
export const DD_RUM_SESSION_ID_TAG = 'session.id';
|
|
32
32
|
|
|
33
33
|
/**
|
|
34
34
|
* OTel headers
|
|
35
35
|
*/
|
|
36
36
|
export const TRACECONTEXT_HEADER_KEY = 'traceparent';
|
|
37
37
|
export const TRACESTATE_HEADER_KEY = 'tracestate';
|
|
38
|
+
export const BAGGAGE_HEADER_KEY = 'baggage';
|
|
38
39
|
export const B3_HEADER_KEY = 'b3';
|
|
39
40
|
export const B3_MULTI_TRACE_ID_HEADER_KEY = 'X-B3-TraceId';
|
|
40
41
|
export const B3_MULTI_SPAN_ID_HEADER_KEY = 'X-B3-SpanId';
|
|
@@ -72,23 +73,12 @@ export const getTracingHeadersFromAttributes = (
|
|
|
72
73
|
)
|
|
73
74
|
}
|
|
74
75
|
);
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
tracingAttributes.rumSessionId
|
|
82
|
-
}`
|
|
83
|
-
});
|
|
84
|
-
} else {
|
|
85
|
-
headers.push({
|
|
86
|
-
header: TAGS_HEADER_KEY,
|
|
87
|
-
value: `${DD_TRACE_ID_TAG}=${tracingAttributes.traceId.toString(
|
|
88
|
-
TracingIdFormat.paddedHighHex
|
|
89
|
-
)}`
|
|
90
|
-
});
|
|
91
|
-
}
|
|
76
|
+
headers.push({
|
|
77
|
+
header: TAGS_HEADER_KEY,
|
|
78
|
+
value: `${DD_TRACE_ID_TAG}=${tracingAttributes.traceId.toString(
|
|
79
|
+
TracingIdFormat.paddedHighHex
|
|
80
|
+
)}`
|
|
81
|
+
});
|
|
92
82
|
break;
|
|
93
83
|
}
|
|
94
84
|
case PropagatorType.TRACECONTEXT: {
|
|
@@ -108,8 +98,7 @@ export const getTracingHeadersFromAttributes = (
|
|
|
108
98
|
header: TRACESTATE_HEADER_KEY,
|
|
109
99
|
value: generateTraceStateHeader({
|
|
110
100
|
parentId: tracingAttributes.spanId,
|
|
111
|
-
isSampled
|
|
112
|
-
rumSessionId: tracingAttributes.rumSessionId
|
|
101
|
+
isSampled
|
|
113
102
|
})
|
|
114
103
|
}
|
|
115
104
|
);
|
|
@@ -148,6 +137,12 @@ export const getTracingHeadersFromAttributes = (
|
|
|
148
137
|
);
|
|
149
138
|
}
|
|
150
139
|
}
|
|
140
|
+
if (tracingAttributes.rumSessionId) {
|
|
141
|
+
headers.push({
|
|
142
|
+
header: BAGGAGE_HEADER_KEY,
|
|
143
|
+
value: `${DD_RUM_SESSION_ID_TAG}=${tracingAttributes.rumSessionId}`
|
|
144
|
+
});
|
|
145
|
+
}
|
|
151
146
|
});
|
|
152
147
|
|
|
153
148
|
return headers;
|
|
@@ -241,23 +236,15 @@ const generateTraceContextHeader = ({
|
|
|
241
236
|
|
|
242
237
|
const generateTraceStateHeader = ({
|
|
243
238
|
parentId,
|
|
244
|
-
isSampled
|
|
245
|
-
rumSessionId
|
|
239
|
+
isSampled
|
|
246
240
|
}: {
|
|
247
241
|
parentId: SpanId;
|
|
248
242
|
isSampled: boolean;
|
|
249
|
-
rumSessionId: string | null;
|
|
250
243
|
}) => {
|
|
251
244
|
const sampled = `s:${isSampled ? '1' : '0'}`;
|
|
252
245
|
const origin = 'o:rum';
|
|
253
246
|
const parent = `p:${parentId.toString(TracingIdFormat.paddedHex)}`;
|
|
254
|
-
|
|
255
|
-
if (rumSessionId) {
|
|
256
|
-
const session = `t.rsid:${rumSessionId}`;
|
|
257
|
-
return `${baseHeaderValue};${session}`;
|
|
258
|
-
} else {
|
|
259
|
-
return baseHeaderValue;
|
|
260
|
-
}
|
|
247
|
+
return `dd=${sampled};${origin};${parent}`;
|
|
261
248
|
};
|
|
262
249
|
|
|
263
250
|
const generateB3Header = ({
|
package/src/version.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
// generated by genversion
|
|
2
|
-
export const version = '2.
|
|
2
|
+
export const version = '2.7.0';
|