Merge branch 'master' into bcaudan/batch_time-all

DataDog · Mar 12, 2020 · 9edc354 · 9edc354
2 parents 05885ff + 6744714
commit 9edc354
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 8 deletions.
diff --git a/lerna.json b/lerna.json
@@ -1,7 +1,7 @@
 {
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "version": "1.7.0",
+  "version": "1.7.1",
   "publishConfig": {
     "access": "public"
   }

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@datadog/browser-core",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "license": "Apache-2.0",
   "main": "cjs/index.js",
   "module": "esm/index.js",

diff --git a/packages/core/src/utils.ts b/packages/core/src/utils.ts
@@ -191,11 +191,22 @@ export function isNumber(value: unknown): value is number {
  * Related issue in Firefox: https://bugzilla.mozilla.org/show_bug.cgi?id=1429926
  */
 export function getRelativeTime(timestamp: number) {
-  return timestamp - performance.timing.navigationStart
+  return timestamp - getNavigationStart()
 }
 
 export function getTimestamp(relativeTime: number) {
-  return Math.floor(performance.timing.navigationStart + relativeTime)
+  return Math.floor(getNavigationStart() + relativeTime)
+}
+
+/**
+ * Navigation start slightly change on some rare cases
+ */
+let navigationStart: number | undefined
+export function getNavigationStart() {
+  if (navigationStart === undefined) {
+    navigationStart = performance.timing.navigationStart
+  }
+  return navigationStart
 }
 
 export function objectValues(object: { [key: string]: unknown }) {

diff --git a/packages/logs/package.json b/packages/logs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@datadog/browser-logs",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "license": "Apache-2.0",
   "main": "cjs/index.js",
   "module": "esm/index.js",
@@ -13,7 +13,7 @@
     "replace-build-env": "node ../../scripts/replace-build-env.js"
   },
   "dependencies": {
-    "@datadog/browser-core": "1.7.0",
+    "@datadog/browser-core": "1.7.1",
     "lodash.assign": "4.2.0",
     "lodash.merge": "4.6.2",
     "tslib": "1.10.0"

diff --git a/packages/rum/package.json b/packages/rum/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@datadog/browser-rum",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "license": "Apache-2.0",
   "main": "cjs/index.js",
   "module": "esm/index.js",
@@ -13,7 +13,7 @@
     "replace-build-env": "node ../../scripts/replace-build-env.js"
   },
   "dependencies": {
-    "@datadog/browser-core": "1.7.0",
+    "@datadog/browser-core": "1.7.1",
     "lodash.assign": "4.2.0",
     "lodash.merge": "4.6.2",
     "tslib": "1.10.0"