Merge branch 'develop' into sig/import-flag-default

Author: s1gr1d

dev-packages/e2e-tests/README.md

@@ -57,8 +57,14 @@ EOF
 
 Make sure to add a `test:build` and `test:assert` command to the new app's `package.json` file.
 
-Add the new test app to `test-application` matrix in `.github/workflows/build.yml` for the `job_e2e_tests` job. If you
-want to run a canary test, add it to the `canary.yml` workflow.
+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`).
+The test matrix for CI is generated in `dev-packages/e2e-tests/lib/getTestMatrix.ts`.
+
+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).
+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.
+
+You can add additional information about the test (e.g. canary versions, optional in CI) by adding `sentryTest` in the `package.json`
+of a test application.
 
 **An important thing to note:** In the context of the build/test commands the fake test registry is available at
 `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/sessions/server.ts

@@ -13,6 +13,7 @@ import express from 'express';
 
 const app = express();
 
+// eslint-disable-next-line deprecation/deprecation
 const flusher = (Sentry.getClient() as Sentry.NodeClient)['_sessionFlusher'] as SessionFlusher;
 
 // Flush after 2 seconds (to avoid waiting for the default 60s)

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

@@ -47,6 +47,10 @@
 - Deprecated `addTracingHeadersToFetchRequest` method - this was only meant for internal use and is not needed anymore.
 - Deprecated `generatePropagationContext()` in favor of using `generateTraceId()` directly.
 - Deprecated `spanId` field on `propagationContext` - this field will be removed in v9, and should neither be read or set anymore.
+- Deprecated `RequestSession` type. No replacements.
+- Deprecated `RequestSessionStatus` type. No replacements.
+- Deprecated `SessionFlusherLike` type. No replacements.
+- Deprecated `SessionFlusher`. No replacements.
 
 ## `@sentry/nestjs`
 
@@ -69,6 +73,9 @@
 - **The `@sentry/types` package has been deprecated. Import everything from `@sentry/core` instead.**
 
 - Deprecated `Request` in favor of `RequestEventData`.
+- Deprecated `RequestSession`. No replacements.
+- Deprecated `RequestSessionStatus`. No replacements.
+- Deprecated `SessionFlusherLike`. No replacements.
 
 ## `@sentry/nuxt`
 

packages/angular/src/tracing.ts

