Merge branch 'develop' into lforst-rm-relh

Author: Luca Forstner

dev-packages/e2e-tests/test-applications/node-express/package.json

@@ -15,16 +15,19 @@
     "@sentry/node": "latest || *",
     "@trpc/server": "10.45.2",
     "@trpc/client": "10.45.2",
-    "@types/express": "4.17.17",
+    "@types/express": "^4.17.21",
     "@types/node": "^18.19.1",
-    "express": "4.20.0",
+    "express": "^4.21.2",
     "typescript": "~5.0.0",
     "zod": "~3.22.4"
   },
   "devDependencies": {
     "@playwright/test": "^1.44.1",
     "@sentry-internal/test-utils": "link:../../../test-utils"
   },
+  "resolutions": {
+    "@types/qs": "6.9.17"
+  },
   "volta": {
     "extends": "../../package.json"
   }

dev-packages/e2e-tests/test-applications/node-express/tsconfig.json

@@ -2,7 +2,7 @@
   "compilerOptions": {
     "types": ["node"],
     "esModuleInterop": true,
-    "lib": ["es2018"],
+    "lib": ["es2020"],
     "strict": true,
     "outDir": "dist"
   },

dev-packages/node-integration-tests/suites/client-reports/drop-reasons/before-send/test.ts

