Skip to content

Commit fbee088

Browse files
author
Luca Forstner
committed
Merge remote-tracking branch 'origin/develop' into lforst-parent-sampling-decision
2 parents f5a8220 + 03e0d02 commit fbee088

File tree

26 files changed

+621
-2970
lines changed

26 files changed

+621
-2970
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -747,7 +747,7 @@ jobs:
747747
run: yarn test
748748

749749
job_remix_integration_tests:
750-
name: Remix v${{ matrix.remix }} (Node ${{ matrix.node }}) Tests
750+
name: Remix (Node ${{ matrix.node }}) Tests
751751
needs: [job_get_metadata, job_build]
752752
if: needs.job_build.outputs.changed_remix == 'true' || github.event_name != 'pull_request'
753753
runs-on: ubuntu-20.04

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
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 @GrizliK1988, @davidturissini, @nwalters512, @aloisklink, @arturovt, @benjick, @maximepvrt, @mstrokin, and @kunal-511. Thank you for your contributions!
13+
Work in this release was contributed by @tjhiggins, @GrizliK1988, @davidturissini, @nwalters512, @aloisklink, @arturovt, @benjick, @maximepvrt, @mstrokin, and @kunal-511. Thank you for your contributions!
1414

1515
- **feat(solidstart)!: Default to `--import` setup and add `autoInjectServerSentry` ([#14862](https://github.com/getsentry/sentry-javascript/pull/14862))**
1616

dev-packages/browser-integration-tests/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@
4646
"@sentry/browser": "8.45.0",
4747
"axios": "1.7.7",
4848
"babel-loader": "^8.2.2",
49-
"html-webpack-plugin": "^5.5.0",
5049
"fflate": "0.8.2",
50+
"html-webpack-plugin": "^5.5.0",
5151
"webpack": "^5.95.0"
5252
},
5353
"devDependencies": {

dev-packages/e2e-tests/test-applications/nestjs-fastify/src/app.controller.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Controller, Get, Param, ParseIntPipe, UseFilters, UseGuards, UseInterceptors } from '@nestjs/common';
1+
import { All, Controller, Get, Param, ParseIntPipe, UseFilters, UseGuards, UseInterceptors } from '@nestjs/common';
22
import { flush } from '@sentry/nestjs';
33
import { AppService } from './app.service';
44
import { AsyncInterceptor } from './async-example.interceptor';
@@ -121,4 +121,9 @@ export class AppController {
121121
testFunctionName() {
122122
return this.appService.getFunctionName();
123123
}
124+
125+
@All('test-all')
126+
testAll() {
127+
return {};
128+
}
124129
}

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -808,3 +808,8 @@ test('Calling canActivate method on service with Injectable decorator returns 20
808808
const response = await fetch(`${baseURL}/test-service-canActivate`);
809809
expect(response.status).toBe(200);
810810
});
811+
812+
test('Calling @All method on service with Injectable decorator returns 200', async ({ baseURL }) => {
813+
const response = await fetch(`${baseURL}/test-all`);
814+
expect(response.status).toBe(200);
815+
});

dev-packages/node-integration-tests/scripts/use-ts-3_8.js

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,23 @@
11
/* eslint-disable no-console */
22
const { execSync } = require('child_process');
33
const { join } = require('path');
4-
const { writeFileSync } = require('fs');
4+
const { readFileSync, writeFileSync } = require('fs');
55

66
const cwd = join(__dirname, '../../..');
77

8+
// Newer versions of the Express types use syntax that isn't supported by TypeScript 3.8.
9+
// We'll pin to the last version of those types that are compatible.
10+
console.log('Pinning Express types to old versions...');
11+
12+
const packageJsonPath = join(cwd, 'package.json');
13+
const packageJson = JSON.parse(readFileSync(packageJsonPath, 'utf8'));
14+
15+
if (!packageJson.resolutions) packageJson.resolutions = {};
16+
packageJson.resolutions['@types/express'] = '4.17.13';
17+
packageJson.resolutions['@types/express-serve-static-core'] = '4.17.30';
18+
19+
writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2));
20+
821
const tsVersion = '3.8';
922

1023
console.log(`Installing typescript@${tsVersion}, and @types/node@14...`);
@@ -20,7 +33,7 @@ const baseTscConfigPath = join(cwd, 'packages/typescript/tsconfig.json');
2033

2134
const tsConfig = require(baseTscConfigPath);
2235

23-
// TS 3.8 fails build when it encounteres a config option it does not understand, so we remove it :(
36+
// TS 3.8 fails build when it encounters a config option it does not understand, so we remove it :(
2437
delete tsConfig.compilerOptions.noUncheckedIndexedAccess;
2538

2639
writeFileSync(baseTscConfigPath, JSON.stringify(tsConfig, null, 2));

docs/migration/v8-to-v9.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ We no longer test against Node 14 and Node 16 and cannot guarantee that the SDK
3838

3939
If you need to support older browsers, we recommend transpiling your code using Babel or similar tooling.
4040

41+
**Deno:** The minimum supported Deno version is now **2.0.0**.
42+
4143
### Framework Support Changes
4244

4345
Support for the following Framework versions is dropped:
@@ -271,6 +273,8 @@ Let us know if this is causing issues in your setup by opening an issue on GitHu
271273

272274
### `@sentry/deno`
273275

276+
The minimum supported Deno version is now **2.0.0**.
277+
274278
- `@sentry/deno` is no longer published on `deno.land` so you'll need to import
275279
from npm:
276280

@@ -345,6 +349,7 @@ The `enableTracing` option was removed. In v9, to emulate `enableTracing: true`,
345349
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.
346350

347351
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`.
352+
Additionally, in Node.js environments, a session was automatically created for every node process when `autoSessionTracking` was set to `true`. This behavior has been replaced by the `processSessionIntegration` which is configured by default.
348353

349354
- **The metrics API has been removed from the SDK.**
350355

packages/aws-serverless/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,9 @@
6565
},
6666
"dependencies": {
6767
"@opentelemetry/api": "^1.9.0",
68-
"@opentelemetry/instrumentation": "^0.56.0",
69-
"@opentelemetry/instrumentation-aws-lambda": "0.50.0",
70-
"@opentelemetry/instrumentation-aws-sdk": "0.48.0",
68+
"@opentelemetry/instrumentation": "^0.57.1",
69+
"@opentelemetry/instrumentation-aws-lambda": "0.50.2",
70+
"@opentelemetry/instrumentation-aws-sdk": "0.49.0",
7171
"@sentry/core": "8.45.0",
7272
"@sentry/node": "8.45.0",
7373
"@types/aws-lambda": "^8.10.62"

packages/core/src/client.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -758,7 +758,7 @@ export abstract class Client<O extends ClientOptions = ClientOptions> {
758758

759759
/** Updates existing session based on the provided event */
760760
protected _updateSessionFromEvent(session: Session, event: Event): void {
761-
let crashed = false;
761+
let crashed = event.level === 'fatal';
762762
let errored = false;
763763
const exceptions = event.exception?.values;
764764

packages/deno/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212

1313
## Links
1414

15-
- [SDK on Deno registry](https://deno.land/x/sentry)
1615
- [Official SDK Docs](https://docs.sentry.io/quickstart/)
1716
- [TypeDoc](http://getsentry.github.io/sentry-javascript/)
1817

0 commit comments

Comments
 (0)