Skip to content

ref(browser): Avoid optional chaining #14457

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
Nov 25, 2024
Merged

ref(browser): Avoid optional chaining #14457

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
4 changes: 1 addition & 3 deletions packages/browser-utils/.eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@ module.exports = {
overrides: [
{
files: ['src/**'],
rules: {
'@sentry-internal/sdk/no-optional-chaining': 'off',
},
rules: {},
},
{
files: ['src/metrics/**'],
Expand Down
30 changes: 18 additions & 12 deletions packages/browser-utils/src/metrics/cls.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,11 @@ export function trackClsAsStandaloneSpan(): void {
setTimeout(() => {
const client = getClient();

const unsubscribeStartNavigation = client?.on('startNavigationSpan', () => {
if (!client) {
return;
}

const unsubscribeStartNavigation = client.on('startNavigationSpan', () => {
_collectClsOnce();
unsubscribeStartNavigation && unsubscribeStartNavigation();
});
Expand All @@ -84,15 +88,15 @@ export function trackClsAsStandaloneSpan(): void {
function sendStandaloneClsSpan(clsValue: number, entry: LayoutShift | undefined, pageloadSpanId: string) {
DEBUG_BUILD && logger.log(`Sending CLS span (${clsValue})`);

const startTime = msToSec((browserPerformanceTimeOrigin || 0) + (entry?.startTime || 0));
const startTime = msToSec((browserPerformanceTimeOrigin || 0) + ((entry && entry.startTime) || 0));
const routeName = getCurrentScope().getScopeData().transactionName;

const name = entry ? htmlTreeAsString(entry.sources[0]?.node) : 'Layout shift';
const name = entry ? htmlTreeAsString(entry.sources[0] && entry.sources[0].node) : 'Layout shift';

const attributes: SpanAttributes = dropUndefinedKeys({
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.browser.cls',
[SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'ui.webvital.cls',
[SEMANTIC_ATTRIBUTE_EXCLUSIVE_TIME]: entry?.duration || 0,
[SEMANTIC_ATTRIBUTE_EXCLUSIVE_TIME]: (entry && entry.duration) || 0,
// attach the pageload span id to the CLS span so that we can link them in the UI
'sentry.pageload.span_id': pageloadSpanId,
});
Expand All @@ -104,19 +108,21 @@ function sendStandaloneClsSpan(clsValue: number, entry: LayoutShift | undefined,
startTime,
});

span?.addEvent('cls', {
[SEMANTIC_ATTRIBUTE_SENTRY_MEASUREMENT_UNIT]: '',
[SEMANTIC_ATTRIBUTE_SENTRY_MEASUREMENT_VALUE]: clsValue,
});
if (span) {
span.addEvent('cls', {
[SEMANTIC_ATTRIBUTE_SENTRY_MEASUREMENT_UNIT]: '',
[SEMANTIC_ATTRIBUTE_SENTRY_MEASUREMENT_VALUE]: clsValue,
});

// LayoutShift performance entries always have a duration of 0, so we don't need to add `entry.duration` here
// see: https://developer.mozilla.org/en-US/docs/Web/API/PerformanceEntry/duration
span?.end(startTime);
// LayoutShift performance entries always have a duration of 0, so we don't need to add `entry.duration` here
// see: https://developer.mozilla.org/en-US/docs/Web/API/PerformanceEntry/duration
span.end(startTime);
}
}

function supportsLayoutShift(): boolean {
try {
return PerformanceObserver.supportedEntryTypes?.includes('layout-shift');
return PerformanceObserver.supportedEntryTypes.includes('layout-shift');
} catch {
return false;
}
Expand Down
12 changes: 7 additions & 5 deletions packages/browser-utils/src/metrics/inp.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,12 +112,14 @@ function _trackINP(): () => void {
startTime,
});

span?.addEvent('inp', {
[SEMANTIC_ATTRIBUTE_SENTRY_MEASUREMENT_UNIT]: 'millisecond',
[SEMANTIC_ATTRIBUTE_SENTRY_MEASUREMENT_VALUE]: metric.value,
});
if (span) {
span.addEvent('inp', {
[SEMANTIC_ATTRIBUTE_SENTRY_MEASUREMENT_UNIT]: 'millisecond',
[SEMANTIC_ATTRIBUTE_SENTRY_MEASUREMENT_VALUE]: metric.value,
});

span?.end(startTime + duration);
span.end(startTime + duration);
}
});
}

Expand Down
2 changes: 0 additions & 2 deletions packages/browser-utils/src/metrics/web-vitals/getINP.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ const processEntry = (entry: PerformanceEventTiming) => {
// The least-long of the 10 longest interactions.
const minLongestInteraction = longestInteractionList[longestInteractionList.length - 1];

// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const existingInteraction = longestInteractionMap[entry.interactionId!];

// Only process the entry if it's possibly one of the ten longest,
Expand All @@ -82,7 +81,6 @@ const processEntry = (entry: PerformanceEventTiming) => {
existingInteraction.latency = Math.max(existingInteraction.latency, entry.duration);
} else {
const interaction = {
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
id: entry.interactionId!,
latency: entry.duration,
entries: [entry],
Expand Down
2 changes: 0 additions & 2 deletions packages/browser-utils/test/utils/TestClient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,8 @@ export class TestClient extends BaseClient<TestClientOptions> {
exception: {
values: [
{
/* eslint-disable @typescript-eslint/no-unsafe-member-access */
type: exception.name,
value: exception.message,
/* eslint-enable @typescript-eslint/no-unsafe-member-access */
},
],
},
Expand Down
Loading