fix: bad reverts

Author: logaretm

packages/core/src/constants.ts

@@ -1 +1,2 @@
 export const DEFAULT_ENVIRONMENT = 'production';
+export const DEV_ENVIRONMENT = 'development';

packages/core/src/index.ts

@@ -101,7 +101,7 @@ export {
   headersToDict,
   httpHeadersToSpanAttributes,
 } from './utils/request';
-export { DEFAULT_ENVIRONMENT } from './constants';
+export { DEFAULT_ENVIRONMENT, DEV_ENVIRONMENT } from './constants';
 export { addBreadcrumb } from './breadcrumbs';
 export { functionToStringIntegration } from './integrations/functiontostring';
 // eslint-disable-next-line deprecation/deprecation

packages/core/src/utils/time.ts

@@ -78,12 +78,14 @@ let cachedTimeOrigin: number | null | undefined = null;
 
 /**
  * Gets the time origin and the mode used to determine it.
+ *
+ * Unfortunately browsers may report an inaccurate time origin data, through either performance.timeOrigin or
+ * performance.timing.navigationStart, which results in poor results in performance data. We only treat time origin
+ * data as reliable if they are within a reasonable threshold of the current time.
+ *
  * TODO: move to `@sentry/browser-utils` package.
  */
 function getBrowserTimeOrigin(): number | undefined {
-  // Unfortunately browsers may report an inaccurate time origin data, through either performance.timeOrigin or
-  // performance.timing.navigationStart, which results in poor results in performance data. We only treat time origin
-  // data as reliable if they are within a reasonable threshold of the current time.
   const { performance } = GLOBAL_OBJ as typeof GLOBAL_OBJ & Window;
   if (!performance?.now) {
     return undefined;
@@ -93,11 +95,13 @@ function getBrowserTimeOrigin(): number | undefined {
   const performanceNow = performance.now();
   const dateNow = Date.now();
 
-  // if timeOrigin isn't available set delta to threshold so it isn't used
-  const timeOriginDelta = performance.timeOrigin
-    ? Math.abs(performance.timeOrigin + performanceNow - dateNow)
-    : threshold;
-  const timeOriginIsReliable = timeOriginDelta < threshold;
+  const timeOrigin = performance.timeOrigin;
+  if (typeof timeOrigin === 'number') {
+    const timeOriginDelta = Math.abs(timeOrigin + performanceNow - dateNow);
+    if (timeOriginDelta < threshold) {
+      return timeOrigin;
+    }
+  }
 
   // TODO: Remove all code related to `performance.timing.navigationStart` once we drop support for Safari 14.
   // `performance.timeSince` is available in Safari 15.
@@ -110,23 +114,16 @@ function getBrowserTimeOrigin(): number | undefined {
   // Date API.
   // eslint-disable-next-line deprecation/deprecation
   const navigationStart = performance.timing?.navigationStart;
-  const hasNavigationStart = typeof navigationStart === 'number';
-  // if navigationStart isn't available set delta to threshold so it isn't used
-  const navigationStartDelta = hasNavigationStart ? Math.abs(navigationStart + performanceNow - dateNow) : threshold;
-  const navigationStartIsReliable = navigationStartDelta < threshold;
-
-  // TODO: Since timeOrigin explicitly replaces navigationStart, we should probably remove the navigationStartIsReliable check.
-  if (timeOriginIsReliable && timeOriginDelta <= navigationStartDelta) {
-    return performance.timeOrigin;
-  }
-
-  if (navigationStartIsReliable) {
-    return navigationStart;
+  if (typeof navigationStart === 'number') {
+    const navigationStartDelta = Math.abs(navigationStart + performanceNow - dateNow);
+    if (navigationStartDelta < threshold) {
+      return navigationStart;
+    }
   }
 
-  // TODO: We should probably fall back to Date.now() - performance.now(), since this is still more accurate than just Date.now() (?)
-  // Either both timeOrigin and navigationStart are skewed or neither is available, fallback to Date.
-  return dateNow;
+  // Either both timeOrigin and navigationStart are skewed or neither is available, fallback to subtracting
+  // `performance.now()` from `Date.now()`.
+  return dateNow - performanceNow;
 }
 
 /**

packages/core/test/lib/utils/time.test.ts

@@ -27,12 +27,12 @@ describe('browserPerformanceTimeOrigin', () => {
     vi.unstubAllGlobals();
   });
 
-  it('returns `Date.now()` if `performance.timeOrigin` is not reliable', async () => {
+  it('returns `Date.now() - performance.now()` if `performance.timeOrigin` is not reliable', async () => {
     const currentTimeMs = 1767778040866;
 
     const unreliableTime = currentTimeMs - RELIABLE_THRESHOLD_MS - 2_000;
 
-    const timeSincePageloadMs = 1_234.789;
+    const timeSincePageloadMs = 1_234.56789;
 
     vi.useFakeTimers();
     vi.setSystemTime(new Date(currentTimeMs));
@@ -46,39 +46,36 @@ describe('browserPerformanceTimeOrigin', () => {
     });
 
     const timeOrigin = await getFreshPerformanceTimeOrigin();
-    expect(timeOrigin).toBe(1767778040866);
+    expect(timeOrigin).toBe(currentTimeMs - timeSincePageloadMs);
 
     vi.useRealTimers();
     vi.unstubAllGlobals();
   });
 
-  it('returns `performance.timing.navigationStart` if `performance.timeOrigin` is not available', async () => {
-    const currentTimeMs = 1767778040870;
-
-    const navigationStartMs = currentTimeMs - 2_000;
+  it('returns `Date.now() - performance.now()` if neither `performance.timeOrigin` nor `performance.timing.navigationStart` are available', async () => {
+    const currentTimeMs = 1767778040866;
 
-    const timeSincePageloadMs = 1_234.789;
+    const timeSincePageloadMs = 1_234.56789;
 
     vi.useFakeTimers();
     vi.setSystemTime(new Date(currentTimeMs));
-
     vi.stubGlobal('performance', {
       timeOrigin: undefined,
       timing: {
-        navigationStart: navigationStartMs,
+        navigationStart: undefined,
       },
       now: () => timeSincePageloadMs,
     });
 
     const timeOrigin = await getFreshPerformanceTimeOrigin();
-    expect(timeOrigin).toBe(navigationStartMs);
+    expect(timeOrigin).toBe(currentTimeMs - timeSincePageloadMs);
 
     vi.useRealTimers();
     vi.unstubAllGlobals();
   });
 
-  it('returns `performance.timing.navigationStart` if `performance.timeOrigin` is less reliable', async () => {
-    const currentTimeMs = 1767778040874;
+  it('returns `performance.timing.navigationStart` if `performance.timeOrigin` is not available', async () => {
+    const currentTimeMs = 1767778040870;
 
     const navigationStartMs = currentTimeMs - 2_000;
 
@@ -88,7 +85,7 @@ describe('browserPerformanceTimeOrigin', () => {
     vi.setSystemTime(new Date(currentTimeMs));
 
     vi.stubGlobal('performance', {
-      timeOrigin: navigationStartMs - 1,
+      timeOrigin: undefined,
       timing: {
         navigationStart: navigationStartMs,
       },