From 784f0c02516ceb1cba45197b15906ea9e4f4b2b4 Mon Sep 17 00:00:00 2001
From: Kamil Kisiela <kamil.kisiela@gmail.com>
Date: Wed, 28 Sep 2022 15:14:45 +0200
Subject: [PATCH] Add graphql_client_name tag and drop calls from Hive Client
 (sentry) (#415)

---
 .../services/server/src/graphql-handler.ts     | 18 ++++++++++--------
 packages/services/server/src/index.ts          |  3 ---
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/packages/services/server/src/graphql-handler.ts b/packages/services/server/src/graphql-handler.ts
index 2f543538f..5d228c678 100644
--- a/packages/services/server/src/graphql-handler.ts
+++ b/packages/services/server/src/graphql-handler.ts
@@ -104,12 +104,12 @@ export const graphqlHandler = (options: GraphQLHandlerOptions): RouteHandlerMeth
 
           // Reduce the number of transactions to avoid overloading Sentry
           const ctx = args.contextValue as Context;
-          const graphqlClientName = Array.isArray(ctx.headers['graphql-client-name'])
-            ? ctx.headers['graphql-client-name'][0]
-            : ctx.headers['graphql-client-name'];
+          const clientNameHeaderValue = ctx.req.headers['graphql-client-name'];
+          const clientName = Array.isArray(clientNameHeaderValue) ? clientNameHeaderValue[0] : clientNameHeaderValue;
 
-          if (transaction && graphqlClientName !== 'Hive CLI' && graphqlClientName !== 'Hive App') {
-            transaction.sampled = false;
+          if (transaction) {
+            transaction.setTag('graphql_client_name', clientName);
+            transaction.sampled = clientName !== 'Hive Client';
           }
 
           scope.setContext('Extra Info', {
@@ -117,15 +117,17 @@ export const graphqlHandler = (options: GraphQLHandlerOptions): RouteHandlerMeth
             operationName: args.operationName,
             operation: print(args.document),
             userId: extractUserId(args.contextValue as any),
-            graphqlClientName,
           });
         },
         trackResolvers: false,
         appendTags: ({ contextValue }) => {
           const supertokens_user_id = extractUserId(contextValue as any);
-          const request_id = cleanRequestId((contextValue as any).req.headers['x-request-id']);
+          const request_id = cleanRequestId((contextValue as Context).req.headers['x-request-id']);
 
-          return { supertokens_user_id, request_id };
+          return {
+            supertokens_user_id,
+            request_id,
+          };
         },
         skip(args) {
           // It's the readiness check
diff --git a/packages/services/server/src/index.ts b/packages/services/server/src/index.ts
index e1b5945c9..daea62b9d 100644
--- a/packages/services/server/src/index.ts
+++ b/packages/services/server/src/index.ts
@@ -36,9 +36,6 @@ export async function main() {
     environment: process.env.ENVIRONMENT,
     dsn: process.env.SENTRY_DSN,
     tracesSampleRate: 1,
-    tracesSampler() {
-      return 1;
-    },
     release: process.env.RELEASE || 'local',
     integrations: [
       new Sentry.Integrations.Http({ tracing: true }),