chore: resolve conflict from PR getsentry#14745

Lei-k · Dec 18, 2024 · dd4505e · dd4505e
2 parents dc69ad3 + d773cb7
commit dd4505e
Show file tree

Hide file tree

Showing 69 changed files with 7 additions and 2,255 deletions.
diff --git a/dev-packages/browser-integration-tests/suites/metrics/metricsEvent/init.js b/dev-packages/browser-integration-tests/suites/metrics/metricsEvent/init.js
diff --git a/dev-packages/browser-integration-tests/suites/metrics/metricsEvent/test.ts b/dev-packages/browser-integration-tests/suites/metrics/metricsEvent/test.ts
diff --git a/dev-packages/browser-integration-tests/suites/metrics/metricsShim/init.js b/dev-packages/browser-integration-tests/suites/metrics/metricsShim/init.js
diff --git a/dev-packages/browser-integration-tests/suites/metrics/metricsShim/test.ts b/dev-packages/browser-integration-tests/suites/metrics/metricsShim/test.ts
diff --git a/dev-packages/browser-integration-tests/suites/metrics/timing/init.js b/dev-packages/browser-integration-tests/suites/metrics/timing/init.js
diff --git a/dev-packages/browser-integration-tests/suites/metrics/timing/test.ts b/dev-packages/browser-integration-tests/suites/metrics/timing/test.ts
diff --git a/dev-packages/browser-integration-tests/utils/helpers.ts b/dev-packages/browser-integration-tests/utils/helpers.ts
@@ -270,18 +270,6 @@ export function shouldSkipFeedbackTest(): boolean {
   return false;
 }
 
-/**
- * We can only test metrics tests in certain bundles/packages:
- * - NPM (ESM, CJS)
- * - CDN bundles that include tracing
- *
- * @returns `true` if we should skip the metrics test
- */
-export function shouldSkipMetricsTest(): boolean {
-  const bundle = process.env.PW_BUNDLE as string | undefined;
-  return bundle != null && !bundle.includes('tracing') && !bundle.includes('esm') && !bundle.includes('cjs');
-}
-
 /**
  * We only test feature flags integrations in certain bundles/packages:
  * - NPM (ESM, CJS)

diff --git a/dev-packages/node-integration-tests/suites/metrics/should-exit-forced.js b/dev-packages/node-integration-tests/suites/metrics/should-exit-forced.js
diff --git a/dev-packages/node-integration-tests/suites/metrics/should-exit.js b/dev-packages/node-integration-tests/suites/metrics/should-exit.js