Skip to content

Commit 1d5a844

Browse files
committed
Merge branch 'develop' into abhi-vercel-ai
2 parents 562e082 + e35c691 commit 1d5a844

File tree

40 files changed

+358
-366
lines changed

40 files changed

+358
-366
lines changed

.size-limit.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ module.exports = [
228228
import: createImport('init'),
229229
ignore: [...builtinModules, ...nodePrefixedBuiltinModules],
230230
gzip: true,
231-
limit: '160 KB',
231+
limit: '170 KB',
232232
},
233233
{
234234
name: '@sentry/node - without tracing',
@@ -260,7 +260,7 @@ module.exports = [
260260
import: createImport('init'),
261261
ignore: [...builtinModules, ...nodePrefixedBuiltinModules],
262262
gzip: true,
263-
limit: '150 KB',
263+
limit: '135 KB',
264264
},
265265
];
266266

dev-packages/e2e-tests/README.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,14 @@ EOF
5757

5858
Make sure to add a `test:build` and `test:assert` command to the new app's `package.json` file.
5959

60-
Add the new test app to `test-application` matrix in `.github/workflows/build.yml` for the `job_e2e_tests` job. If you
61-
want to run a canary test, add it to the `canary.yml` workflow.
60+
Test apps in the folder `test-applications` will be automatically picked up by CI in the job `job_e2e_tests` (in `.github/workflows/build.yml`).
61+
The test matrix for CI is generated in `dev-packages/e2e-tests/lib/getTestMatrix.ts`.
62+
63+
For each test app, CI checks its dependencies (and devDependencies) to see if any of them have changed in the current PR (based on nx affected projects).
64+
For example, if something is changed in the browser package, only E2E test apps that depend on browser will run, while others will be skipped.
65+
66+
You can add additional information about the test (e.g. canary versions, optional in CI) by adding `sentryTest` in the `package.json`
67+
of a test application.
6268

6369
**An important thing to note:** In the context of the build/test commands the fake test registry is available at
6470
`http://127.0.0.1:4873`. It hosts all of our packages as if they were to be published with the state of the current

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { conditionalTest } from '../../../../utils';
33
import { createRunner } from '../../../../utils/runner';
44
import { createTestServer } from '../../../../utils/server';
55

