Update Sentry and wait for 4.78.0

kamilkisiela · kamilkisiela · commit 663530533a1a · 2023-04-19T12:34:31.000+02:00
Waiting for getsentry/sentry-docs#6641
diff --git a/packages/services/api/package.json b/packages/services/api/package.json
@@ -16,8 +16,8 @@
     "@aws-sdk/s3-request-presigner": "3.312.0",
     "@graphql-inspector/core": "4.0.3",
     "@octokit/app": "13.1.2",
-    "@sentry/node": "7.44.2",
-    "@sentry/types": "7.44.2",
+    "@sentry/node": "7.47.0",
+    "@sentry/types": "7.47.0",
     "@slack/web-api": "6.8.1",
     "@theguild/buddy": "0.1.0",
     "@trpc/client": "10.20.0",
diff --git a/packages/services/emails/package.json b/packages/services/emails/package.json
@@ -11,7 +11,7 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@sentry/node": "7.44.2",
+    "@sentry/node": "7.47.0",
     "@trpc/server": "10.20.0",
     "@whatwg-node/fetch": "0.8.5",
     "bullmq": "3.10.4",
diff --git a/packages/services/rate-limit/package.json b/packages/services/rate-limit/package.json
@@ -11,8 +11,7 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@sentry/node": "7.44.2",
-    "@sentry/tracing": "7.44.2",
+    "@sentry/node": "7.47.0",
     "@trpc/client": "10.20.0",
     "@trpc/server": "10.20.0",
     "@whatwg-node/fetch": "0.8.5",
diff --git a/packages/services/schema/package.json b/packages/services/schema/package.json
@@ -13,8 +13,7 @@
     "@apollo/federation": "0.38.1",
     "@graphql-tools/stitch": "8.7.48",
     "@graphql-tools/stitching-directives": "2.3.34",
-    "@sentry/node": "7.44.2",
-    "@sentry/tracing": "7.44.2",
+    "@sentry/node": "7.47.0",
     "@trpc/server": "10.20.0",
     "@whatwg-node/fetch": "0.8.5",
     "dotenv": "16.0.3",
diff --git a/packages/services/server/.env.template b/packages/services/server/.env.template
@@ -1,3 +1,4 @@
+ENVIRONMENT=local
 LOG_LEVEL=debug
 POSTGRES_USER=postgres
 POSTGRES_PASSWORD=postgres
diff --git a/packages/services/server/package.json b/packages/services/server/package.json
@@ -19,9 +19,8 @@
     "@escape.tech/graphql-armor-max-depth": "1.8.4",
     "@escape.tech/graphql-armor-max-directives": "1.6.5",
     "@escape.tech/graphql-armor-max-tokens": "1.3.2",
-    "@sentry/integrations": "7.44.2",
-    "@sentry/node": "7.44.2",
-    "@sentry/tracing": "7.44.2",
+    "@sentry/integrations": "7.47.0",
+    "@sentry/node": "7.47.0",
     "@trpc/server": "10.20.0",
     "@whatwg-node/fetch": "0.8.5",
     "@whatwg-node/server": "0.7.5",
diff --git a/packages/services/service-common/package.json b/packages/services/service-common/package.json
@@ -6,7 +6,6 @@
   "private": true,
   "peerDependencies": {
     "@sentry/node": "^7.0.0",
-    "@sentry/tracing": "^7.0.0",
     "@sentry/utils": "^7.0.0",
     "@trpc/server": "10.20.0"
   },
@@ -19,9 +18,8 @@
     "zod": "3.21.4"
   },
   "devDependencies": {
-    "@sentry/node": "7.44.2",
-    "@sentry/tracing": "7.44.2",
-    "@sentry/types": "7.44.2",
-    "@sentry/utils": "7.44.2"
+    "@sentry/node": "7.47.0",
+    "@sentry/types": "7.47.0",
+    "@sentry/utils": "7.47.0"
   }
 }
diff --git a/packages/services/service-common/src/sentry.ts b/packages/services/service-common/src/sentry.ts
@@ -1,14 +1,12 @@
 import type { FastifyInstance, FastifyPluginAsync, FastifyRequest } from 'fastify';
 import fp from 'fastify-plugin';
 import * as Sentry from '@sentry/node';
