Merge branch 'develop' into onur/postgres.js-instrumentation

Author: onurtemizkan

dev-packages/node-integration-tests/suites/tracing/apollo-graphql/scenario-error.js

@@ -0,0 +1,43 @@
+const Sentry = require('@sentry/node');
+const { loggingTransport } = require('@sentry-internal/node-integration-tests');
+
+Sentry.init({
+  dsn: 'https://[email protected]/1337',
+  release: '1.0',
+  tracesSampleRate: 1.0,
+  transport: loggingTransport,
+});
+
+// Stop the process from exiting before the transaction is sent
+setInterval(() => {}, 1000);
+
+async function run() {
+  const { gql } = require('apollo-server');
+  const server = require('./apollo-server')();
+
+  await Sentry.startSpan(
+    {
+      name: 'Test Transaction',
+      op: 'transaction',
+    },
+    async span => {
+      // Ref: https://www.apollographql.com/docs/apollo-server/testing/testing/#testing-using-executeoperation
+      await server.executeOperation({
+        query: gql`
+          mutation Mutation($email: String) {
+            login(email: $email)
+          }
+        `,
+        // We want to trigger an error by passing an invalid variable type
+        variables: { email: 123 },
+      });
+
+      setTimeout(() => {
+        span.end();
+        server.stop();
+      }, 500);
+    },
+  );
+}
+
+run();

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

@@ -55,4 +55,29 @@ describe('GraphQL/Apollo Tests', () => {
       .start()
       .completed();
   });
+
+  test('should handle GraphQL errors.', async () => {
+    const EXPECTED_TRANSACTION = {
+      transaction: 'Test Transaction (mutation Mutation)',
+      spans: expect.arrayContaining([
+        expect.objectContaining({
+          data: {
+            'graphql.operation.name': 'Mutation',
+            'graphql.operation.type': 'mutation',
+            'graphql.source': 'mutation Mutation($email: String) {\n  login(email: $email)\n}',
+            'sentry.origin': 'auto.graphql.otel.graphql',
+          },
+          description: 'mutation Mutation',
+          status: 'unknown_error',
+          origin: 'auto.graphql.otel.graphql',
+        }),
+      ]),
+    };
+
+    await createRunner(__dirname, 'scenario-error.js')
+      .expect({ transaction: EXPECTED_START_SERVER_TRANSACTION })
+      .expect({ transaction: EXPECTED_TRANSACTION })
+      .start()
+      .completed();
+  });
 });

packages/bun/package.json

@@ -40,8 +40,7 @@
   },
   "dependencies": {
     "@sentry/core": "9.30.0",
-    "@sentry/node": "9.30.0",
-    "@sentry/opentelemetry": "9.30.0"
+    "@sentry/node": "9.30.0"
   },
   "devDependencies": {
     "bun-types": "^1.2.9"

packages/gatsby/package.json

@@ -47,7 +47,7 @@
   "dependencies": {
     "@sentry/core": "9.30.0",
     "@sentry/react": "9.30.0",
-    "@sentry/webpack-plugin": "3.5.0"
+    "@sentry/webpack-plugin": "^3.5.0"
   },
   "peerDependencies": {
     "gatsby": "^2.0.0 || ^3.0.0 || ^4.0.0 || ^5.0.0",

packages/nextjs/package.json

@@ -85,7 +85,7 @@
     "@sentry/opentelemetry": "9.30.0",
     "@sentry/react": "9.30.0",
     "@sentry/vercel-edge": "9.30.0",
-    "@sentry/webpack-plugin": "3.5.0",
+    "@sentry/webpack-plugin": "^3.5.0",
     "chalk": "3.0.0",
     "resolve": "1.22.8",
     "rollup": "4.35.0",

packages/node/src/integrations/tracing/graphql.ts

@@ -1,4 +1,5 @@
 import type { AttributeValue } from '@opentelemetry/api';
+import { SpanStatusCode } from '@opentelemetry/api';
 import { GraphQLInstrumentation } from '@opentelemetry/instrumentation-graphql';
 import type { IntegrationFn } from '@sentry/core';
 import { defineIntegration, getRootSpan, spanToJSON } from '@sentry/core';
@@ -45,9 +46,16 @@ export const instrumentGraphql = generateInstrumentOnce(
 
     return {
       ...options,
-      responseHook(span) {
+      responseHook(span, result) {
         addOriginToSpan(span, 'auto.graphql.otel.graphql');
 
+        // We want to ensure spans are marked as errored if there are errors in the result
+        // We only do that if the span is not already marked with a status
+        const resultWithMaybeError = result as { errors?: { message: string }[] };
+        if (resultWithMaybeError.errors?.length && !spanToJSON(span).status) {
+          span.setStatus({ code: SpanStatusCode.ERROR });
+        }
+
         const attributes = spanToJSON(span).data;
 
         // If operation.name is not set, we fall back to use operation.type only

packages/nuxt/package.json

@@ -46,9 +46,8 @@
     "@sentry/browser": "9.30.0",
     "@sentry/core": "9.30.0",
     "@sentry/node": "9.30.0",
-    "@sentry/opentelemetry": "9.30.0",
-    "@sentry/rollup-plugin": "3.5.0",
-    "@sentry/vite-plugin": "3.2.4",
+    "@sentry/rollup-plugin": "^3.5.0",
+    "@sentry/vite-plugin": "^3.5.0",
     "@sentry/vue": "9.30.0"
   },
   "devDependencies": {

packages/react-router/package.json

@@ -43,7 +43,7 @@
     "@sentry/core": "9.30.0",
     "@sentry/node": "9.30.0",
     "@sentry/react": "9.30.0",
-    "@sentry/vite-plugin": "^3.2.4",
+    "@sentry/vite-plugin": "^3.5.0",
     "glob": "11.0.1"
   },
   "devDependencies": {

packages/remix/package.json

@@ -71,7 +71,6 @@
     "@sentry/cli": "^2.46.0",
     "@sentry/core": "9.30.0",
     "@sentry/node": "9.30.0",
-    "@sentry/opentelemetry": "9.30.0",
     "@sentry/react": "9.30.0",
     "glob": "^10.3.4",
     "yargs": "^17.6.0"

packages/remix/test/integration/package.json

@@ -27,7 +27,6 @@
     "@sentry/browser": "file:../../../browser",
     "@sentry/core": "file:../../../core",
     "@sentry/node": "file:../../../node",
-    "@sentry/opentelemetry": "file:../../../opentelemetry",
     "@sentry/react": "file:../../../react",
     "@sentry-internal/browser-utils": "file:../../../browser-utils",
     "@sentry-internal/replay": "file:../../../replay-internal",