Skip to content

ref(tracing): Remove optional chaining #4293

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 15, 2021
Merged

ref(tracing): Remove optional chaining #4293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/tracing/src/browser/metrics.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export class MetricsInstrumentation {
private _clsEntry: LayoutShift | undefined;

public constructor(private _reportAllChanges: boolean = false) {
if (!isNodeEnv() && global?.performance && global?.document) {
if (!isNodeEnv() && global && global.performance && global.document) {
if (global.performance.mark) {
global.performance.mark('sentry-tracing-init');
}
Expand Down
4 changes: 2 additions & 2 deletions packages/tracing/src/browser/request.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,8 +214,8 @@ export function xhrCallback(
): void {
if (
!hasTracingEnabled() ||
handlerData.xhr?.__sentry_own_request__ ||
!(handlerData.xhr?.__sentry_xhr__ && shouldCreateSpan(handlerData.xhr.__sentry_xhr__.url))
(handlerData.xhr && handlerData.xhr.__sentry_own_request__) ||
!(handlerData.xhr && handlerData.xhr.__sentry_xhr__ && shouldCreateSpan(handlerData.xhr.__sentry_xhr__.url))
) {
return;
}
Expand Down
10 changes: 6 additions & 4 deletions packages/tracing/src/hubextensions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,8 @@ function _startTransaction(
transactionContext: TransactionContext,
customSamplingContext?: CustomSamplingContext,
): Transaction {
const options = this.getClient()?.getOptions() || {};
const client = this.getClient();
const options = (client && client.getOptions()) || {};

let transaction = new Transaction(transactionContext, this);
transaction = sample(transaction, options, {
Expand All @@ -175,7 +176,7 @@ function _startTransaction(
...customSamplingContext,
});
if (transaction.sampled) {
transaction.initSpanRecorder(options._experiments?.maxSpans as number);
transaction.initSpanRecorder(options._experiments && (options._experiments.maxSpans as number));
}
return transaction;
}
Expand All @@ -190,7 +191,8 @@ export function startIdleTransaction(
onScope?: boolean,
customSamplingContext?: CustomSamplingContext,
): IdleTransaction {
const options = hub.getClient()?.getOptions() || {};
const client = hub.getClient();
const options = (client && client.getOptions()) || {};

let transaction = new IdleTransaction(transactionContext, hub, idleTimeout, onScope);
transaction = sample(transaction, options, {
Expand All @@ -199,7 +201,7 @@ export function startIdleTransaction(
...customSamplingContext,
});
if (transaction.sampled) {
transaction.initSpanRecorder(options._experiments?.maxSpans as number);
transaction.initSpanRecorder(options._experiments && (options._experiments.maxSpans as number));
}
return transaction;
}
Expand Down
10 changes: 5 additions & 5 deletions packages/tracing/src/transaction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,11 +104,11 @@ export class Transaction extends SpanClass implements TransactionInterface {
// At this point if `sampled !== true` we want to discard the transaction.
logger.log('[Tracing] Discarding transaction because its trace was not chosen to be sampled.');

this._hub
.getClient()
?.getTransport?.()
.recordLostEvent?.(Outcome.SampleRate, 'transaction');

const client = this._hub.getClient();
const transport = client && client.getTransport && client.getTransport();
if (transport && transport.recordLostEvent) {
transport.recordLostEvent(Outcome.SampleRate, 'transaction');
}
return undefined;
}

Expand Down
14 changes: 7 additions & 7 deletions packages/tracing/src/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,9 @@ export const TRACEPARENT_REGEXP = new RegExp(
*
* Tracing is enabled when at least one of `tracesSampleRate` and `tracesSampler` is defined in the SDK config.
*/
export function hasTracingEnabled(
options: Options | undefined = getCurrentHub()
.getClient()
?.getOptions(),
): boolean {
export function hasTracingEnabled(maybeOptions?: Options | undefined): boolean {
const client = getCurrentHub().getClient();
const options = maybeOptions || (client && client.getOptions());
return !!options && ('tracesSampleRate' in options || 'tracesSampler' in options);
}

Expand Down Expand Up @@ -48,8 +46,10 @@ export function extractTraceparentData(traceparent: string): TraceparentData | u
}

/** Grabs active transaction off scope, if any */
export function getActiveTransaction<T extends Transaction>(hub: Hub = getCurrentHub()): T | undefined {
return hub?.getScope()?.getTransaction() as T | undefined;
export function getActiveTransaction<T extends Transaction>(maybeHub?: Hub): T | undefined {
const hub = maybeHub || getCurrentHub();
const scope = hub.getScope();
return scope && (scope.getTransaction() as T | undefined);
}

/**
Expand Down