Skip to content

Commit

Permalink
Merge pull request cBioPortal#4785 from alisman/datadoglog
Browse files Browse the repository at this point in the history
Add datadog logging to frontend
  • Loading branch information
alisman authored Nov 27, 2023
2 parents 5281bbd + ca9abb3 commit 4bcbe7e
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 6 deletions.
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@
"@babel/plugin-transform-modules-commonjs": "^7.4.4",
"@babel/preset-env": "^7.4.4",
"@babel/preset-react": "^7.0.0",
"@datadog/browser-logs": "^5.4.0",
"@rollup/plugin-commonjs": "^22.0.0",
"@rollup/plugin-image": "^2.1.1",
"@rollup/plugin-json": "^4.1.0",
Expand Down
20 changes: 20 additions & 0 deletions src/appBootstrapper.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ import { Router } from 'react-router-dom';
import { createBrowserHistory } from 'history';
import { syncHistoryWithStore } from 'mobx-react-router';
import ExtendedRoutingStore from './shared/lib/ExtendedRouterStore';
import { datadogLogs } from '@datadog/browser-logs';

import {
fetchServerConfig,
getLoadConfig,
Expand Down Expand Up @@ -215,6 +217,24 @@ browserWindow.routingStore = routingStore;
let render = (key?: number) => {
if (!getBrowserWindow().navigator.webdriver) initializeTracking();

if (stores.appStore.serverConfig.app_name === 'mskcc-portal') {
datadogLogs.init({
clientToken: 'pub9a94ebb002f105ff44d8e427b6549775',
site: 'datadoghq.com',
service: 'cbioportalinternal',
forwardErrorsToLogs: true,
sessionSampleRate: 100,
beforeSend: (log: any) => {
switch (log.origin) {
case 'console':
return false;
default:
// let dd send log
}
},
} as any);
}

const rootNode = document.getElementById('reactRoot');

ReactDOM.render(
Expand Down
18 changes: 12 additions & 6 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1147,6 +1147,18 @@
dependencies:
"@cspotcode/source-map-consumer" "0.8.0"

"@datadog/[email protected]":
version "5.4.0"
resolved "https://registry.yarnpkg.com/@datadog/browser-core/-/browser-core-5.4.0.tgz#c9d55357d75a6ce25a95d235795d6b68c6f85e17"
integrity sha512-8HlKAcKXm7cJmzWQTVGnZiBs21BXkmRiknDaH9NbO6UT5JqYupXe/3zEesoX6Kxad2EzGlPVpBV816luWfqepw==

"@datadog/browser-logs@^5.4.0":
version "5.4.0"
resolved "https://registry.yarnpkg.com/@datadog/browser-logs/-/browser-logs-5.4.0.tgz#fc346364b1e59acb24d400114ef74adb6f223b92"
integrity sha512-0eLkUHUTnch8cpJMqV421XpUaEs0yS/4xriWz+GsAs+2uFQGio26fDmdRGOvK+8JowDBSv9VY+YzRi8iXlhJOA==
dependencies:
"@datadog/browser-core" "5.4.0"

"@datastructures-js/max-heap@^2.0.0":
version "2.0.0"
resolved "https://registry.yarnpkg.com/@datastructures-js/max-heap/-/max-heap-2.0.0.tgz#4ab3bbc09706ff632aaa6d85fe6ba51747663b9a"
Expand Down Expand Up @@ -16637,12 +16649,6 @@ mobx@^6.0.0:
dependencies:
mobx "^6.0.0"

"mobxpromise@github:cbioportal/mobxpromise#b6cf1d86a72644b2521463c4db428408dbcb35b1":
version "2.0.1"
resolved "https://codeload.github.com/cbioportal/mobxpromise/tar.gz/b6cf1d86a72644b2521463c4db428408dbcb35b1"
dependencies:
mobx "^6.0.0"

"mobxpromise@github:cbioportal/mobxpromise#c3429672eb39be54e54ce14a8636e8d843729db3":
version "2.0.1"
resolved "https://codeload.github.com/cbioportal/mobxpromise/tar.gz/c3429672eb39be54e54ce14a8636e8d843729db3"
Expand Down

0 comments on commit 4bcbe7e

Please sign in to comment.