-import '@sentry/tracing';
-import { Transaction } from '@sentry/tracing';
-import type { ExtractedNodeRequestData, TraceparentData } from '@sentry/types';
+import type { ExtractedNodeRequestData, TraceparentData, Transaction } from '@sentry/types';
 import { extractTraceparentData, normalize } from '@sentry/utils';
 import { cleanRequestId } from './helpers';
 
 const plugin: FastifyPluginAsync = async server => {
-  server.decorateRequest('sentryTransaction', null);
+  server.decorateReply('sentryTransaction', null);
 
   function shouldIgnore(request: FastifyRequest) {
     if (
@@ -22,7 +20,7 @@ const plugin: FastifyPluginAsync = async server => {
     return false;
   }
 
-  server.addHook('onRequest', async request => {
+  server.addHook('onRequest', async (request, reply) => {
     if (shouldIgnore(request)) {
       return;
     }
@@ -53,11 +51,10 @@ const plugin: FastifyPluginAsync = async server => {
       },
       { request: extractedRequestData },
     );
-    (request as any).sentryTransaction = transaction;
+    (reply as any).sentryTransaction = transaction;
+    transaction.sampled = true;
 
-    Sentry.getCurrentHub().configureScope(scope => {
-      scope.setSpan(transaction);
-    });
+    Sentry.configureScope(scope => scope.setSpan(transaction));
 
     return;
   });
@@ -68,7 +65,7 @@ const plugin: FastifyPluginAsync = async server => {
     }
 
     setImmediate(() => {
-      const transaction: Transaction = (request as any).sentryTransaction;
+      const transaction: Transaction = (reply as any).sentryTransaction;
 
       transaction.setData('url', request.url);
       transaction.setData('query', request.query);
diff --git a/packages/services/storage/package.json b/packages/services/storage/package.json
@@ -12,7 +12,7 @@
     "db:generate": "schemats generate --config schemats.cjs -o src/db/types.ts"
   },
   "dependencies": {
-    "@sentry/node": "7.44.2",
+    "@sentry/node": "7.47.0",
     "@theguild/buddy": "0.1.0",
     "dotenv": "16.0.3",
     "got": "12.6.0",
@@ -23,7 +23,7 @@
     "zod": "3.21.4"
   },
   "devDependencies": {
-    "@sentry/types": "7.44.2",
+    "@sentry/types": "7.47.0",
     "@tgriesser/schemats": "9.0.1",
     "@types/node": "18.15.11",
     "@types/pg": "8.6.6",
diff --git a/packages/services/stripe-billing/package.json b/packages/services/stripe-billing/package.json
@@ -11,8 +11,7 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@sentry/node": "7.44.2",
-    "@sentry/tracing": "7.44.2",
+    "@sentry/node": "7.47.0",
     "@trpc/client": "10.20.0",
     "@trpc/server": "10.20.0",
     "@whatwg-node/fetch": "0.8.5",
diff --git a/packages/services/tokens/package.json b/packages/services/tokens/package.json
@@ -10,8 +10,7 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@sentry/node": "7.44.2",
-    "@sentry/tracing": "7.44.2",
+    "@sentry/node": "7.47.0",
     "@trpc/server": "10.20.0",
     "dotenv": "16.0.3",
     "ioredis": "5.3.1",
diff --git a/packages/services/usage-estimator/package.json b/packages/services/usage-estimator/package.json
@@ -11,8 +11,7 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@sentry/node": "7.44.2",
-    "@sentry/tracing": "7.44.2",
+    "@sentry/node": "7.47.0",
     "@trpc/server": "10.20.0",
     "@whatwg-node/fetch": "0.8.5",
     "dotenv": "16.0.3",
diff --git a/packages/services/usage-ingestor/package.json b/packages/services/usage-ingestor/package.json
@@ -10,8 +10,7 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@sentry/node": "7.44.2",
-    "@sentry/tracing": "7.44.2",
+    "@sentry/node": "7.47.0",
     "agentkeepalive": "4.3.0",
     "date-fns": "2.29.3",
     "dotenv": "16.0.3",
diff --git a/packages/services/usage/package.json b/packages/services/usage/package.json
@@ -10,8 +10,7 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@sentry/node": "7.44.2",
-    "@sentry/tracing": "7.44.2",
+    "@sentry/node": "7.47.0",
     "@trpc/client": "10.20.0",
     "@trpc/server": "10.20.0",
     "@whatwg-node/fetch": "0.8.5",
diff --git a/packages/services/webhooks/package.json b/packages/services/webhooks/package.json
@@ -11,8 +11,7 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@sentry/node": "7.44.2",
-    "@sentry/tracing": "7.44.2",
+    "@sentry/node": "7.47.0",
     "@trpc/server": "10.20.0",
     "bullmq": "3.10.4",
     "dotenv": "16.0.3",
diff --git a/packages/web/app/package.json b/packages/web/app/package.json
@@ -34,8 +34,8 @@
     "@radix-ui/react-toggle-group": "1.0.3",
     "@radix-ui/react-toolbar": "1.0.3",
     "@radix-ui/react-tooltip": "1.0.5",
-    "@sentry/nextjs": "7.44.2",
-    "@sentry/types": "7.44.2",
+    "@sentry/nextjs": "7.47.0",
+    "@sentry/types": "7.47.0",
     "@stripe/react-stripe-js": "2.1.0",
     "@stripe/stripe-js": "1.52.1",
     "@tanstack/react-table": "8.0.0-beta.8",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+ENVIRONMENT=local`
`1`	`2`	`LOG_LEVEL=debug`
`2`	`3`	`POSTGRES_USER=postgres`
`3`	`4`	`POSTGRES_PASSWORD=postgres`