Skip to content

Commit

Permalink
RUM & Logs package bump (#16348)
Browse files Browse the repository at this point in the history
* Bumps rum/logs versions, adds IA subdomain parameter

* Use production RUM app for all env

* Updates client token for preview

* Bumps rum / logs versions again

* Replaces deprecated config parameter
  • Loading branch information
bgdeutsch authored Jan 10, 2023
1 parent 009963b commit a0763ae
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 32 deletions.
19 changes: 15 additions & 4 deletions assets/scripts/components/dd-browser-logs-rum.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import configDocs from '../config/config-docs';
const { env, branch } = document.documentElement.dataset;
const lang = document.documentElement.lang || 'en';

function getConfig() {
if (env === 'live') {
return configDocs['live'];
Expand All @@ -11,7 +12,9 @@ function getConfig() {
return configDocs['development'];
}
}

const Config = getConfig();

if (window.DD_RUM) {
if (env === 'preview' || env === 'live') {
window.DD_RUM.init({
Expand All @@ -22,33 +25,41 @@ if (window.DD_RUM) {
version: CI_COMMIT_SHORT_SHA,
trackInteractions: true,
trackFrustrations: true,
enableExperimentalFeatures: ["frustration-signals","clickmap"],
enableExperimentalFeatures: ["clickmap"],
sampleRate: 50,
premiumSampleRate: 50,
allowedTracingOrigins: [window.location.origin]
sessionReplaySampleRate: 50,
allowedTracingOrigins: [window.location.origin],
internalAnalyticsSubdomain: 'iam-rum-intake'
});

window.DD_RUM.startSessionReplayRecording();

if (branch) {
window.DD_RUM.addRumGlobalContext('branch', branch);
}
}
}

if (window.DD_LOGS) {
// init browser logs
window.DD_LOGS.init({
clientToken: Config.ddClientToken,
forwardErrorsToLogs: true,
env,
service: 'docs',
version: CI_COMMIT_SHORT_SHA
version: CI_COMMIT_SHORT_SHA,
internalAnalyticsSubdomain: 'iam-rum-intake'
});

// global context
window.DD_LOGS.addLoggerGlobalContext('host', window.location.host);
window.DD_LOGS.addLoggerGlobalContext('referrer', document.referrer);
window.DD_LOGS.addLoggerGlobalContext('lang', lang);

if (branch) {
window.DD_LOGS.addLoggerGlobalContext('branch', branch);
}

// Locally log to console
window.DD_LOGS.logger.setHandler(Config.loggingHandler);
}
4 changes: 2 additions & 2 deletions assets/scripts/config/config-docs.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ module.exports = {
gaTag: 'UA-21102638-5'
},
preview: {
ddClientToken: 'pub36877d3864fab670b5ae7e1d5d26cb08',
ddApplicationId: 'c4e83ad8-4eda-4d2e-aae1-d943abce0463',
ddClientToken: 'pub16bb5ef3e9bf55f156338987e27246c7',
ddApplicationId: '3493b4e7-ab12-4852-8836-ba96af7bc745',
loggingHandler: 'http',
algoliaConfig: {
index: 'docsearch_docs_preview',
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
"dependencies": {
"@apidevtools/json-schema-ref-parser": "^8.0.0",
"@babel/polyfill": "^7.4.4",
"@datadog/browser-logs": "^4.19.1",
"@datadog/browser-rum": "^4.19.1",
"@datadog/browser-logs": "^4.29.1",
"@datadog/browser-rum": "^4.29.1",
"a11y": "https://s3.amazonaws.com/origin-static-assets/corp-node-packages/master/a11y-v1.0.1.tgz",
"algoliasearch": "4.14.2",
"bootstrap": "4.3.1",
Expand Down
48 changes: 24 additions & 24 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1673,48 +1673,48 @@ __metadata:
languageName: node
linkType: hard

"@datadog/browser-core@npm:4.19.1":
version: 4.19.1
resolution: "@datadog/browser-core@npm:4.19.1"
checksum: ee6df60ecf6bbcae8f7d397d9b8ac0b5e830fdc045a8e56cdd93599dd602ff2987a9e56179b4ed0212c3546f3cdaecebb8161b17b3bab67ebd249444222ddc03
"@datadog/browser-core@npm:4.29.1":
version: 4.29.1
resolution: "@datadog/browser-core@npm:4.29.1"
checksum: 8bc45cf4151cb8c07b09de8c670c0484c478c23d9151f18e652f32d19c69bbd889f861db3742dc605ec0c601bc79483cb346ab6bb527b3c237827e5c5bef0475
languageName: node
linkType: hard

"@datadog/browser-logs@npm:^4.19.1":
version: 4.19.1
resolution: "@datadog/browser-logs@npm:4.19.1"
"@datadog/browser-logs@npm:^4.29.1":
version: 4.29.1
resolution: "@datadog/browser-logs@npm:4.29.1"
dependencies:
"@datadog/browser-core": 4.19.1
"@datadog/browser-core": 4.29.1
peerDependencies:
"@datadog/browser-rum": 4.19.1
"@datadog/browser-rum": 4.29.1
peerDependenciesMeta:
"@datadog/browser-rum":
optional: true
checksum: 3c2b1029bcd44fdc70713b7adb8bec8d9861f68d9e22c83f876a730bd2ad443c2262dfdc38219146d7511b458da062e7c37bd293af81833d7adaa596b5bc6bee
checksum: 45e2cde795710d8d537e72eda166c5ed9b7c4ef54e842326db79d98a9fb0c72443d25ef7992423625d866f84c8a82929dce2fd27a128cb022977a78b73693999
languageName: node
linkType: hard

"@datadog/browser-rum-core@npm:4.19.1":
version: 4.19.1
resolution: "@datadog/browser-rum-core@npm:4.19.1"
"@datadog/browser-rum-core@npm:4.29.1":
version: 4.29.1
resolution: "@datadog/browser-rum-core@npm:4.29.1"
dependencies:
"@datadog/browser-core": 4.19.1
checksum: fd9b471a380a6ecc585981b9b116b8e36cc005f443e08db884df1ae3fdee64758c6129fdc514cd40c37ea8e3ddc49f0d19f24397a4d1961eebb24248c111129b
"@datadog/browser-core": 4.29.1
checksum: 8870d4bc24d6a1d7a3d86cb64c2edabde18c0c478df0a221b33d4f7655e6b0f6ec79a40969982c95b5fbe83cd39baa133ea8f8475c65e9c82254031aefddb8a8
languageName: node
linkType: hard

"@datadog/browser-rum@npm:^4.19.1":
version: 4.19.1
resolution: "@datadog/browser-rum@npm:4.19.1"
"@datadog/browser-rum@npm:^4.29.1":
version: 4.29.1
resolution: "@datadog/browser-rum@npm:4.29.1"
dependencies:
"@datadog/browser-core": 4.19.1
"@datadog/browser-rum-core": 4.19.1
"@datadog/browser-core": 4.29.1
"@datadog/browser-rum-core": 4.29.1
peerDependencies:
"@datadog/browser-logs": 4.19.1
"@datadog/browser-logs": 4.29.1
peerDependenciesMeta:
"@datadog/browser-logs":
optional: true
checksum: 2f158dd5b0c3fb77167898eea7d682b78b8b03610cbfbb3681821346263ffcc913d864b9cee7b1039f06491ed961de11d9c18a7ffc53aaed483306c2f391f55f
checksum: 6c6433f130ec9b503a2b25afb05d1374e7e5e85f798808015622eeb6139dedb97a6c045a90cc70401ad3de8d442a54484166f4ce7ae03d94c6ad937f65154608
languageName: node
linkType: hard

Expand Down Expand Up @@ -4404,8 +4404,8 @@ __metadata:
"@babel/plugin-proposal-object-rest-spread": ^7.18.6
"@babel/polyfill": ^7.4.4
"@babel/preset-env": ^7.18.6
"@datadog/browser-logs": ^4.19.1
"@datadog/browser-rum": ^4.19.1
"@datadog/browser-logs": ^4.29.1
"@datadog/browser-rum": ^4.29.1
"@datadog/datadog-ci": ^1.2.0
a11y: "https://s3.amazonaws.com/origin-static-assets/corp-node-packages/master/a11y-v1.0.1.tgz"
acorn: ^7.1.1
Expand Down

0 comments on commit a0763ae

Please sign in to comment.