From b2ba0efd9fbb04cc38fcb067072d12d917a05cd1 Mon Sep 17 00:00:00 2001
From: Abhijeet Prasad <aprasad@sentry.io>
Date: Thu, 2 Dec 2021 14:03:34 -0500
Subject: [PATCH 1/2] test(tracing): Add unit test for hasTracingEnabled

---
 packages/tracing/test/utils.test.ts | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/packages/tracing/test/utils.test.ts b/packages/tracing/test/utils.test.ts
index cda8fbbb062f..eae5213758ea 100644
--- a/packages/tracing/test/utils.test.ts
+++ b/packages/tracing/test/utils.test.ts
@@ -1,4 +1,21 @@
-import { extractTraceparentData } from '../src/utils';
+import { extractTraceparentData, hasTracingEnabled } from '../src/utils';
+
+describe('hasTracingEnabled', () => {
+  const tracesSampler = () => 1;
+  const tracesSampleRate = 1;
+  it.each([
+    ['No options', undefined, false],
+    ['No tracesSampler or tracesSampleRate', {}, false],
+    ['With tracesSampler', { tracesSampler }, true],
+    ['With tracesSampleRate', { tracesSampleRate }, true],
+    ['With tracesSampler and tracesSampleRate', { tracesSampler, tracesSampleRate }, true],
+  ])(
+    '%s',
+    (_: string, input: Parameters<typeof hasTracingEnabled>[0], output: ReturnType<typeof hasTracingEnabled>) => {
+      expect(hasTracingEnabled(input)).toBe(output);
+    },
+  );
+});
 
 describe('extractTraceparentData', () => {
   test('no sample', () => {

From e4fc16a769f22a3606be5d6bf57252f847f84c2b Mon Sep 17 00:00:00 2001
From: Abhijeet Prasad <aprasad@sentry.io>
Date: Fri, 3 Dec 2021 10:40:28 -0500
Subject: [PATCH 2/2] ref: make hasTracingEnabled a one-liner

---
 packages/tracing/src/utils.ts | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/packages/tracing/src/utils.ts b/packages/tracing/src/utils.ts
index 340bc00cf0b5..636d4e7f035b 100644
--- a/packages/tracing/src/utils.ts
+++ b/packages/tracing/src/utils.ts
@@ -19,10 +19,7 @@ export function hasTracingEnabled(
     .getClient()
     ?.getOptions(),
 ): boolean {
-  if (!options) {
-    return false;
-  }
-  return 'tracesSampleRate' in options || 'tracesSampler' in options;
+  return !!options && ('tracesSampleRate' in options || 'tracesSampler' in options);
 }
 
 /**