Merge branch 'develop' into onur/supabase-integration

Author: Luca Forstner

.github/ISSUE_TEMPLATE/bug.yml

@@ -32,11 +32,17 @@ body:
       options:
         - '@sentry/browser'
         - '@sentry/node'
+        - '@sentry/node - express'
+        - '@sentry/node - fastify'
+        - '@sentry/node - koa'
+        - '@sentry/node - hapi'
+        - '@sentry/node - connect'
         - '@sentry/angular'
         - '@sentry/astro'
         - '@sentry/aws-serverless'
         - '@sentry/bun'
         - '@sentry/cloudflare'
+        - '@sentry/cloudflare - hono'
         - '@sentry/deno'
         - '@sentry/ember'
         - '@sentry/gatsby'
@@ -45,6 +51,7 @@ body:
         - '@sentry/nextjs'
         - '@sentry/nuxt'
         - '@sentry/react'
+        - '@sentry/react-router'
         - '@sentry/remix'
         - '@sentry/solid'
         - '@sentry/solidstart'

.github/workflows/issue-package-label.yml

@@ -30,76 +30,100 @@ jobs:
           map: |
             {
               "@sentry.angular": {
-                "label": "Package: angular"
+                "label": "Angular"
               },
               "@sentry.astro": {
-                "label": "Package: astro"
+                "label": "Astro"
               },
               "@sentry.aws-serverless": {
-                "label": "Package: aws-serverless"
+                "label": "AWS Lambda"
               },
               "@sentry.browser": {
-                "label": "Package: browser"
+                "label": "Browser"
               },
               "@sentry.bun": {
-                "label": "Package: bun"
+                "label": "Bun"
+              },
+              "@sentry.cloudflare - hono": {
+                "label": "Hono"
               },
               "@sentry.cloudflare": {
-                "label": "Package: cloudflare"
+                "label": "Cloudflare Workers"
               },
               "@sentry.deno": {
-                "label": "Package: deno"
+                "label": "Deno"
               },
               "@sentry.ember": {
-                "label": "Package: ember"
+                "label": "Ember"
               },
               "@sentry.gatsby": {
-                "label": "Package: gatbsy"
+                "label": "Gatbsy"
               },
               "@sentry.google-cloud-serverless": {
-                "label": "Package: google-cloud-serverless"
+                "label": "Google Cloud Functions"
               },
               "@sentry.nestjs": {
-                "label": "Package: nestjs"
+                "label": "Nest.js"
               },
               "@sentry.nextjs": {
-                "label": "Package: nextjs"
+                "label": "Next.js"
+              },
+              "@sentry.node - express": {
+                "label": "Express"
+              },
+              "@sentry.node - fastify": {
+                "label": "Fastify"
+              },
+              "@sentry.node - koa": {
+                "label": "Koa"
+              },
+              "@sentry.node - hapi": {
+                "label": "Hapi
+              },
+              "@sentry.node - connect": {
+                "label": "Connect
               },
               "@sentry.node": {
-                "label": "Package: node"
+                "label": "Node.js"
               },
               "@sentry.nuxt": {
-                "label": "Package: nuxt"
+                "label": "Nuxt"
+              },
+              "@sentry.react-router": {
+                "label": "React Router Framework "
               },
               "@sentry.react": {
-                "label": "Package: react"
+                "label": "React"
               },
               "@sentry.remix": {
-                "label": "Package: remix"
+                "label": "Remix"
               },
               "@sentry.solid": {
-                "label": "Package: solid"
+                "label": "Solid"
               },
-              "@sentry.solid": {
-                "label": "Package: solidstart"
+              "@sentry.solidstart": {
+                "label": "SolidStart"
               },
               "@sentry.sveltekit": {
-                "label": "Package: sveltekit"
+                "label": "SvelteKit"
               },
               "@sentry.svelte": {
-                "label": "Package: svelte"
+                "label": "Svelte"
               },
               "@sentry.vue": {
-                "label": "Package: vue"
+                "label": "Vue"
+              },
+              "@sentry.tanstackstart-react": {
+                "label": "Tanstack Start React"
               },
               "@sentry.wasm": {
-                "label": "Package: wasm"
+                "label": "WASM"
               },
               "Sentry.Browser.Loader": {
-                "label": "Package-Meta: Loader"
+                "label": "Browser\nLoader Script"
               },
               "Sentry.Browser.CDN.bundle": {
-                "label": "Package-Meta: CDN"
+                "label": "Browser\nCDN Bundle"
               }
             }
           export_to: output

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

@@ -27,7 +27,7 @@
   "dependencies": {
     "@aws-sdk/client-s3": "^3.552.0",
     "@hapi/hapi": "^21.3.10",
-    "@nestjs/common": "10.4.6",
+    "@nestjs/common": "11.0.16",
     "@nestjs/core": "10.4.6",
     "@nestjs/platform-express": "10.4.6",
     "@sentry/aws-serverless": "9.12.0",
@@ -37,7 +37,7 @@
     "@types/mysql": "^2.15.21",
     "@types/pg": "^8.6.5",
     "ai": "^4.0.6",
-    "amqplib": "^0.10.4",
+    "amqplib": "^0.10.7",
     "apollo-server": "^3.11.1",
     "axios": "^1.7.7",
     "body-parser": "^1.20.3",
@@ -67,6 +67,7 @@
     "reflect-metadata": "0.2.1",
     "rxjs": "^7.8.1",
     "tedious": "^18.6.1",
+    "winston": "^3.17.0",
     "yargs": "^16.2.0"
   },
   "devDependencies": {

dev-packages/node-integration-tests/suites/aws-serverless/graphql/useOperationNameForRootSpan/apollo-server.js

@@ -0,0 +1,35 @@
+const { ApolloServer, gql } = require('apollo-server');
+const Sentry = require('@sentry/aws-serverless');
+
+module.exports = () => {
+  return Sentry.startSpan({ name: 'Test Server Start' }, () => {
+    return new ApolloServer({
+      typeDefs: gql`
+        type Query {
+          hello: String
+          world: String
+        }
+        type Mutation {
+          login(email: String): String
+        }
+      `,
+      resolvers: {
+        Query: {
+          hello: () => {
+            return 'Hello!';
+          },
+          world: () => {
+            return 'World!';
+          },
+        },
+        Mutation: {
+          login: async (_, { email }) => {
+            return `${email}--token`;
+          },
+        },
+      },
+      introspection: false,
+      debug: false,
+    });
+  });
+};

dev-packages/node-integration-tests/suites/aws-serverless/graphql/useOperationNameForRootSpan/scenario.js

@@ -0,0 +1,27 @@
+const { loggingTransport } = require('@sentry-internal/node-integration-tests');
+const Sentry = require('@sentry/aws-serverless');
+
+Sentry.init({
+  dsn: 'https://[email protected]/1337',
+  tracesSampleRate: 1.0,
+  integrations: [Sentry.graphqlIntegration({ useOperationNameForRootSpan: true })],
+  transport: loggingTransport,
+});
+
+async function run() {
+  const apolloServer = require('./apollo-server')();
+
+  await Sentry.startSpan({ name: 'Test Transaction' }, async span => {
+    // Ref: https://www.apollographql.com/docs/apollo-server/testing/testing/#testing-using-executeoperation
+    await apolloServer.executeOperation({
+      query: 'query GetHello {hello}',
+    });
+
+    setTimeout(() => {
+      span.end();
+      apolloServer.stop();
+    }, 500);
+  });
+}
+
+run();

dev-packages/node-integration-tests/suites/aws-serverless/graphql/useOperationNameForRootSpan/test.ts

@@ -0,0 +1,28 @@
+import { afterAll, describe, expect, test } from 'vitest';
+import { cleanupChildProcesses, createRunner } from '../../../../utils/runner';
+
+const EXPECTED_TRANSCATION = {
+  transaction: 'Test Transaction (query GetHello)',
+  spans: expect.arrayContaining([
+    expect.objectContaining({
+      description: 'query GetHello',
+      origin: 'auto.graphql.otel.graphql',
+      status: 'ok',
+    }),
+  ]),
+};
+
+describe('graphqlIntegration', () => {
+  afterAll(() => {
+    cleanupChildProcesses();
+  });
+
+  test('should use GraphQL operation name for root span if useOperationNameForRootSpan is set', async () => {
+    await createRunner(__dirname, 'scenario.js')
+      .ignore('event')
+      .expect({ transaction: { transaction: 'Test Server Start (query IntrospectionQuery)' } })
+      .expect({ transaction: EXPECTED_TRANSCATION })
+      .start()
+      .completed();
+  });
+});

dev-packages/node-integration-tests/suites/tracing/apollo-graphql/test.ts

@@ -3,13 +3,13 @@ import { createRunner } from '../../../utils/runner';
 
 // Graphql Instrumentation emits some spans by default on server start
 const EXPECTED_START_SERVER_TRANSACTION = {
-  transaction: 'Test Server Start',
+  transaction: 'Test Server Start (query IntrospectionQuery)',
 };
 
 describe('GraphQL/Apollo Tests', () => {
   test('should instrument GraphQL queries used from Apollo Server.', async () => {
     const EXPECTED_TRANSACTION = {
-      transaction: 'Test Transaction',
+      transaction: 'Test Transaction (query)',
       spans: expect.arrayContaining([
         expect.objectContaining({
           data: {
@@ -33,7 +33,7 @@ describe('GraphQL/Apollo Tests', () => {
 
   test('should instrument GraphQL mutations used from Apollo Server.', async () => {
     const EXPECTED_TRANSACTION = {
-      transaction: 'Test Transaction',
+      transaction: 'Test Transaction (mutation Mutation)',
       spans: expect.arrayContaining([
         expect.objectContaining({
           data: {

dev-packages/node-integration-tests/suites/tracing/apollo-graphql/useOperationNameForRootSpan/test.ts

@@ -1,9 +1,9 @@
 import { createRunner } from '../../../../utils/runner';
-import { describe, test, expect } from 'vitest'
+import { describe, test, expect } from 'vitest';
 
 // Graphql Instrumentation emits some spans by default on server start
 const EXPECTED_START_SERVER_TRANSACTION = {
-  transaction: 'Test Server Start',
+  transaction: 'Test Server Start (query IntrospectionQuery)',
 };
 
 describe('GraphQL/Apollo Tests > useOperationNameForRootSpan', () => {
@@ -61,7 +61,7 @@ describe('GraphQL/Apollo Tests > useOperationNameForRootSpan', () => {
 
   test('useOperationNameForRootSpan ignores an invalid root span', async () => {
     const EXPECTED_TRANSACTION = {
-      transaction: 'test span name',
+      transaction: 'test span name (query GetHello)',
       spans: expect.arrayContaining([
         expect.objectContaining({
           data: {

dev-packages/node-integration-tests/suites/winston/subject.ts

@@ -0,0 +1,73 @@
+import * as Sentry from '@sentry/node';
+import winston from 'winston';
+import Transport from 'winston-transport';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
+
+Sentry.init({
+  dsn: 'https://[email protected]/1337',
+  release: '1.0.0',
+  environment: 'test',
+  _experiments: {
+    enableLogs: true,
+  },
+  transport: loggingTransport,
+});
+
+async function run(): Promise<void> {
+  // Create a custom transport that extends winston-transport
+  const SentryWinstonTransport = Sentry.createSentryWinstonTransport(Transport);
+
+  // Create logger with default levels
+  const logger = winston.createLogger({
+    transports: [new SentryWinstonTransport()],
+  });
+
+  // Test basic logging
+  logger.info('Test info message');
+  logger.error('Test error message');
+
+  // If custom levels are requested
+  if (process.env.CUSTOM_LEVELS === 'true') {
+    const customLevels = {
+      levels: {
+        error: 0,
+        warn: 1,
+        info: 2,
+        http: 3,
+        verbose: 4,
+        debug: 5,
+        silly: 6,
+      },
+      colors: {
+        error: 'red',
+        warn: 'yellow',
+        info: 'green',
+        http: 'magenta',
+        verbose: 'cyan',
+        debug: 'blue',
+        silly: 'grey',
+      },
+    };
+
+    const customLogger = winston.createLogger({
+      levels: customLevels.levels,
+      transports: [new SentryWinstonTransport()],
+    });
+
+    customLogger.info('Test info message');
+    customLogger.error('Test error message');
+  }
+
+  // If metadata is requested
+  if (process.env.WITH_METADATA === 'true') {
+    logger.info('Test message with metadata', {
+      foo: 'bar',
+      number: 42,
+    });
+  }
+
+  await Sentry.flush();
+}
+
+// eslint-disable-next-line @typescript-eslint/no-floating-promises
+void run();