Merge branch 'develop' into fix/fetch-not-release

Author: Lei-k

dev-packages/e2e-tests/test-applications/nestjs-basic-with-graphql/src/main.ts

@@ -3,7 +3,7 @@ import './instrument';
 
 // Import other modules
 import { HttpAdapterHost, NestFactory } from '@nestjs/core';
-import { SentryGlobalGenericFilter } from '@sentry/nestjs/setup';
+import { SentryGlobalFilter } from '@sentry/nestjs/setup';
 import { AppModule } from './app.module';
 
 const PORT = 3030;
@@ -12,7 +12,7 @@ async function bootstrap() {
   const app = await NestFactory.create(AppModule);
 
   const { httpAdapter } = app.get(HttpAdapterHost);
-  app.useGlobalFilters(new SentryGlobalGenericFilter(httpAdapter as any));
+  app.useGlobalFilters(new SentryGlobalFilter(httpAdapter as any));
 
   await app.listen(PORT);
 }

dev-packages/e2e-tests/test-applications/nestjs-graphql/src/app.module.ts

@@ -2,7 +2,7 @@ import { ApolloDriver } from '@nestjs/apollo';
 import { Logger, Module } from '@nestjs/common';
 import { APP_FILTER } from '@nestjs/core';
 import { GraphQLModule } from '@nestjs/graphql';