6-
conditionalTest({ min: 18 })('outgoing sampled http requests are correctly instrumented in ESM', () => {
6+
conditionalTest({ min: 18 })('outgoing http in ESM', () => {
77
test('outgoing sampled http requests are correctly instrumented in ESM', done => {
88
expect.assertions(11);
99

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,10 @@
115115
- Deprecated `wrapUseRoutes`. Use `wrapUseRoutesV6` or `wrapUseRoutesV7` instead.
116116
- Deprecated `wrapCreateBrowserRouter`. Use `wrapCreateBrowserRouterV6` or `wrapCreateBrowserRouterV7` instead.
117117

118+
## `@sentry/nextjs`
119+
120+
- Deprecated `hideSourceMaps`. No replacements. The SDK emits hidden sourcemaps by default.
121+
118122
## `@sentry/opentelemetry`
119123

120124
- Deprecated `generateSpanContextForPropagationContext` in favor of doing this manually - we do not need this export anymore.

packages/angular/src/tracing.ts

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -271,8 +271,9 @@ export class TraceDirective implements OnInit, AfterViewInit {
271271
* @inheritdoc
272272
*/
273273
public ngAfterViewInit(): void {
274-
if (this._tracingSpan) {
275-
runOutsideAngular(() => this._tracingSpan!.end());
274+
const span = this._tracingSpan;
275+
if (span) {
276+
runOutsideAngular(() => span.end());
276277
}
277278
}
278279
}
@@ -302,8 +303,7 @@ export function TraceClass(options?: TraceClassOptions): ClassDecorator {
302303
/* eslint-disable @typescript-eslint/no-unsafe-member-access */
303304
return target => {
304305
const originalOnInit = target.prototype.ngOnInit;
305-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
306-
target.prototype.ngOnInit = function (...args: any[]): ReturnType<typeof originalOnInit> {
306+
target.prototype.ngOnInit = function (...args: unknown[]): ReturnType<typeof originalOnInit> {
307307
tracingSpan = runOutsideAngular(() =>
308308
startInactiveSpan({
309309
onlyIfParent: true,
@@ -321,8 +321,7 @@ export function TraceClass(options?: TraceClassOptions): ClassDecorator {
321321
};
322322

323323
const originalAfterViewInit = target.prototype.ngAfterViewInit;
324-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
325-
target.prototype.ngAfterViewInit = function (...args: any[]): ReturnType<typeof originalAfterViewInit> {
324+
target.prototype.ngAfterViewInit = function (...args: unknown[]): ReturnType<typeof originalAfterViewInit> {
326325
if (tracingSpan) {
327326
runOutsideAngular(() => tracingSpan.end());
328327
}
@@ -345,11 +344,9 @@ interface TraceMethodOptions {
345344
* Decorator function that can be used to capture a single lifecycle methods of the component.
346345
*/
347346
export function TraceMethod(options?: TraceMethodOptions): MethodDecorator {
348-
// eslint-disable-next-line @typescript-eslint/ban-types
349-
return (target: Object, propertyKey: string | symbol, descriptor: PropertyDescriptor) => {
347+
return (_target: unknown, propertyKey: string | symbol, descriptor: PropertyDescriptor) => {
350348
const originalMethod = descriptor.value;
351-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
352-
descriptor.value = function (...args: any[]): ReturnType<typeof originalMethod> {
349+
descriptor.value = function (...args: unknown[]): ReturnType<typeof originalMethod> {
353350
const now = timestampInSeconds();
354351

355352
runOutsideAngular(() => {

packages/aws-serverless/package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,10 @@
6464
"access": "public"
6565
},
6666
"dependencies": {
67-
"@opentelemetry/instrumentation": "^0.55.0",
68-
"@opentelemetry/instrumentation-aws-lambda": "0.48.0",
69-
"@opentelemetry/instrumentation-aws-sdk": "0.47.0",
67+
"@opentelemetry/api": "^1.9.0",
68+
"@opentelemetry/instrumentation": "^0.56.0",
69+
"@opentelemetry/instrumentation-aws-lambda": "0.49.0",
70+
"@opentelemetry/instrumentation-aws-sdk": "0.48.0",
7071
"@sentry/core": "8.42.0",
7172
"@sentry/node": "8.42.0",
7273
"@types/aws-lambda": "^8.10.62"

packages/browser/src/integrations/globalhandlers.ts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,12 @@ function _eventFromRejectionWithPrimitive(reason: Primitive): Event {
153153
};
154154
}
155155

156-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
157-
function _enhanceEventWithInitialFrame(event: Event, url: any, line: any, column: any): Event {
156+
function _enhanceEventWithInitialFrame(
157+
event: Event,
158+
url: string | undefined,
159+
line: number | undefined,
160+
column: number | undefined,
161+
): Event {
158162
// event.exception
159163
const e = (event.exception = event.exception || {});
160164
// event.exception.values
@@ -166,8 +170,8 @@ function _enhanceEventWithInitialFrame(event: Event, url: any, line: any, column
166170
// event.exception.values[0].stacktrace.frames
167171
const ev0sf = (ev0s.frames = ev0s.frames || []);
168172

169-
const colno = isNaN(parseInt(column, 10)) ? undefined : column;
170-
const lineno = isNaN(parseInt(line, 10)) ? undefined : line;
173+
const colno = column;
174+
const lineno = line;
171175
const filename = isString(url) && url.length > 0 ? url : getLocationHref();
172176

173177
// event.exception.values[0].stacktrace.frames

packages/browser/src/sdk.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,7 @@ export function init(browserOptions: BrowserOptions = {}): Client | undefined {
198198
* All properties the report dialog supports
199199
*/
200200
export interface ReportDialogOptions {
201+
// TODO(v9): Change this to [key: string]: unknkown;
201202
// eslint-disable-next-line @typescript-eslint/no-explicit-any
202203
[key: string]: any;
203204
eventId?: string;

packages/core/src/api.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ export function getEnvelopeEndpointWithUrlEncodedAuth(dsn: DsnComponents, tunnel
4747
export function getReportDialogEndpoint(
4848
dsnLike: DsnLike,
4949
dialogOptions: {
50+
// TODO(v9): Change this to [key: string]: unknown;
5051
// eslint-disable-next-line @typescript-eslint/no-explicit-any
5152
[key: string]: any;
5253
user?: { name?: string; email?: string };

packages/core/src/baseclient.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,7 @@ export abstract class BaseClient<O extends ClientOptions> implements Client<O> {
158158
/**
159159
* @inheritDoc
160160
*/
161-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
162-
public captureException(exception: any, hint?: EventHint, scope?: Scope): string {
161+
public captureException(exception: unknown, hint?: EventHint, scope?: Scope): string {
163162
const eventId = uuid4();
164163

165164
// ensure we haven't captured this very object before
@@ -915,8 +914,7 @@ export abstract class BaseClient<O extends ClientOptions> implements Client<O> {
915914
/**
916915
* @inheritDoc
917916
*/
918-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
919-
public abstract eventFromException(_exception: any, _hint?: EventHint): PromiseLike<Event>;
917+
public abstract eventFromException(_exception: unknown, _hint?: EventHint): PromiseLike<Event>;
920918

921919
/**
922920
* @inheritDoc

0 commit comments

Comments
 (0)