Clean up

Author: onurtemizkan

packages/core/src/integrations/supabase.ts

@@ -26,7 +26,7 @@
 /* eslint-disable max-lines */
 import { logger, isPlainObject } from '../utils-hoist';
 
-import type { Span, IntegrationFn } from '../types-hoist';
+import type { IntegrationFn } from '../types-hoist';
 import { setHttpStatus, startInactiveSpan } from '../tracing';
 import { addBreadcrumb } from '../breadcrumbs';
 import { defineIntegration } from '../integration';
@@ -271,35 +271,28 @@ function instrumentPostgrestFilterBuilder(PostgrestFilterBuilder: PostgrestFilte
           }
         }
 
-        // TODO / Should?
-        const shouldCreateSpan = true;
-
-        let span: Span | undefined;
-
-        if (shouldCreateSpan) {
-          const attributes: Record<string, any> = {
-            'db.table': table,
-            'db.schema': typedThis.schema,
-            'db.url': typedThis.url.origin,
-            'db.sdk': typedThis.headers['X-Client-Info'],
-            [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.db.supabase',
-            [SEMANTIC_ATTRIBUTE_SENTRY_OP]: `db.${operation}`,
-          };
-
-          if (query.length) {
-            attributes['db.query'] = query;
-          }
-
-          if (Object.keys(body).length) {
-            attributes['db.body'] = body;
-          }
+        const attributes: Record<string, any> = {
+          'db.table': table,
+          'db.schema': typedThis.schema,
+          'db.url': typedThis.url.origin,
+          'db.sdk': typedThis.headers['X-Client-Info'],
+          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.db.supabase',
+          [SEMANTIC_ATTRIBUTE_SENTRY_OP]: `db.${operation}`,
+        };
+
+        if (query.length) {
+          attributes['db.query'] = query;
+        }
 
-          span = startInactiveSpan({
-            name: description,
-            attributes,
-          });
+        if (Object.keys(body).length) {
+          attributes['db.body'] = body;
         }
 
+        const span = startInactiveSpan({
+          name: description,
+          attributes,
+        });
+
         return (Reflect.apply(target, thisArg, []) as Promise<SupabaseResponse>)
           .then(
             (res: SupabaseResponse) => {
@@ -334,33 +327,28 @@ function instrumentPostgrestFilterBuilder(PostgrestFilterBuilder: PostgrestFilte
                 });
               }
 
-              // Todo / Should?
-              const shouldCreateBreadcrumb = true;
-
-              if (shouldCreateBreadcrumb) {
-                const breadcrumb: SupabaseBreadcrumb = {
-                  type: 'supabase',
-                  category: `db.${operation}`,
-                  message: description,
-                };
+              const breadcrumb: SupabaseBreadcrumb = {
+                type: 'supabase',
+                category: `db.${operation}`,
+                message: description,
+              };
 
-                const data: Record<string, unknown> = {};
+              const data: Record<string, unknown> = {};
 
-                if (query.length) {
-                  data.query = query;
-                }
-
-                if (Object.keys(body).length) {
-                  data.body = body;
-                }
+              if (query.length) {
+                data.query = query;
+              }
 
-                if (Object.keys(data).length) {
-                  breadcrumb.data = data;
-                }
+              if (Object.keys(body).length) {
+                data.body = body;
+              }
 
-                addBreadcrumb(breadcrumb);
+              if (Object.keys(data).length) {
+                breadcrumb.data = data;
               }
 
+              addBreadcrumb(breadcrumb);
+
               return res;
             },
             (err: Error) => {