Merge branch 'develop' into abhi-test-only-context-lines

getsentry · Jul 11, 2023 · fe351af · fe351af
2 parents 0918223 + 99a0864
commit fe351af
Show file tree

Hide file tree

Showing 9 changed files with 203 additions and 197 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -742,7 +742,7 @@ jobs:
  strategy:
  fail-fast: false
  matrix:
- shard: [1, 2, 3]
+ shard: [1, 2, 3, 4]
 
  steps:
  - name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
@@ -773,7 +773,7 @@ jobs:
  E2E_TEST_SENTRY_ORG_SLUG: 'sentry-javascript-sdks'
  E2E_TEST_SENTRY_TEST_PROJECT: 'sentry-javascript-e2e-tests'
  E2E_TEST_SHARD: ${{ matrix.shard }}
- E2E_TEST_SHARD_AMOUNT: 3
+ E2E_TEST_SHARD_AMOUNT: 4
  run: |
  cd packages/e2e-tests
  yarn test:e2e

diff --git a/packages/e2e-tests/test-applications/create-remix-app/test-recipe.json b/packages/e2e-tests/test-applications/create-remix-app/test-recipe.json
@@ -1,6 +1,6 @@
 {
  "$schema": "../../test-recipe-schema.json",
  "testApplicationName": "create-remix-app",
- "buildCommand": "pnpm install && pnpm build && pnpm start",
+ "buildCommand": "# disabling build test because it is causing timeouts: https://github.com/getsentry/sentry-javascript/pull/8486 pnpm install && pnpm build && pnpm start",
  "tests": []
 }
diff --git a/packages/nextjs/test/buildProcess/testApp/yarn.lock b/packages/nextjs/test/buildProcess/testApp/yarn.lock
diff --git a/packages/node/src/index.ts b/packages/node/src/index.ts
@@ -60,6 +60,7 @@ export { makeNodeTransport } from './transports';
 export { defaultIntegrations, init, defaultStackParser, lastEventId, flush, close, getSentryRelease } from './sdk';
 export { addRequestDataToEvent, DEFAULT_USER_INCLUDES, extractRequestData } from './requestdata';
 export { deepReadDirSync } from './utils';
+export { getModuleFromFilename } from './module';
 
 import { Integrations as CoreIntegrations } from '@sentry/core';
 

diff --git a/packages/node/src/module.ts b/packages/node/src/module.ts
@@ -10,7 +10,7 @@ function normalizeWindowsPath(path: string): string {
 }
 
 /** Gets the module from a filename */
-export function getModule(
+export function getModuleFromFilename(
  filename: string | undefined,
  normalizeWindowsPathSeparator: boolean = isWindowsPlatform,
 ): string | undefined {

diff --git a/packages/node/src/sdk.ts b/packages/node/src/sdk.ts
@@ -31,7 +31,7 @@ import {
  RequestData,
  Undici,
 } from './integrations';
-import { getModule } from './module';
+import { getModuleFromFilename } from './module';
 import { makeNodeTransport } from './transports';
 import type { NodeClientOptions, NodeOptions } from './types';
 
@@ -267,7 +267,7 @@ export function getSentryRelease(fallback?: string): string | undefined {
 }
 
 /** Node.js stack parser */
-export const defaultStackParser: StackParser = createStackParser(nodeStackLineParser(getModule));
+export const defaultStackParser: StackParser = createStackParser(nodeStackLineParser(getModuleFromFilename));
 
 /**
  * Enable automatic Session Tracking for the node process.

diff --git a/packages/node/test/manual/webpack-async-context/yarn.lock b/packages/node/test/manual/webpack-async-context/yarn.lock
@@ -2112,9 +2112,9 @@ schema-utils@^1.0.0:
  ajv-keywords "^3.1.0"
 
 semver@^5.5.0, semver@^5.6.0:
- version "5.7.1"
- resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
- integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
+ version "5.7.2"
+ resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
+ integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
 
 serialize-javascript@^2.1.2:
  version "2.1.2"

diff --git a/packages/node/test/module.test.ts b/packages/node/test/module.test.ts
@@ -1,4 +1,4 @@
-import { getModule } from '../src/module';
+import { getModuleFromFilename } from '../src/module';
 
 function withFilename(fn: () => void, filename: string) {
  const prevFilename = require.main?.filename;
@@ -15,16 +15,16 @@ function withFilename(fn: () => void, filename: string) {
  }
 }
 
-describe('getModule', () => {
+describe('getModuleFromFilename', () => {
  test('Windows', () => {
  withFilename(() => {
- expect(getModule('C:\\Users\\users\\Tim\\Desktop\\node_modules\\module.js', true)).toEqual('module');
+ expect(getModuleFromFilename('C:\\Users\\users\\Tim\\Desktop\\node_modules\\module.js', true)).toEqual('module');
  }, 'C:\\Users\\Tim\\app.js');
  });
 
  test('POSIX', () => {
  withFilename(() => {
- expect(getModule('/Users/users/Tim/Desktop/node_modules/module.js')).toEqual('module');
+ expect(getModuleFromFilename('/Users/users/Tim/Desktop/node_modules/module.js')).toEqual('module');
  }, '/Users/Tim/app.js');
  });
 });
diff --git a/yarn.lock b/yarn.lock
@@ -24135,9 +24135,9 @@ semver-intersect@1.4.0:
  semver "^5.0.0"
 
 "semver@2 || 3 || 4 || 5", semver@^5.0.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0, semver@^5.7.0, semver@^5.7.1:
- version "5.7.1"
- resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
- integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
+ version "5.7.2"
+ resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
+ integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
 
 semver@7.3.2:
  version "7.3.2"
@@ -24158,24 +24158,24 @@ semver@7.3.5:
  dependencies:
  lru-cache "^6.0.0"
 
-semver@7.5.3, semver@^7.3.8:
+semver@7.5.3:
  version "7.5.3"
  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.3.tgz#161ce8c2c6b4b3bdca6caadc9fa3317a4c4fe88e"
  integrity sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==
  dependencies:
  lru-cache "^6.0.0"
 
-semver@7.x, semver@^7.0.0, semver@^7.1.1, semver@^7.1.3, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7:
- version "7.3.8"
- resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798"
- integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==
+semver@7.x, semver@^7.0.0, semver@^7.1.1, semver@^7.1.3, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8:
+ version "7.5.4"
+ resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
+ integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
  dependencies:
  lru-cache "^6.0.0"
 
 semver@^6.0.0, semver@^6.1.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0:
- version "6.3.0"
- resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
- integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
+ version "6.3.1"
+ resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
+ integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
 send@0.18.0:
  version "0.18.0"