@@ -271,8 +271,9 @@ export class TraceDirective implements OnInit, AfterViewInit {
    * @inheritdoc
    */
   public ngAfterViewInit(): void {
-    if (this._tracingSpan) {
-      runOutsideAngular(() => this._tracingSpan!.end());
+    const span = this._tracingSpan;
+    if (span) {
+      runOutsideAngular(() => span.end());
     }
   }
 }
@@ -302,8 +303,7 @@ export function TraceClass(options?: TraceClassOptions): ClassDecorator {
   /* eslint-disable @typescript-eslint/no-unsafe-member-access */
   return target => {
     const originalOnInit = target.prototype.ngOnInit;
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    target.prototype.ngOnInit = function (...args: any[]): ReturnType<typeof originalOnInit> {
+    target.prototype.ngOnInit = function (...args: unknown[]): ReturnType<typeof originalOnInit> {
       tracingSpan = runOutsideAngular(() =>
         startInactiveSpan({
           onlyIfParent: true,
@@ -321,8 +321,7 @@ export function TraceClass(options?: TraceClassOptions): ClassDecorator {
     };
 
     const originalAfterViewInit = target.prototype.ngAfterViewInit;
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    target.prototype.ngAfterViewInit = function (...args: any[]): ReturnType<typeof originalAfterViewInit> {
+    target.prototype.ngAfterViewInit = function (...args: unknown[]): ReturnType<typeof originalAfterViewInit> {
       if (tracingSpan) {
         runOutsideAngular(() => tracingSpan.end());
       }
@@ -345,11 +344,9 @@ interface TraceMethodOptions {
  * Decorator function that can be used to capture a single lifecycle methods of the component.
  */
 export function TraceMethod(options?: TraceMethodOptions): MethodDecorator {
-  // eslint-disable-next-line @typescript-eslint/ban-types
-  return (target: Object, propertyKey: string | symbol, descriptor: PropertyDescriptor) => {
+  return (_target: unknown, propertyKey: string | symbol, descriptor: PropertyDescriptor) => {
     const originalMethod = descriptor.value;
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    descriptor.value = function (...args: any[]): ReturnType<typeof originalMethod> {
+    descriptor.value = function (...args: unknown[]): ReturnType<typeof originalMethod> {
       const now = timestampInSeconds();
 
       runOutsideAngular(() => {

packages/browser/src/integrations/globalhandlers.ts

@@ -153,8 +153,12 @@ function _eventFromRejectionWithPrimitive(reason: Primitive): Event {
   };
 }
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-function _enhanceEventWithInitialFrame(event: Event, url: any, line: any, column: any): Event {
+function _enhanceEventWithInitialFrame(
+  event: Event,
+  url: string | undefined,
+  line: number | undefined,
+  column: number | undefined,
+): Event {
   // event.exception
   const e = (event.exception = event.exception || {});
   // event.exception.values
@@ -166,8 +170,8 @@ function _enhanceEventWithInitialFrame(event: Event, url: any, line: any, column
   // event.exception.values[0].stacktrace.frames
   const ev0sf = (ev0s.frames = ev0s.frames || []);
 
-  const colno = isNaN(parseInt(column, 10)) ? undefined : column;
-  const lineno = isNaN(parseInt(line, 10)) ? undefined : line;
+  const colno = column;
+  const lineno = line;
   const filename = isString(url) && url.length > 0 ? url : getLocationHref();
 
   // event.exception.values[0].stacktrace.frames

packages/browser/src/sdk.ts

@@ -198,6 +198,7 @@ export function init(browserOptions: BrowserOptions = {}): Client | undefined {
  * All properties the report dialog supports
  */
 export interface ReportDialogOptions {
+  // TODO(v9): Change this to  [key: string]: unknkown;
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   [key: string]: any;
   eventId?: string;

packages/core/src/api.ts

@@ -47,6 +47,7 @@ export function getEnvelopeEndpointWithUrlEncodedAuth(dsn: DsnComponents, tunnel
 export function getReportDialogEndpoint(
   dsnLike: DsnLike,
   dialogOptions: {
+    // TODO(v9): Change this to  [key: string]: unknown;
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     [key: string]: any;
     user?: { name?: string; email?: string };

packages/core/src/baseclient.ts

@@ -158,8 +158,7 @@ export abstract class BaseClient<O extends ClientOptions> implements Client<O> {
   /**
    * @inheritDoc
    */
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  public captureException(exception: any, hint?: EventHint, scope?: Scope): string {
+  public captureException(exception: unknown, hint?: EventHint, scope?: Scope): string {
     const eventId = uuid4();
 
     // ensure we haven't captured this very object before
@@ -915,8 +914,7 @@ export abstract class BaseClient<O extends ClientOptions> implements Client<O> {
   /**
    * @inheritDoc
    */
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  public abstract eventFromException(_exception: any, _hint?: EventHint): PromiseLike<Event>;
+  public abstract eventFromException(_exception: unknown, _hint?: EventHint): PromiseLike<Event>;
 
   /**
    * @inheritDoc

packages/core/src/envelope.ts

@@ -7,6 +7,9 @@ import type {
   Event,
   EventEnvelope,
   EventItem,
+  LegacyCSPReport,
+  RawSecurityEnvelope,
+  RawSecurityItem,
   SdkInfo,
   SdkMetadata,
   Session,
@@ -24,6 +27,7 @@ import {
   createSpanEnvelopeItem,
   getSdkMetadataForEnvelopeHeader,
 } from './utils-hoist/envelope';
+import { uuid4 } from './utils-hoist/misc';
 import { showSpanDropWarning, spanToJSON } from './utils/spanUtils';
 
 /**
@@ -141,3 +145,26 @@ export function createSpanEnvelope(spans: [SentrySpan, ...SentrySpan[]], client?
 
   return createEnvelope<SpanEnvelope>(headers, items);
 }
+
+/**
+ * Create an Envelope from a CSP report.
+ */
+export function createRawSecurityEnvelope(
+  report: LegacyCSPReport,
+  dsn: DsnComponents,
+  tunnel?: string,
+  release?: string,
+  environment?: string,
+): RawSecurityEnvelope {
+  const envelopeHeaders = {
+    event_id: uuid4(),
+    ...(!!tunnel && dsn && { dsn: dsnToString(dsn) }),
+  };
+
+  const eventItem: RawSecurityItem = [
+    { type: 'raw_security', sentry_release: release, sentry_environment: environment },
+    report,
+  ];
+
+  return createEnvelope<RawSecurityEnvelope>(envelopeHeaders, [eventItem]);
+}

packages/core/src/exports.ts

@@ -34,11 +34,7 @@ import { parseEventHintOrCaptureContext } from './utils/prepareEvent';
  * @param hint Optional additional data to attach to the Sentry event.
  * @returns the id of the captured Sentry event.
  */
-export function captureException(
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  exception: any,
-  hint?: ExclusiveEventHintOrCaptureContext,
-): string {
+export function captureException(exception: unknown, hint?: ExclusiveEventHintOrCaptureContext): string {
   return getCurrentScope().captureException(exception, parseEventHintOrCaptureContext(hint));
 }
 
@@ -73,8 +69,7 @@ export function captureEvent(event: Event, hint?: EventHint): string {
  * @param name of the context
  * @param context Any kind of data. This data will be normalized.
  */
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export function setContext(name: string, context: { [key: string]: any } | null): void {
+export function setContext(name: string, context: { [key: string]: unknown } | null): void {
   getIsolationScope().setContext(name, context);
 }