@@ -6,6 +6,7 @@ afterAll(() => {
 
 test('should record client report for beforeSend', done => {
   createRunner(__dirname, 'scenario.ts')
+    .unignore('client_report')
     .expect({
       client_report: {
         discarded_events: [

dev-packages/node-integration-tests/suites/client-reports/drop-reasons/event-processors/test.ts

@@ -6,6 +6,7 @@ afterAll(() => {
 
 test('should record client report for event processors', done => {
   createRunner(__dirname, 'scenario.ts')
+    .unignore('client_report')
     .expect({
       client_report: {
         discarded_events: [

dev-packages/node-integration-tests/suites/client-reports/periodic-send/test.ts

@@ -6,6 +6,7 @@ afterAll(() => {
 
 test('should flush client reports automatically after the timeout interval', done => {
   createRunner(__dirname, 'scenario.ts')
+    .unignore('client_report')
     .expect({
       client_report: {
         discarded_events: [

dev-packages/node-integration-tests/suites/tracing/requests/http-unsampled/test.ts

@@ -27,7 +27,6 @@ test('outgoing http requests are correctly instrumented when not sampled', done
     .then(([SERVER_URL, closeTestServer]) => {
       createRunner(__dirname, 'scenario.ts')
         .withEnv({ SERVER_URL })
-        .ignore('client_report')
         .expect({
           event: {
             exception: {

dev-packages/node-integration-tests/utils/runner.ts

@@ -152,7 +152,7 @@ export function createRunner(...paths: string[]) {
   let expectedEnvelopeHeaders: ExpectedEnvelopeHeader[] | undefined = undefined;
   const flags: string[] = [];
   // By default, we ignore session & sessions
-  const ignored: Set<EnvelopeItemType> = new Set(['session', 'sessions']);
+  const ignored: Set<EnvelopeItemType> = new Set(['session', 'sessions', 'client_report']);
   let withEnv: Record<string, string> = {};
   let withSentryServer = false;
   let dockerOptions: DockerOptions | undefined;

package.json

@@ -68,7 +68,6 @@
     "packages/integration-shims",
     "packages/nestjs",
     "packages/nextjs",
-    "packages/nitro-utils",
     "packages/node",
     "packages/nuxt",
     "packages/opentelemetry",

packages/browser-utils/src/metrics/browserMetrics.ts

@@ -83,7 +83,7 @@ interface StartTrackingWebVitalsOptions {
  */
 export function startTrackingWebVitals({ recordClsStandaloneSpans }: StartTrackingWebVitalsOptions): () => void {
   const performance = getBrowserPerformanceAPI();
-  if (performance && browserPerformanceTimeOrigin) {
+  if (performance && browserPerformanceTimeOrigin()) {
     // @ts-expect-error we want to make sure all of these are available, even if TS is sure they are
     if (performance.mark) {
       WINDOW.performance.mark('sentry-tracing-init');
@@ -117,7 +117,7 @@ export function startTrackingLongTasks(): void {
     const { op: parentOp, start_timestamp: parentStartTimestamp } = spanToJSON(parent);
 
     for (const entry of entries) {
-      const startTime = msToSec((browserPerformanceTimeOrigin as number) + entry.startTime);
+      const startTime = msToSec((browserPerformanceTimeOrigin() as number) + entry.startTime);
       const duration = msToSec(entry.duration);
 
       if (parentOp === 'navigation' && parentStartTimestamp && startTime < parentStartTimestamp) {
@@ -156,7 +156,7 @@ export function startTrackingLongAnimationFrames(): void {
         continue;
       }
 
-      const startTime = msToSec((browserPerformanceTimeOrigin as number) + entry.startTime);
+      const startTime = msToSec((browserPerformanceTimeOrigin() as number) + entry.startTime);
 
       const { start_timestamp: parentStartTimestamp, op: parentOp } = spanToJSON(parent);
 
@@ -167,7 +167,6 @@ export function startTrackingLongAnimationFrames(): void {
         // routing instrumentations
         continue;
       }
-
       const duration = msToSec(entry.duration);
 
       const attributes: SpanAttributes = {
@@ -210,7 +209,7 @@ export function startTrackingInteractions(): void {
     }
     for (const entry of entries) {
       if (entry.name === 'click') {
-        const startTime = msToSec((browserPerformanceTimeOrigin as number) + entry.startTime);
+        const startTime = msToSec((browserPerformanceTimeOrigin() as number) + entry.startTime);
         const duration = msToSec(entry.duration);
 
         const spanOptions: StartSpanOptions & Required<Pick<StartSpanOptions, 'attributes'>> = {
@@ -271,7 +270,7 @@ function _trackFID(): () => void {
       return;
     }
 
-    const timeOrigin = msToSec(browserPerformanceTimeOrigin as number);
+    const timeOrigin = msToSec(browserPerformanceTimeOrigin() as number);
     const startTime = msToSec(entry.startTime);
     _measurements['fid'] = { value: metric.value, unit: 'millisecond' };
     _measurements['mark.fid'] = { value: timeOrigin + startTime, unit: 'second' };
@@ -300,12 +299,13 @@ interface AddPerformanceEntriesOptions {
 /** Add performance related spans to a transaction */
 export function addPerformanceEntries(span: Span, options: AddPerformanceEntriesOptions): void {
   const performance = getBrowserPerformanceAPI();
-  if (!performance?.getEntries || !browserPerformanceTimeOrigin) {
+  const origin = browserPerformanceTimeOrigin();
+  if (!performance?.getEntries || !origin) {
     // Gatekeeper if performance API not available
     return;
   }
 
-  const timeOrigin = msToSec(browserPerformanceTimeOrigin);
+  const timeOrigin = msToSec(origin);
 
   const performanceEntries = performance.getEntries();
 

packages/browser-utils/src/metrics/cls.ts

@@ -90,7 +90,7 @@ export function trackClsAsStandaloneSpan(): void {
 function sendStandaloneClsSpan(clsValue: number, entry: LayoutShift | undefined, pageloadSpanId: string) {
   DEBUG_BUILD && logger.log(`Sending CLS span (${clsValue})`);
 
-  const startTime = msToSec((browserPerformanceTimeOrigin || 0) + (entry?.startTime || 0));
+  const startTime = msToSec((browserPerformanceTimeOrigin() || 0) + (entry?.startTime || 0));
   const routeName = getCurrentScope().getScopeData().transactionName;
 
   const name = entry ? htmlTreeAsString(entry.sources[0]?.node) : 'Layout shift';