-import { SentryGlobalGraphQLFilter, SentryModule } from '@sentry/nestjs/setup';
+import { SentryGlobalFilter, SentryModule } from '@sentry/nestjs/setup';
 import { AppResolver } from './app.resolver';
 
 @Module({
@@ -19,7 +19,7 @@ import { AppResolver } from './app.resolver';
     AppResolver,
     {
       provide: APP_FILTER,
-      useClass: SentryGlobalGraphQLFilter,
+      useClass: SentryGlobalFilter,
     },
     {
       provide: Logger,

docs/migration/v8-to-v9.md

@@ -106,6 +106,21 @@ It will be removed in a future major version.
 
 - The `getNumberOfUrlSegments` method has been removed. There are no replacements.
 
+### `@sentry/nestjs`
+
+- Removed `SentryService`.
+  If you are using `@sentry/nestjs` you can safely remove any references to the `SentryService`.
+  If you are using another package migrate to `@sentry/nestjs` and remove the `SentryService` afterwards.
+- Removed `SentryTracingInterceptor`.
+  If you are using `@sentry/nestjs` you can safely remove any references to the `SentryTracingInterceptor`.
+  If you are using another package migrate to `@sentry/nestjs` and remove the `SentryTracingInterceptor` afterwards.
+- Removed `SentryGlobalGenericFilter`.
+  Use the `SentryGlobalFilter` instead.
+  The `SentryGlobalFilter` is a drop-in replacement.
+- Removed `SentryGlobalGraphQLFilter`.
+  Use the `SentryGlobalFilter` instead.
+  The `SentryGlobalFilter` is a drop-in replacement.
+
 ## 5. Build Changes
 
 Previously the CJS versions of the SDK code (wrongfully) contained compatibility statements for default exports in ESM:

packages/nestjs/package.json

@@ -71,7 +71,7 @@
     "build:types:watch": "tsc -p tsconfig.types.json --watch",
     "build:tarball": "npm pack",
     "circularDepCheck": "madge --circular src/index.ts && madge --circular src/setup.ts",
-    "clean": "rimraf build coverage sentry-node-*.tgz",
+    "clean": "rimraf build coverage sentry-nestjs-*.tgz ./*.d.ts ./*.d.ts.map",
     "fix": "eslint . --format stylish --fix",
     "lint": "eslint . --format stylish",
     "test": "vitest run",

packages/nestjs/src/setup.ts

@@ -5,21 +5,10 @@ import type {
   ExecutionContext,
   HttpServer,
   NestInterceptor,
-  OnModuleInit,
 } from '@nestjs/common';
 import { Catch, Global, HttpException, Injectable, Logger, Module } from '@nestjs/common';
 import { APP_INTERCEPTOR, BaseExceptionFilter } from '@nestjs/core';
-import type { Span } from '@sentry/core';
-import {
-  SEMANTIC_ATTRIBUTE_SENTRY_OP,
-  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
-  captureException,
-  getClient,
-  getDefaultIsolationScope,
-  getIsolationScope,
-  logger,
-  spanToJSON,
-} from '@sentry/core';
+import { captureException, getDefaultIsolationScope, getIsolationScope, logger } from '@sentry/core';
 import type { Observable } from 'rxjs';
 import { isExpectedError } from './helpers';
 
@@ -46,10 +35,6 @@ interface ExpressRequest {
 
 /**
  * Interceptor to add Sentry tracing capabilities to Nest.js applications.
- *
- * @deprecated `SentryTracingInterceptor` is deprecated.
- * If you are using `@sentry/nestjs` you can safely remove any references to the `SentryTracingInterceptor`.
- * If you are using another package migrate to `@sentry/nestjs` and remove the `SentryTracingInterceptor` afterwards.
  */
 class SentryTracingInterceptor implements NestInterceptor {
   // used to exclude this class from being auto-instrumented
@@ -84,10 +69,7 @@ class SentryTracingInterceptor implements NestInterceptor {
     return next.handle();
   }
 }
-// eslint-disable-next-line deprecation/deprecation
 Injectable()(SentryTracingInterceptor);
-// eslint-disable-next-line deprecation/deprecation
-export { SentryTracingInterceptor };
 
 /**
  * Global filter to handle exceptions and report them to Sentry.
@@ -133,84 +115,6 @@ class SentryGlobalFilter extends BaseExceptionFilter {
 Catch()(SentryGlobalFilter);
 export { SentryGlobalFilter };
 
-/**
- * Global filter to handle exceptions in NestJS + GraphQL applications and report them to Sentry.
- *
- * @deprecated `SentryGlobalGraphQLFilter` is deprecated. Use the `SentryGlobalFilter` instead. The `SentryGlobalFilter` is a drop-in replacement.
- */
-class SentryGlobalGraphQLFilter {
-  private static readonly _logger = new Logger('ExceptionsHandler');
-  public readonly __SENTRY_INTERNAL__: boolean;
-
-  public constructor() {
-    this.__SENTRY_INTERNAL__ = true;
-  }
-
-  /**
-   * Catches exceptions and reports them to Sentry unless they are HttpExceptions.
-   */
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  public catch(exception: unknown, host: ArgumentsHost): void {
-    // neither report nor log HttpExceptions
-    if (exception instanceof HttpException) {
-      throw exception;
-    }
-    if (exception instanceof Error) {
-      // eslint-disable-next-line deprecation/deprecation
-      SentryGlobalGraphQLFilter._logger.error(exception.message, exception.stack);
-    }
-    captureException(exception);
-    throw exception;
-  }
-}
-// eslint-disable-next-line deprecation/deprecation
-Catch()(SentryGlobalGraphQLFilter);
-// eslint-disable-next-line deprecation/deprecation
-export { SentryGlobalGraphQLFilter };
-
-/**
- * Global filter to handle exceptions and report them to Sentry.
- *
- * This filter is a generic filter that can handle both HTTP and GraphQL exceptions.
- *
- * @deprecated `SentryGlobalGenericFilter` is deprecated. Use the `SentryGlobalFilter` instead. The `SentryGlobalFilter` is a drop-in replacement.
- */
-export const SentryGlobalGenericFilter = SentryGlobalFilter;
-
-/**
- * Service to set up Sentry performance tracing for Nest.js applications.
- *
- * @deprecated `SentryService` is deprecated.
- * If you are using `@sentry/nestjs` you can safely remove any references to the `SentryService`.
- * If you are using another package migrate to `@sentry/nestjs` and remove the `SentryService` afterwards.
- */
-class SentryService implements OnModuleInit {
-  public readonly __SENTRY_INTERNAL__: boolean;
-
-  public constructor() {
-    this.__SENTRY_INTERNAL__ = true;
-  }
-
-  /**
-   * Initializes the Sentry service and registers span attributes.
-   */
-  public onModuleInit(): void {
-    // Sadly, NestInstrumentation has no requestHook, so we need to add the attributes here
-    // We register this hook in this method, because if we register it in the integration `setup`,
-    // it would always run even for users that are not even using Nest.js
-    const client = getClient();
-    if (client) {
-      client.on('spanStart', span => {
-        addNestSpanAttributes(span);
-      });
-    }
-  }
-}
-// eslint-disable-next-line deprecation/deprecation
-Injectable()(SentryService);
-// eslint-disable-next-line deprecation/deprecation
-export { SentryService };
-
 /**
  * Set up a root module that can be injected in nest applications.
  */
@@ -222,48 +126,21 @@ class SentryModule {
     return {
       module: SentryModule,
       providers: [
-        // eslint-disable-next-line deprecation/deprecation
-        SentryService,
         {
           provide: APP_INTERCEPTOR,
-          // eslint-disable-next-line deprecation/deprecation
           useClass: SentryTracingInterceptor,
         },
       ],
-      // eslint-disable-next-line deprecation/deprecation
-      exports: [SentryService],
     };
   }
 }
 Global()(SentryModule);
 Module({
   providers: [
-    // eslint-disable-next-line deprecation/deprecation
-    SentryService,
     {
       provide: APP_INTERCEPTOR,
-      // eslint-disable-next-line deprecation/deprecation
       useClass: SentryTracingInterceptor,
     },
   ],
-  // eslint-disable-next-line deprecation/deprecation
-  exports: [SentryService],
 })(SentryModule);
 export { SentryModule };
-
-function addNestSpanAttributes(span: Span): void {
-  const attributes = spanToJSON(span).data;
-
-  // this is one of: app_creation, request_context, handler
-  const type = attributes['nestjs.type'];
-
-  // If this is already set, or we have no nest.js span, no need to process again...
-  if (attributes[SEMANTIC_ATTRIBUTE_SENTRY_OP] || !type) {
-    return;
-  }
-
-  span.setAttributes({
-    [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.otel.nestjs',
-    [SEMANTIC_ATTRIBUTE_SENTRY_OP]: `${type}.nestjs`,
-  });
-}