Skip to content

Commit bfd74df

Browse files
authored
ref(tracing): update hasTracingEnabled return value (#4225)
1 parent 7e5578e commit bfd74df

File tree

2 files changed

+19
-5
lines changed

2 files changed

+19
-5
lines changed

packages/tracing/src/utils.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,7 @@ export function hasTracingEnabled(
1919
.getClient()
2020
?.getOptions(),
2121
): boolean {
22-
if (!options) {
23-
return false;
24-
}
25-
return 'tracesSampleRate' in options || 'tracesSampler' in options;
22+
return !!options && ('tracesSampleRate' in options || 'tracesSampler' in options);
2623
}
2724

2825
/**

packages/tracing/test/utils.test.ts

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,21 @@
1-
import { extractTraceparentData } from '../src/utils';
1+
import { extractTraceparentData, hasTracingEnabled } from '../src/utils';
2+
3+
describe('hasTracingEnabled', () => {
4+
const tracesSampler = () => 1;
5+
const tracesSampleRate = 1;
6+
it.each([
7+
['No options', undefined, false],
8+
['No tracesSampler or tracesSampleRate', {}, false],
9+
['With tracesSampler', { tracesSampler }, true],
10+
['With tracesSampleRate', { tracesSampleRate }, true],
11+
['With tracesSampler and tracesSampleRate', { tracesSampler, tracesSampleRate }, true],
12+
])(
13+
'%s',
14+
(_: string, input: Parameters<typeof hasTracingEnabled>[0], output: ReturnType<typeof hasTracingEnabled>) => {
15+
expect(hasTracingEnabled(input)).toBe(output);
16+
},
17+
);
18+
});
219

320
describe('extractTraceparentData', () => {
421
test('no sample', () => {

0 commit comments

Comments
 (0)