Skip to content

Commit 9ed84b3

Browse files
authored
Merge branch 'develop' into timfish/fix/anr-localvariables-with-debugger
2 parents c638ef1 + 67b8d3e commit 9ed84b3

File tree

28 files changed

+654
-382
lines changed

28 files changed

+654
-382
lines changed

.github/workflows/auto-release.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,16 @@ jobs:
1313
name: 'Prepare a new version'
1414

1515
steps:
16+
- name: Get auth token
17+
id: token
18+
uses: actions/create-github-app-token@5d869da34e18e7287c1daad50e0b8ea0f506ce69 # v1.11.0
19+
with:
20+
app-id: ${{ vars.SENTRY_RELEASE_BOT_CLIENT_ID }}
21+
private-key: ${{ secrets.SENTRY_RELEASE_BOT_PRIVATE_KEY }}
22+
1623
- uses: actions/checkout@v4
1724
with:
18-
token: ${{ secrets.GH_RELEASE_PAT }}
25+
token: ${{ steps.token.outputs.token }}
1926
fetch-depth: 0
2027

2128
# https://github.com/actions-ecosystem/action-regex-match
@@ -38,7 +45,7 @@ jobs:
3845
uses: getsentry/action-prepare-release@v1
3946
if: github.event.pull_request.merged == true && steps.version-regex.outputs.match != '' && steps.get_version.outputs.version != ''
4047
env:
41-
GITHUB_TOKEN: ${{ secrets.GH_RELEASE_PAT }}
48+
GITHUB_TOKEN: ${{ steps.token.outputs.token }}
4249
with:
4350
version: ${{ steps.get_version.outputs.version }}
4451
force: false

.github/workflows/canary.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,12 @@ jobs:
149149
timeout-minutes: 7
150150
run: yarn ${{ matrix.build-command }}
151151

152+
- name: Install Playwright
153+
uses: ./.github/actions/install-playwright
154+
with:
155+
browsers: chromium
156+
cwd: dev-packages/e2e-tests/test-applications/${{ matrix.test-application }}
157+
152158
- name: Run E2E test
153159
working-directory: dev-packages/e2e-tests/test-applications/${{ matrix.test-application }}
154160
timeout-minutes: 15

.github/workflows/release.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,20 @@ jobs:
1717
runs-on: ubuntu-20.04
1818
name: 'Release a new version'
1919
steps:
20+
- name: Get auth token
21+
id: token
22+
uses: actions/create-github-app-token@5d869da34e18e7287c1daad50e0b8ea0f506ce69 # v1.11.0
23+
with:
24+
app-id: ${{ vars.SENTRY_RELEASE_BOT_CLIENT_ID }}
25+
private-key: ${{ secrets.SENTRY_RELEASE_BOT_PRIVATE_KEY }}
2026
- uses: actions/checkout@v4
2127
with:
22-
token: ${{ secrets.GH_RELEASE_PAT }}
28+
token: ${{ steps.token.outputs.token }}
2329
fetch-depth: 0
2430
- name: Prepare release
2531
uses: getsentry/action-prepare-release@v1
2632
env:
27-
GITHUB_TOKEN: ${{ secrets.GH_RELEASE_PAT }}
33+
GITHUB_TOKEN: ${{ steps.token.outputs.token }}
2834
with:
2935
version: ${{ github.event.inputs.version }}
3036
force: ${{ github.event.inputs.force }}

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010

1111
- "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
1212

13+
Work in this release was contributed by @robinvw1. Thank you for your contribution!
14+
1315
## 8.43.0
1416

1517
### Important Changes

dev-packages/e2e-tests/test-applications/nestjs-8/tests/transactions.test.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,10 @@ test('Sends an API route transaction', async ({ baseURL }) => {
4646
origin: 'auto.http.otel.http',
4747
});
4848

49+
expect(transactionEvent.contexts?.response).toEqual({
50+
status_code: 200,
51+
});
52+
4953
expect(transactionEvent).toEqual(
5054
expect.objectContaining({
5155
spans: expect.arrayContaining([

dev-packages/e2e-tests/test-applications/node-express/tests/transactions.test.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,10 @@ test('Sends an API route transaction', async ({ baseURL }) => {
4646
origin: 'auto.http.otel.http',
4747
});
4848

49+
expect(transactionEvent.contexts?.response).toEqual({
50+
status_code: 200,
51+
});
52+
4953
expect(transactionEvent).toEqual(
5054
expect.objectContaining({
5155
transaction: 'GET /test-transaction',

dev-packages/e2e-tests/test-applications/tanstack-router/yarn.lock

Lines changed: 283 additions & 277 deletions
Large diffs are not rendered by default.
Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
1+
import { spawnSync } from 'child_process';
2+
import { join } from 'path';
13
import { conditionalTest } from '../../../utils';
2-
import { cleanupChildProcesses, createRunner } from '../../../utils/runner';
4+
import { cleanupChildProcesses } from '../../../utils/runner';
35

46
afterAll(() => {
57
cleanupChildProcesses();
68
});
79

810
conditionalTest({ min: 18 })('import-in-the-middle', () => {
9-
test('onlyIncludeInstrumentedModules', done => {
10-
createRunner(__dirname, 'app.mjs').ensureNoErrorOutput().start(done);
11+
test('onlyIncludeInstrumentedModules', () => {
12+
const result = spawnSync('node', [join(__dirname, 'app.mjs')], { encoding: 'utf-8' });
13+
expect(result.stderr).not.toMatch('should be the only hooked modules but we just hooked');
1114
});
1215
});

docs/migration/draft-v9-migration-guide.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@
1919
In v9, we will streamline this behavior so that passing `undefined` will result in tracing being disabled, the same as not passing the option at all.
2020
If you are relying on `undefined` being passed in and having tracing enabled because of this, you should update your config to set e.g. `tracesSampleRate: 0` instead, which will also enable tracing in v9.
2121

22+
- **The `autoSessionTracking` option is deprecated.**
23+
24+
To enable session tracking, it is recommended to unset `autoSessionTracking` and ensure that either, in browser environments the `browserSessionIntegration` is added, or in server environments the `httpIntegration` is added.
25+
To disable session tracking, it is recommended unset `autoSessionTracking` and to remove the `browserSessionIntegration` in browser environments, or in server environments configure the `httpIntegration` with the `trackIncomingRequestsAsSessions` option set to `false`.
26+
2227
## `@sentry/utils`
2328

2429
- **The `@sentry/utils` package has been deprecated. Import everything from `@sentry/core` instead.**

packages/angular/src/sdk.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ export function getDefaultIntegrations(options: BrowserOptions = {}): Integratio
4242
httpContextIntegration(),
4343
];
4444

45+
// eslint-disable-next-line deprecation/deprecation
4546
if (options.autoSessionTracking !== false) {
4647
integrations.push(browserSessionIntegration());
4748
}

0 commit comments

Comments
 (0)