move tracing enablement check to tracing package

Author: lobsterkatie

packages/gatsby/gatsby-browser.js

@@ -1,6 +1,5 @@
 const Sentry = require('@sentry/react');
 const Tracing = require('@sentry/tracing');
-const Utils = require('@sentry/utils')
 
 exports.onClientEntry = function(_, pluginParams) {
   if (pluginParams === undefined) {
@@ -9,7 +8,7 @@ exports.onClientEntry = function(_, pluginParams) {
 
   const integrations = [...(pluginParams.integrations || [])];
 
-  if (Utils.hasTracingEnabled(pluginParams) && !integrations.some(ele => ele.name === 'BrowserTracing')) {
+  if (Tracing.hasTracingEnabled(pluginParams) && !integrations.some(ele => ele.name === 'BrowserTracing')) {
     integrations.push(new Tracing.Integrations.BrowserTracing(pluginParams.browserTracingOptions));
   }
 

packages/gatsby/package.json

@@ -27,8 +27,7 @@
   },
   "dependencies": {
     "@sentry/react": "5.22.3",
-    "@sentry/tracing": "5.22.3",
-    "@sentry/utils": "5.22.3"
+    "@sentry/tracing": "5.22.3"
   },
   "peerDependencies": {
     "gatsby": "*"

packages/tracing/src/hubextensions.ts

@@ -4,7 +4,6 @@ import {
   dynamicRequire,
   extractNodeRequestData,
   getGlobalObject,
-  hasTracingEnabled,
   isInstanceOf,
   isNodeEnv,
   logger,
@@ -13,6 +12,7 @@ import {
 import { registerErrorInstrumentation } from './errors';
 import { IdleTransaction } from './idletransaction';
 import { Transaction } from './transaction';
+import { hasTracingEnabled } from './utils';
 
 /** Returns all trace headers that are currently on the top scope. */
 function traceHeaders(this: Hub): { [key: string]: string } {

packages/tracing/src/index.ts

@@ -14,3 +14,5 @@ export { SpanStatus } from './spanstatus';
 addExtensionMethods();
 
 export { addExtensionMethods };
+
+export * from './utils';

packages/tracing/src/utils.ts

@@ -0,0 +1,10 @@
+import { Options } from '@sentry/types';
+
+/**
+ * Determines if tracing is currently enabled.
+ *
+ * Tracing is enabled when at least one of `tracesSampleRate` and `tracesSampler` is defined in the SDK config.
+ */
+export function hasTracingEnabled(options: Options): boolean {
+  return 'tracesSampleRate' in options || 'tracesSampler' in options;
+}

packages/utils/src/misc.ts

@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import { Event, Integration, Options, StackFrame, WrappedFunction } from '@sentry/types';
+import { Event, Integration, StackFrame, WrappedFunction } from '@sentry/types';
 
 import { dynamicRequire, isNodeEnv } from './node';
 import { snipLine } from './string';
@@ -375,12 +375,3 @@ export function addContextToFrame(lines: string[], frame: StackFrame, linesOfCon
     .slice(Math.min(sourceLine + 1, maxLines), sourceLine + 1 + linesOfContext)
     .map((line: string) => snipLine(line, 0));
 }
-
-/**
- * Determines if tracing is currently enabled.
- *
- * Tracing is enabled when at least one of `tracesSampleRate` and `tracesSampler` is defined in the SDK config.
- */
-export function hasTracingEnabled(options: Options): boolean {
-  return !!options.tracesSampleRate || !!options.tracesSampler;
-}