chore(deps): migration to sentry v9

graphql-hive · Feb 15, 2025 · ead598a · ead598a
1 parent 7a19720
commit ead598a
Show file tree

Hide file tree

Showing 23 changed files with 392 additions and 383 deletions.
diff --git a/packages/services/api/package.json b/packages/services/api/package.json
@@ -31,8 +31,8 @@
     "@octokit/core": "5.2.0",
     "@octokit/plugin-retry": "6.1.0",
     "@octokit/request-error": "6.1.6",
-    "@sentry/node": "7.120.2",
-    "@sentry/types": "7.120.2",
+    "@sentry/node": "9.1.0",
+    "@sentry/types": "9.1.0",
     "@slack/web-api": "7.8.0",
     "@theguild/federation-composition": "0.14.4",
     "@trpc/client": "10.45.2",

diff --git a/packages/services/emails/package.json b/packages/services/emails/package.json
@@ -11,7 +11,7 @@
   },
   "devDependencies": {
     "@hive/service-common": "workspace:*",
-    "@sentry/node": "7.120.2",
+    "@sentry/node": "9.1.0",
     "@trpc/server": "10.45.2",
     "@types/mjml": "4.7.1",
     "@types/nodemailer": "6.4.17",

diff --git a/packages/services/policy/package.json b/packages/services/policy/package.json
@@ -11,8 +11,7 @@
   "devDependencies": {
     "@graphql-eslint/eslint-plugin": "3.20.1",
     "@hive/service-common": "workspace:*",
-    "@sentry/node": "7.120.2",
-    "@sentry/tracing": "7.114.0",
+    "@sentry/node": "9.1.0",
     "@trpc/server": "10.45.2",
     "@types/eslint": "8.56.12",
     "ajv": "8.17.1",

diff --git a/packages/services/rate-limit/package.json b/packages/services/rate-limit/package.json
@@ -13,7 +13,7 @@
     "@hive/emails": "workspace:*",
     "@hive/service-common": "workspace:*",
     "@hive/storage": "workspace:*",
-    "@sentry/node": "7.120.2",
+    "@sentry/node": "9.1.0",
     "@trpc/client": "10.45.2",
     "@trpc/server": "10.45.2",
     "date-fns": "4.1.0",

diff --git a/packages/services/schema/package.json b/packages/services/schema/package.json
@@ -15,7 +15,7 @@
     "@graphql-tools/stitch": "9.4.13",
     "@graphql-tools/stitching-directives": "3.1.24",
     "@hive/service-common": "workspace:*",
-    "@sentry/node": "7.120.2",
+    "@sentry/node": "9.1.0",
     "@theguild/federation-composition": "0.14.4",
     "@trpc/server": "10.45.2",
     "@types/async-retry": "1.4.8",

diff --git a/packages/services/server/package.json b/packages/services/server/package.json
@@ -29,8 +29,7 @@
     "@hive/cdn-script": "workspace:*",
     "@hive/service-common": "workspace:*",
     "@hive/storage": "workspace:*",
-    "@sentry/integrations": "7.114.0",
-    "@sentry/node": "7.120.2",
+    "@sentry/node": "9.1.0",
     "@swc/core": "1.10.6",
     "@trpc/client": "10.45.2",
     "@trpc/server": "10.45.2",

diff --git a/packages/services/server/src/graphql-handler.ts b/packages/services/server/src/graphql-handler.ts
@@ -26,7 +26,7 @@ import { useHive } from '@graphql-hive/yoga';
 import { useResponseCache } from '@graphql-yoga/plugin-response-cache';
 import { Registry, RegistryContext } from '@hive/api';
 import { cleanRequestId, type TracingInstance } from '@hive/service-common';
-import { runWithAsyncContext } from '@sentry/node';
+import { withIsolationScope } from '@sentry/node';
 import { AuthN, Session } from '../../api/src/modules/auth/lib/authz';
 import { asyncStorage } from './async-storage';
 import type { HiveConfig, HivePersistedDocumentsConfig } from './environment';
@@ -266,7 +266,7 @@ export const graphqlHandler = (options: GraphQLHandlerOptions): RouteHandlerMeth
         requestId,
       },
       async () => {
-        const response = await runWithAsyncContext(() => {
+        const response = await withIsolationScope(() => {
           return server.handleNodeRequestAndResponse(req, reply, {
             req,
             reply,

diff --git a/packages/services/server/src/index.ts b/packages/services/server/src/index.ts
@@ -42,12 +42,10 @@ import {
 } from '@hive/service-common';
 import { createConnectionString, createStorage as createPostgreSQLStorage } from '@hive/storage';
 import {
+  captureException,
   contextLinesIntegration,
   dedupeIntegration,
   extraErrorDataIntegration,
-} from '@sentry/integrations';
-import {
-  captureException,
   httpIntegration,
   init,
   linkedErrorsIntegration,
@@ -85,14 +83,12 @@ export async function main() {
     enabled: !!env.sentry,
     environment: env.environment,
     dsn: env.sentry?.dsn,
-    enableTracing: false,
-    tracesSampleRate: 1,
     ignoreTransactions: [
       'POST /graphql', // Transaction created for a cached response (@graphql-yoga/plugin-response-cache)
     ],
     release: env.release,
     integrations: [
-      httpIntegration({ tracing: false }),
+      httpIntegration({ spans: false }),
       contextLinesIntegration({
         frameContextLines: 0,
       }),
@@ -104,7 +100,6 @@ export async function main() {
     ],
     maxBreadcrumbs: 10,
     defaultIntegrations: false,
-    autoSessionTracking: false,
   });
 
   const server = await createServer({

diff --git a/packages/services/server/src/use-sentry-user.ts b/packages/services/server/src/use-sentry-user.ts
@@ -15,10 +15,8 @@ export const useSentryUser = (): Plugin<{
       const id = extractUserId(args.contextValue);
 
       if (id) {
-        Sentry.configureScope(scope => {
-          scope.setUser({
-            id,
-          });
+        Sentry.getCurrentScope().setUser({
+          id,
         });
       }
     },

diff --git a/packages/services/service-common/package.json b/packages/services/service-common/package.json
@@ -4,8 +4,7 @@
   "license": "MIT",
   "private": true,
   "peerDependencies": {
-    "@sentry/node": "^7.0.0",
-    "@sentry/utils": "^7.0.0",
+    "@sentry/node": "^9.0.0",
     "@trpc/server": "10.45.2"
   },
   "devDependencies": {
@@ -20,9 +19,8 @@
     "@opentelemetry/sdk-trace-base": "1.30.0",
     "@opentelemetry/sdk-trace-node": "1.30.0",
     "@opentelemetry/semantic-conventions": "1.28.0",
-    "@sentry/node": "7.120.2",
-    "@sentry/types": "7.120.2",
-    "@sentry/utils": "7.120.2",
+    "@sentry/node": "9.1.0",
+    "@sentry/types": "9.1.0",
     "fastify": "4.29.0",
     "fastify-plugin": "4.5.1",
     "opentelemetry-instrumentation-fetch-node": "1.2.3",

diff --git a/packages/services/storage/package.json b/packages/services/storage/package.json
@@ -17,8 +17,8 @@
   "devDependencies": {
     "@graphql-inspector/core": "5.1.0-alpha-20231208113249-34700c8a",
     "@hive/service-common": "workspace:*",
-    "@sentry/node": "7.120.2",
-    "@sentry/types": "7.120.2",
+    "@sentry/node": "9.1.0",
+    "@sentry/types": "9.1.0",
     "@tgriesser/schemats": "9.0.1",
     "@types/node": "22.10.5",
     "@types/pg": "8.11.10",

diff --git a/packages/services/storage/src/db/pool.ts b/packages/services/storage/src/db/pool.ts
@@ -7,9 +7,8 @@ import {
   TaggedTemplateLiteralInvocation,
 } from 'slonik';
 import { createQueryLoggingInterceptor } from 'slonik-interceptor-query-logging';
-import { createSentryInterceptor } from './sentry';
 
-const dbInterceptors: Interceptor[] = [createQueryLoggingInterceptor(), createSentryInterceptor()];
+const dbInterceptors: Interceptor[] = [createQueryLoggingInterceptor()];
 
 export async function getPool(
   connection: string,

diff --git a/packages/services/storage/src/db/sentry.ts b/packages/services/storage/src/db/sentry.ts
diff --git a/packages/services/stripe-billing/package.json b/packages/services/stripe-billing/package.json
@@ -12,7 +12,7 @@
   "devDependencies": {
     "@hive/service-common": "workspace:*",
     "@hive/storage": "workspace:*",
-    "@sentry/node": "7.120.2",
+    "@sentry/node": "9.1.0",
     "@trpc/client": "10.45.2",
     "@trpc/server": "10.45.2",
     "date-fns": "4.1.0",

diff --git a/packages/services/tokens/package.json b/packages/services/tokens/package.json
@@ -11,7 +11,7 @@
   "devDependencies": {
     "@hive/service-common": "workspace:*",
     "@hive/storage": "workspace:*",
-    "@sentry/node": "7.120.2",
+    "@sentry/node": "9.1.0",
     "@trpc/server": "10.45.2",
     "@types/ms": "0.7.34",
     "dotenv": "16.4.7",

diff --git a/packages/services/usage-estimator/package.json b/packages/services/usage-estimator/package.json
@@ -12,7 +12,7 @@
   "devDependencies": {
     "@hive/api": "workspace:*",
     "@hive/service-common": "workspace:*",
-    "@sentry/node": "7.120.2",
+    "@sentry/node": "9.1.0",
     "@trpc/server": "10.45.2",
     "dotenv": "16.4.7",
     "got": "14.4.5",

diff --git a/packages/services/usage-ingestor/package.json b/packages/services/usage-ingestor/package.json
@@ -12,7 +12,7 @@
     "@graphql-hive/core": "workspace:*",
     "@hive/service-common": "workspace:*",
     "@hive/usage-common": "workspace:*",
-    "@sentry/node": "7.120.2",
+    "@sentry/node": "9.1.0",
     "agentkeepalive": "4.6.0",
     "date-fns": "4.1.0",
     "dotenv": "16.4.7",

diff --git a/packages/services/usage/package.json b/packages/services/usage/package.json
@@ -12,7 +12,7 @@
     "@hive/service-common": "workspace:*",
     "@hive/tokens": "workspace:*",
     "@hive/usage-common": "workspace:*",
-    "@sentry/node": "7.120.2",
+    "@sentry/node": "9.1.0",
     "@sinclair/typebox": "0.34.15",
     "@trpc/client": "10.45.2",
     "@trpc/server": "10.45.2",

diff --git a/packages/services/webhooks/package.json b/packages/services/webhooks/package.json
@@ -11,7 +11,7 @@
   },
   "devDependencies": {
     "@hive/service-common": "workspace:*",
-    "@sentry/node": "7.120.2",
+    "@sentry/node": "9.1.0",
     "@trpc/server": "10.45.2",
     "bullmq": "5.34.8",
     "copyfiles": "2.4.1",

diff --git a/packages/web/app/package.json b/packages/web/app/package.json
@@ -49,9 +49,9 @@
     "@radix-ui/react-toggle-group": "1.1.1",
     "@radix-ui/react-tooltip": "1.1.6",
     "@repeaterjs/repeater": "3.0.6",
-    "@sentry/node": "7.120.2",
-    "@sentry/react": "7.120.2",
-    "@sentry/types": "7.120.2",
+    "@sentry/node": "9.1.0",
+    "@sentry/react": "9.1.0",
+    "@sentry/types": "9.1.0",
     "@storybook/addon-essentials": "8.4.7",
     "@storybook/addon-interactions": "8.4.7",
     "@storybook/addon-links": "8.4.7",

diff --git a/packages/web/app/src/env/backend.ts b/packages/web/app/src/env/backend.ts
@@ -19,15 +19,6 @@ export function getPublicEnvVars() {
   return envObject;
 }
 
-// Weird hacky way of getting the Sentry.Integrations object
-// When the nextjs config is loaded by Next CLI Sentry has `Integrations` property.
-// When nextjs starts and the `environment.js` is loaded, the Sentry object doesn't have the `Integrations` property, it' under `Sentry.default` property.
-// Dealing with esm/cjs/default exports is a pain, we all feel that pain...
-const Integrations =
-  'default' in Sentry
-    ? ((Sentry as any).default as typeof Sentry).Integrations
-    : Sentry.Integrations;
-
 // treat an empty string `''` as `undefined`
 const emptyString = <T extends zod.ZodType>(input: T) => {
   return zod.preprocess((value: unknown) => {
@@ -237,15 +228,7 @@ Sentry.init({
   serverName: 'app',
   dist: 'app',
   enabled: !!env.sentry,
-  enableTracing: false,
-  tracesSampleRate: 1,
   dsn: env.sentry?.dsn,
   release: env.release,
   environment: env.environment,
-  integrations: [
-    // HTTP integration is only available on the server
-    new Integrations.Http({
-      tracing: false,
-    }),
-  ],
 });
diff --git a/packages/web/app/src/router.tsx b/packages/web/app/src/router.tsx
@@ -11,7 +11,7 @@ import { frontendConfig } from '@/config/supertokens/frontend';
 import { env } from '@/env/frontend';
 import * as gtag from '@/lib/gtag';
 import { urqlClient } from '@/lib/urql';
-import { configureScope, init } from '@sentry/react';
+import Sentry from '@sentry/react';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import {
   createRootRoute,
@@ -72,7 +72,7 @@ import { TargetSettingsPage, TargetSettingsPageEnum } from './pages/target-setti
 
 SuperTokens.init(frontendConfig());
 if (env.sentry) {
-  init({
+  Sentry.init({
     dsn: env.sentry.dsn,
     enabled: true,
     dist: 'webapp',
@@ -90,9 +90,7 @@ const LazyTanStackRouterDevtools = lazy(() =>
 );
 
 function identifyOnSentry(userId: string, email: string): void {
-  configureScope(scope => {
-    scope.setUser({ id: userId, email });
-  });
+  Sentry.getCurrentScope().setUser({ id: userId, email });
 }
 
 function RootComponent() {