@openobserve/browser-core 0.2.12-beta.22 → 0.2.12-beta.24
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/cjs/boot/init.js +1 -1
- package/cjs/domain/configuration/configuration.js +5 -4
- package/cjs/domain/configuration/configuration.js.map +1 -1
- package/cjs/domain/configuration/endpointBuilder.js +18 -11
- package/cjs/domain/configuration/endpointBuilder.js.map +1 -1
- package/cjs/domain/tags.js +1 -1
- package/cjs/domain/telemetry/telemetry.js +1 -1
- package/esm/boot/init.js +1 -1
- package/esm/domain/configuration/configuration.js +6 -5
- package/esm/domain/configuration/configuration.js.map +1 -1
- package/esm/domain/configuration/endpointBuilder.js +18 -11
- package/esm/domain/configuration/endpointBuilder.js.map +1 -1
- package/esm/domain/tags.js +1 -1
- package/esm/domain/telemetry/telemetry.js +1 -1
- package/package.json +1 -1
- package/src/domain/configuration/configuration.ts +6 -5
- package/src/domain/configuration/endpointBuilder.ts +20 -11
package/cjs/boot/init.js
CHANGED
|
@@ -7,7 +7,7 @@ const monitor_1 = require("../tools/monitor");
|
|
|
7
7
|
const display_1 = require("../tools/display");
|
|
8
8
|
function makePublicApi(stub) {
|
|
9
9
|
const publicApi = {
|
|
10
|
-
version: "0.2.12-beta.
|
|
10
|
+
version: "0.2.12-beta.24",
|
|
11
11
|
// This API method is intentionally not monitored, since the only thing executed is the
|
|
12
12
|
// user-provided 'callback'. All SDK usages executed in the callback should be monitored, and
|
|
13
13
|
// we don't want to interfere with the user uncaught exceptions.
|
|
@@ -41,11 +41,12 @@ function isString(tag, tagName) {
|
|
|
41
41
|
return true;
|
|
42
42
|
}
|
|
43
43
|
function isDatadogSite(site) {
|
|
44
|
-
if (site && typeof site === 'string' && !/(datadog|ddog|datad0g|dd0g)/.test(site)) {
|
|
45
|
-
display_1.display.error(`Site should be a valid Datadog site. ${display_1.MORE_DETAILS} ${display_1.DOCS_ORIGIN}/getting_started/site/.`);
|
|
46
|
-
return false;
|
|
47
|
-
}
|
|
48
44
|
return true;
|
|
45
|
+
// if (site && typeof site === 'string' && !/(datadog|ddog|datad0g|dd0g)/.test(site)) {
|
|
46
|
+
// display.error(`Site should be a valid Datadog site. ${MORE_DETAILS} ${DOCS_ORIGIN}/getting_started/site/.`)
|
|
47
|
+
// return false
|
|
48
|
+
// }
|
|
49
|
+
// return true
|
|
49
50
|
}
|
|
50
51
|
function isSampleRate(sampleRate, name) {
|
|
51
52
|
if (sampleRate !== undefined && !(0, numberUtils_1.isPercentage)(sampleRate)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configuration.js","sourceRoot":"","sources":["../../../src/domain/configuration/configuration.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"configuration.js","sourceRoot":"","sources":["../../../src/domain/configuration/configuration.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,8 +22,13 @@ function createEndpointBuilder(initConfiguration, trackType, extraParameters) {
|
|
|
22
22
|
* request, as only parameters are changing.
|
|
23
23
|
*/
|
|
24
24
|
function createEndpointUrlWithParametersBuilder(initConfiguration, trackType) {
|
|
25
|
-
const path = `/api/v2/${trackType}
|
|
26
|
-
const proxy = initConfiguration
|
|
25
|
+
// const path = `/api/v2/${trackType}`
|
|
26
|
+
const { proxy, apiVersion, organizationIdentifier, insecureHTTP } = initConfiguration;
|
|
27
|
+
console.log('apiVersion', apiVersion);
|
|
28
|
+
console.log('organizationIdentifier', organizationIdentifier);
|
|
29
|
+
console.log('insecureHTTP', insecureHTTP);
|
|
30
|
+
const path = `/rum/${apiVersion}/${organizationIdentifier}/${trackType}`;
|
|
31
|
+
console.log('path', path);
|
|
27
32
|
if (typeof proxy === 'string') {
|
|
28
33
|
const normalizedProxyUrl = (0, urlPolyfill_1.normalizeUrl)(proxy);
|
|
29
34
|
return (parameters) => `${normalizedProxyUrl}?ooforward=${encodeURIComponent(`${path}?${parameters}`)}`;
|
|
@@ -32,10 +37,12 @@ function createEndpointUrlWithParametersBuilder(initConfiguration, trackType) {
|
|
|
32
37
|
return (parameters) => proxy({ path, parameters });
|
|
33
38
|
}
|
|
34
39
|
const host = buildEndpointHost(trackType, initConfiguration);
|
|
35
|
-
|
|
40
|
+
const protocol = insecureHTTP ? 'http' : 'https';
|
|
41
|
+
return (parameters) => `${protocol}://${host}${path}?${parameters}`;
|
|
36
42
|
}
|
|
37
43
|
function buildEndpointHost(trackType, initConfiguration) {
|
|
38
44
|
const { site = intakeSites_1.INTAKE_SITE_US1, internalAnalyticsSubdomain } = initConfiguration;
|
|
45
|
+
return site;
|
|
39
46
|
if (trackType === 'logs' && initConfiguration.usePciIntake && site === intakeSites_1.INTAKE_SITE_US1) {
|
|
40
47
|
return intakeSites_1.PCI_INTAKE_HOST_US1;
|
|
41
48
|
}
|
|
@@ -55,19 +62,19 @@ function buildEndpointHost(trackType, initConfiguration) {
|
|
|
55
62
|
*/
|
|
56
63
|
function buildEndpointParameters({ clientToken, internalAnalyticsSubdomain, source = 'browser' }, trackType, api, { retry, encoding }, extraParameters = []) {
|
|
57
64
|
const parameters = [
|
|
58
|
-
`
|
|
59
|
-
`
|
|
60
|
-
`
|
|
61
|
-
'
|
|
62
|
-
`
|
|
65
|
+
`o2source=${source}`,
|
|
66
|
+
`o2-api-key=${clientToken}`,
|
|
67
|
+
`o2-evp-origin-version=${encodeURIComponent("0.2.12-beta.24")}`,
|
|
68
|
+
'o2-evp-origin=browser',
|
|
69
|
+
`o2-request-id=${(0, stringUtils_1.generateUUID)()}`,
|
|
63
70
|
].concat(extraParameters);
|
|
64
71
|
if (encoding) {
|
|
65
|
-
parameters.push(`
|
|
72
|
+
parameters.push(`o2-evp-encoding=${encoding}`);
|
|
66
73
|
}
|
|
67
74
|
if (trackType === 'rum') {
|
|
68
|
-
parameters.push(`batch_time=${(0, timeUtils_1.timeStampNow)()}`, `
|
|
75
|
+
parameters.push(`batch_time=${(0, timeUtils_1.timeStampNow)()}`, `_o2.api=${api}`);
|
|
69
76
|
if (retry) {
|
|
70
|
-
parameters.push(`
|
|
77
|
+
parameters.push(`_o2.retry_count=${retry.count}`, `_o2.retry_after=${retry.lastFailureStatus}`);
|
|
71
78
|
}
|
|
72
79
|
}
|
|
73
80
|
if (internalAnalyticsSubdomain) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"endpointBuilder.js","sourceRoot":"","sources":["../../../src/domain/configuration/endpointBuilder.ts"],"names":[],"mappings":";;AAqBA,sDAcC;
|
|
1
|
+
{"version":3,"file":"endpointBuilder.js","sourceRoot":"","sources":["../../../src/domain/configuration/endpointBuilder.ts"],"names":[],"mappings":"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"}
|
package/cjs/domain/tags.js
CHANGED
|
@@ -9,7 +9,7 @@ const display_1 = require("../tools/display");
|
|
|
9
9
|
exports.TAG_SIZE_LIMIT = 200;
|
|
10
10
|
function buildTags(configuration) {
|
|
11
11
|
const { env, service, version, datacenter, sdkVersion, variant } = configuration;
|
|
12
|
-
const tags = [buildTag('sdk_version', sdkVersion !== null && sdkVersion !== void 0 ? sdkVersion : "0.2.12-beta.
|
|
12
|
+
const tags = [buildTag('sdk_version', sdkVersion !== null && sdkVersion !== void 0 ? sdkVersion : "0.2.12-beta.24")];
|
|
13
13
|
if (env) {
|
|
14
14
|
tags.push(buildTag('env', env));
|
|
15
15
|
}
|
|
@@ -105,7 +105,7 @@ function startTelemetryCollection(telemetryService, configuration, hooks, observ
|
|
|
105
105
|
type: 'telemetry',
|
|
106
106
|
date: clockNow.timeStamp,
|
|
107
107
|
service: telemetryService,
|
|
108
|
-
version: "0.2.12-beta.
|
|
108
|
+
version: "0.2.12-beta.24",
|
|
109
109
|
source: 'browser',
|
|
110
110
|
_oo: {
|
|
111
111
|
format_version: 2,
|
package/esm/boot/init.js
CHANGED
|
@@ -3,7 +3,7 @@ import { setDebugMode } from '../tools/monitor';
|
|
|
3
3
|
import { display } from '../tools/display';
|
|
4
4
|
export function makePublicApi(stub) {
|
|
5
5
|
const publicApi = {
|
|
6
|
-
version: "0.2.12-beta.
|
|
6
|
+
version: "0.2.12-beta.24",
|
|
7
7
|
// This API method is intentionally not monitored, since the only thing executed is the
|
|
8
8
|
// user-provided 'callback'. All SDK usages executed in the callback should be monitored, and
|
|
9
9
|
// we don't want to interfere with the user uncaught exceptions.
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { catchUserErrors } from '../../tools/catchUserErrors';
|
|
2
|
-
import {
|
|
2
|
+
import { display } from '../../tools/display';
|
|
3
3
|
import { isPercentage } from '../../tools/utils/numberUtils';
|
|
4
4
|
import { objectHasValue } from '../../tools/utils/objectUtils';
|
|
5
5
|
import { selectSessionStoreStrategyType } from '../session/sessionStore';
|
|
@@ -35,11 +35,12 @@ function isString(tag, tagName) {
|
|
|
35
35
|
return true;
|
|
36
36
|
}
|
|
37
37
|
function isDatadogSite(site) {
|
|
38
|
-
if (site && typeof site === 'string' && !/(datadog|ddog|datad0g|dd0g)/.test(site)) {
|
|
39
|
-
display.error(`Site should be a valid Datadog site. ${MORE_DETAILS} ${DOCS_ORIGIN}/getting_started/site/.`);
|
|
40
|
-
return false;
|
|
41
|
-
}
|
|
42
38
|
return true;
|
|
39
|
+
// if (site && typeof site === 'string' && !/(datadog|ddog|datad0g|dd0g)/.test(site)) {
|
|
40
|
+
// display.error(`Site should be a valid Datadog site. ${MORE_DETAILS} ${DOCS_ORIGIN}/getting_started/site/.`)
|
|
41
|
+
// return false
|
|
42
|
+
// }
|
|
43
|
+
// return true
|
|
43
44
|
}
|
|
44
45
|
export function isSampleRate(sampleRate, name) {
|
|
45
46
|
if (sampleRate !== undefined && !isPercentage(sampleRate)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configuration.js","sourceRoot":"","sources":["../../../src/domain/configuration/configuration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAA;AAC7D,OAAO,
|
|
1
|
+
{"version":3,"file":"configuration.js","sourceRoot":"","sources":["../../../src/domain/configuration/configuration.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,8 +18,13 @@ export function createEndpointBuilder(initConfiguration, trackType, extraParamet
|
|
|
18
18
|
* request, as only parameters are changing.
|
|
19
19
|
*/
|
|
20
20
|
function createEndpointUrlWithParametersBuilder(initConfiguration, trackType) {
|
|
21
|
-
const path = `/api/v2/${trackType}
|
|
22
|
-
const proxy = initConfiguration
|
|
21
|
+
// const path = `/api/v2/${trackType}`
|
|
22
|
+
const { proxy, apiVersion, organizationIdentifier, insecureHTTP } = initConfiguration;
|
|
23
|
+
console.log('apiVersion', apiVersion);
|
|
24
|
+
console.log('organizationIdentifier', organizationIdentifier);
|
|
25
|
+
console.log('insecureHTTP', insecureHTTP);
|
|
26
|
+
const path = `/rum/${apiVersion}/${organizationIdentifier}/${trackType}`;
|
|
27
|
+
console.log('path', path);
|
|
23
28
|
if (typeof proxy === 'string') {
|
|
24
29
|
const normalizedProxyUrl = normalizeUrl(proxy);
|
|
25
30
|
return (parameters) => `${normalizedProxyUrl}?ooforward=${encodeURIComponent(`${path}?${parameters}`)}`;
|
|
@@ -28,10 +33,12 @@ function createEndpointUrlWithParametersBuilder(initConfiguration, trackType) {
|
|
|
28
33
|
return (parameters) => proxy({ path, parameters });
|
|
29
34
|
}
|
|
30
35
|
const host = buildEndpointHost(trackType, initConfiguration);
|
|
31
|
-
|
|
36
|
+
const protocol = insecureHTTP ? 'http' : 'https';
|
|
37
|
+
return (parameters) => `${protocol}://${host}${path}?${parameters}`;
|
|
32
38
|
}
|
|
33
39
|
export function buildEndpointHost(trackType, initConfiguration) {
|
|
34
40
|
const { site = INTAKE_SITE_US1, internalAnalyticsSubdomain } = initConfiguration;
|
|
41
|
+
return site;
|
|
35
42
|
if (trackType === 'logs' && initConfiguration.usePciIntake && site === INTAKE_SITE_US1) {
|
|
36
43
|
return PCI_INTAKE_HOST_US1;
|
|
37
44
|
}
|
|
@@ -51,19 +58,19 @@ export function buildEndpointHost(trackType, initConfiguration) {
|
|
|
51
58
|
*/
|
|
52
59
|
function buildEndpointParameters({ clientToken, internalAnalyticsSubdomain, source = 'browser' }, trackType, api, { retry, encoding }, extraParameters = []) {
|
|
53
60
|
const parameters = [
|
|
54
|
-
`
|
|
55
|
-
`
|
|
56
|
-
`
|
|
57
|
-
'
|
|
58
|
-
`
|
|
61
|
+
`o2source=${source}`,
|
|
62
|
+
`o2-api-key=${clientToken}`,
|
|
63
|
+
`o2-evp-origin-version=${encodeURIComponent("0.2.12-beta.24")}`,
|
|
64
|
+
'o2-evp-origin=browser',
|
|
65
|
+
`o2-request-id=${generateUUID()}`,
|
|
59
66
|
].concat(extraParameters);
|
|
60
67
|
if (encoding) {
|
|
61
|
-
parameters.push(`
|
|
68
|
+
parameters.push(`o2-evp-encoding=${encoding}`);
|
|
62
69
|
}
|
|
63
70
|
if (trackType === 'rum') {
|
|
64
|
-
parameters.push(`batch_time=${timeStampNow()}`, `
|
|
71
|
+
parameters.push(`batch_time=${timeStampNow()}`, `_o2.api=${api}`);
|
|
65
72
|
if (retry) {
|
|
66
|
-
parameters.push(`
|
|
73
|
+
parameters.push(`_o2.retry_count=${retry.count}`, `_o2.retry_after=${retry.lastFailureStatus}`);
|
|
67
74
|
}
|
|
68
75
|
}
|
|
69
76
|
if (internalAnalyticsSubdomain) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"endpointBuilder.js","sourceRoot":"","sources":["../../../src/domain/configuration/endpointBuilder.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAA;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAA;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAA;AAC5D,OAAO,EAAE,uBAAuB,EAAE,eAAe,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAA;AAiB9F,MAAM,UAAU,qBAAqB,CACnC,iBAAoC,EACpC,SAAoB,EACpB,eAA0B;IAE1B,MAAM,sBAAsB,GAAG,sCAAsC,CAAC,iBAAiB,EAAE,SAAS,CAAC,CAAA;IAEnG,OAAO;QACL,KAAK,CAAC,GAAY,EAAE,OAAgB;YAClC,MAAM,UAAU,GAAG,uBAAuB,CAAC,iBAAiB,EAAE,SAAS,EAAE,GAAG,EAAE,OAAO,EAAE,eAAe,CAAC,CAAA;YACvG,OAAO,sBAAsB,CAAC,UAAU,CAAC,CAAA;QAC3C,CAAC;QACD,SAAS;KACV,CAAA;AACH,CAAC;AAED;;;;GAIG;AACH,SAAS,sCAAsC,CAC7C,iBAAoC,EACpC,SAAoB;IAEpB,MAAM,IAAI,GAAG,
|
|
1
|
+
{"version":3,"file":"endpointBuilder.js","sourceRoot":"","sources":["../../../src/domain/configuration/endpointBuilder.ts"],"names":[],"mappings":"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"}
|
package/esm/domain/tags.js
CHANGED
|
@@ -2,7 +2,7 @@ import { DOCS_ORIGIN, MORE_DETAILS, display } from '../tools/display';
|
|
|
2
2
|
export const TAG_SIZE_LIMIT = 200;
|
|
3
3
|
export function buildTags(configuration) {
|
|
4
4
|
const { env, service, version, datacenter, sdkVersion, variant } = configuration;
|
|
5
|
-
const tags = [buildTag('sdk_version', sdkVersion !== null && sdkVersion !== void 0 ? sdkVersion : "0.2.12-beta.
|
|
5
|
+
const tags = [buildTag('sdk_version', sdkVersion !== null && sdkVersion !== void 0 ? sdkVersion : "0.2.12-beta.24")];
|
|
6
6
|
if (env) {
|
|
7
7
|
tags.push(buildTag('env', env));
|
|
8
8
|
}
|
|
@@ -92,7 +92,7 @@ export function startTelemetryCollection(telemetryService, configuration, hooks,
|
|
|
92
92
|
type: 'telemetry',
|
|
93
93
|
date: clockNow.timeStamp,
|
|
94
94
|
service: telemetryService,
|
|
95
|
-
version: "0.2.12-beta.
|
|
95
|
+
version: "0.2.12-beta.24",
|
|
96
96
|
source: 'browser',
|
|
97
97
|
_oo: {
|
|
98
98
|
format_version: 2,
|
package/package.json
CHANGED
|
@@ -348,11 +348,12 @@ function isString(tag: unknown, tagName: string): tag is string | undefined | nu
|
|
|
348
348
|
}
|
|
349
349
|
|
|
350
350
|
function isDatadogSite(site: unknown) {
|
|
351
|
-
|
|
352
|
-
|
|
353
|
-
|
|
354
|
-
|
|
355
|
-
|
|
351
|
+
return true;
|
|
352
|
+
// if (site && typeof site === 'string' && !/(datadog|ddog|datad0g|dd0g)/.test(site)) {
|
|
353
|
+
// display.error(`Site should be a valid Datadog site. ${MORE_DETAILS} ${DOCS_ORIGIN}/getting_started/site/.`)
|
|
354
|
+
// return false
|
|
355
|
+
// }
|
|
356
|
+
// return true
|
|
356
357
|
}
|
|
357
358
|
|
|
358
359
|
export function isSampleRate(sampleRate: unknown, name: string) {
|
|
@@ -44,8 +44,14 @@ function createEndpointUrlWithParametersBuilder(
|
|
|
44
44
|
initConfiguration: InitConfiguration,
|
|
45
45
|
trackType: TrackType
|
|
46
46
|
): (parameters: string) => string {
|
|
47
|
-
const path = `/api/v2/${trackType}`
|
|
48
|
-
const proxy = initConfiguration
|
|
47
|
+
// const path = `/api/v2/${trackType}`
|
|
48
|
+
const { proxy, apiVersion, organizationIdentifier, insecureHTTP } = initConfiguration
|
|
49
|
+
|
|
50
|
+
console.log('apiVersion', apiVersion)
|
|
51
|
+
console.log('organizationIdentifier', organizationIdentifier)
|
|
52
|
+
console.log('insecureHTTP', insecureHTTP)
|
|
53
|
+
const path = `/rum/${apiVersion}/${organizationIdentifier}/${trackType}`
|
|
54
|
+
console.log('path', path)
|
|
49
55
|
if (typeof proxy === 'string') {
|
|
50
56
|
const normalizedProxyUrl = normalizeUrl(proxy)
|
|
51
57
|
return (parameters) => `${normalizedProxyUrl}?ooforward=${encodeURIComponent(`${path}?${parameters}`)}`
|
|
@@ -54,7 +60,8 @@ function createEndpointUrlWithParametersBuilder(
|
|
|
54
60
|
return (parameters) => proxy({ path, parameters })
|
|
55
61
|
}
|
|
56
62
|
const host = buildEndpointHost(trackType, initConfiguration)
|
|
57
|
-
|
|
63
|
+
const protocol = insecureHTTP ? 'http' : 'https'
|
|
64
|
+
return (parameters) => `${protocol}://${host}${path}?${parameters}`
|
|
58
65
|
}
|
|
59
66
|
|
|
60
67
|
export function buildEndpointHost(
|
|
@@ -63,6 +70,8 @@ export function buildEndpointHost(
|
|
|
63
70
|
) {
|
|
64
71
|
const { site = INTAKE_SITE_US1, internalAnalyticsSubdomain } = initConfiguration
|
|
65
72
|
|
|
73
|
+
return site
|
|
74
|
+
|
|
66
75
|
if (trackType === 'logs' && initConfiguration.usePciIntake && site === INTAKE_SITE_US1) {
|
|
67
76
|
return PCI_INTAKE_HOST_US1
|
|
68
77
|
}
|
|
@@ -92,22 +101,22 @@ function buildEndpointParameters(
|
|
|
92
101
|
extraParameters: string[] = []
|
|
93
102
|
) {
|
|
94
103
|
const parameters = [
|
|
95
|
-
`
|
|
96
|
-
`
|
|
97
|
-
`
|
|
98
|
-
'
|
|
99
|
-
`
|
|
104
|
+
`o2source=${source}`,
|
|
105
|
+
`o2-api-key=${clientToken}`,
|
|
106
|
+
`o2-evp-origin-version=${encodeURIComponent(__BUILD_ENV__SDK_VERSION__)}`,
|
|
107
|
+
'o2-evp-origin=browser',
|
|
108
|
+
`o2-request-id=${generateUUID()}`,
|
|
100
109
|
].concat(extraParameters)
|
|
101
110
|
|
|
102
111
|
if (encoding) {
|
|
103
|
-
parameters.push(`
|
|
112
|
+
parameters.push(`o2-evp-encoding=${encoding}`)
|
|
104
113
|
}
|
|
105
114
|
|
|
106
115
|
if (trackType === 'rum') {
|
|
107
|
-
parameters.push(`batch_time=${timeStampNow()}`, `
|
|
116
|
+
parameters.push(`batch_time=${timeStampNow()}`, `_o2.api=${api}`)
|
|
108
117
|
|
|
109
118
|
if (retry) {
|
|
110
|
-
parameters.push(`
|
|
119
|
+
parameters.push(`_o2.retry_count=${retry.count}`, `_o2.retry_after=${retry.lastFailureStatus}`)
|
|
111
120
|
}
|
|
112
121
|
}
|
|
113
122
|
|