Skip to content

ref: Remove some usages of dropUndefinedKeys()#15781

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
mydea merged 2 commits into from
Mar 24, 2025
Merged

ref: Remove some usages of dropUndefinedKeys()#15781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a96e979
ref: Remove some usages of `dropUndefinedKeys()`
mydea Mar 21, 2025
13a0d88
drop one more
mydea Mar 21, 2025
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
54 changes: 26 additions & 28 deletions packages/astro/src/integration/index.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ import * as path from 'path';
import { sentryVitePlugin } from '@sentry/vite-plugin';
import type { AstroConfig, AstroIntegration } from 'astro';

import { consoleSandbox, dropUndefinedKeys } from '@sentry/core';
import { consoleSandbox } from '@sentry/core';
import { buildClientSnippet, buildSdkInitFileImportSnippet, buildServerSnippet } from './snippets';
import type { SentryOptions } from './types';

Expand DownExpand Up@@ -62,34 +62,32 @@ export const sentryAstro = (options: SentryOptions = {}): AstroIntegration => {
sourcemap: computedSourceMapSettings.updatedSourceMapSetting,
},
plugins: [
sentryVitePlugin(
dropUndefinedKeys({
org: uploadOptions.org ?? env.SENTRY_ORG,
project: uploadOptions.project ?? env.SENTRY_PROJECT,
authToken: uploadOptions.authToken ?? env.SENTRY_AUTH_TOKEN,
telemetry: uploadOptions.telemetry ?? true,
_metaOptions: {
telemetry: {
metaFramework: 'astro',
},
sentryVitePlugin({
org: uploadOptions.org ?? env.SENTRY_ORG,
project: uploadOptions.project ?? env.SENTRY_PROJECT,
authToken: uploadOptions.authToken ?? env.SENTRY_AUTH_TOKEN,
telemetry: uploadOptions.telemetry ?? true,
_metaOptions: {
telemetry: {
metaFramework: 'astro',
},
...unstable_sentryVitePluginOptions,
debug: options.debug ?? false,
sourcemaps: {
assets: uploadOptions.assets ?? [getSourcemapsAssetsGlob(config)],
filesToDeleteAfterUpload:
uploadOptions?.filesToDeleteAfterUpload ?? updatedFilesToDeleteAfterUpload,
...unstable_sentryVitePluginOptions?.sourcemaps,
},
bundleSizeOptimizations: {
...options.bundleSizeOptimizations,
// TODO: with a future version of the vite plugin (probably 2.22.0) this re-mapping is not needed anymore
// ref: https://github.com/getsentry/sentry-javascript-bundler-plugins/pull/582
excludePerformanceMonitoring: options.bundleSizeOptimizations?.excludeTracing,
...unstable_sentryVitePluginOptions?.bundleSizeOptimizations,
},
}),
),
},
...unstable_sentryVitePluginOptions,
debug: options.debug ?? false,
sourcemaps: {
assets: uploadOptions.assets ?? [getSourcemapsAssetsGlob(config)],
filesToDeleteAfterUpload:
uploadOptions?.filesToDeleteAfterUpload ?? updatedFilesToDeleteAfterUpload,
...unstable_sentryVitePluginOptions?.sourcemaps,
},
bundleSizeOptimizations: {
...options.bundleSizeOptimizations,
// TODO: with a future version of the vite plugin (probably 2.22.0) this re-mapping is not needed anymore
// ref: https://github.com/getsentry/sentry-javascript-bundler-plugins/pull/582
excludePerformanceMonitoring: options.bundleSizeOptimizations?.excludeTracing,
...unstable_sentryVitePluginOptions?.bundleSizeOptimizations,
},
}),
],
},
});
Expand Down
5 changes: 2 additions & 3 deletions packages/browser-utils/src/metrics/inp.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,6 @@ import {
SEMANTIC_ATTRIBUTE_SENTRY_OP,
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
browserPerformanceTimeOrigin,
dropUndefinedKeys,
getActiveSpan,
getCurrentScope,
getRootSpan,
Expand DownExpand Up@@ -101,11 +100,11 @@ function _trackINP(): () => void {
const routeName = spanToUse ? spanToJSON(spanToUse).description : getCurrentScope().getScopeData().transactionName;

const name = htmlTreeAsString(entry.target);
const attributes: SpanAttributes = dropUndefinedKeys({
const attributes: SpanAttributes = {

@mydeamydeaMar 21, 2025

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nothing possibly undefined here!

[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.browser.inp',
[SEMANTIC_ATTRIBUTE_SENTRY_OP]: `ui.interaction.${interactionType}`,
[SEMANTIC_ATTRIBUTE_EXCLUSIVE_TIME]: entry.duration,
});
};

const span = startStandaloneWebVitalSpan({
name,
Expand Down
3 changes: 1 addition & 2 deletions packages/core/src/checkin.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,6 @@ import type {
} from './types-hoist';
import { dsnToString } from './utils-hoist/dsn';
import { createEnvelope } from './utils-hoist/envelope';
import { dropUndefinedKeys } from './utils-hoist/object';

/**
* Create envelope from check in item.
Expand DownExpand Up@@ -36,7 +35,7 @@ export function createCheckInEnvelope(
}

if (dynamicSamplingContext) {
headers.trace = dropUndefinedKeys(dynamicSamplingContext) as DynamicSamplingContext;
headers.trace = dynamicSamplingContext as DynamicSamplingContext;

@mydeamydeaMar 21, 2025

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should not care if there is something undefined in there, I believe?

@AbhiPrasadAbhiPrasadMar 21, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it should not!

}

const item = createCheckInEnvelopeItem(checkIn);
Expand Down
5 changes: 2 additions & 3 deletions packages/core/src/feedback.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
import { getClient, getCurrentScope } from './currentScopes';
import type { EventHint, FeedbackEvent, SendFeedbackParams } from './types-hoist';
import { dropUndefinedKeys } from './utils-hoist/object';

/**
* Send user feedback to Sentry.
Expand All@@ -14,14 +13,14 @@ export function captureFeedback(

const feedbackEvent: FeedbackEvent = {
contexts: {
feedback: dropUndefinedKeys({
feedback: {

@mydeamydeaMar 21, 2025

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should not care about undefined fields

contact_email: email,
name,
message,
url,
source,
associated_event_id: associatedEventId,
}),
},
},
type: 'feedback',
level: 'info',
Expand Down
6 changes: 3 additions & 3 deletions packages/core/src/session.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import type { SerializedSession, Session, SessionContext, SessionStatus } from './types-hoist';
import { dropUndefinedKeys, timestampInSeconds, uuid4 } from './utils-hoist';
import { timestampInSeconds, uuid4 } from './utils-hoist';

/**
* Creates a new `Session` object by setting certain default parameters. If optional @param context
Expand DownExpand Up@@ -137,7 +137,7 @@ export function closeSession(session: Session, status?: Exclude<SessionStatus, '
* @returns a JSON object of the passed session
*/
function sessionToJSON(session: Session): SerializedSession {
return dropUndefinedKeys({
return {

@mydeamydeaMar 21, 2025

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is only called when we send the session, where this should be cleared out by JSON.stringify() anyhow

sid: `${session.sid}`,
init: session.init,
// Make sure that sec is converted to ms for date constructor
Expand All@@ -154,5 +154,5 @@ function sessionToJSON(session: Session): SerializedSession {
ip_address: session.ipAddress,
user_agent: session.userAgent,
},
});
};
}
2 changes: 1 addition & 1 deletion packages/core/src/tracing/dynamicSamplingContext.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,7 @@ export function getDynamicSamplingContextFromClient(trace_id: string, client: Cl
release: options.release,
public_key,
trace_id,
}) as DynamicSamplingContext;
}) satisfies DynamicSamplingContext;

client.emit('createDsc', dsc);

Expand Down
6 changes: 3 additions & 3 deletions packages/replay-internal/src/coreHandlers/util/networkUtils.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { serializeFormData } from '@sentry-internal/browser-utils';
import type { NetworkMetaWarning } from '@sentry-internal/browser-utils';
import { dropUndefinedKeys, stringMatchesSomePattern } from '@sentry/core';
import { stringMatchesSomePattern } from '@sentry/core';

import { NETWORK_BODY_MAX_SIZE, WINDOW } from '../../constants';
import type {
Expand DownExpand Up@@ -98,12 +98,12 @@ export function makeNetworkReplayBreadcrumb(
start: startTimestamp / 1000,
end: endTimestamp / 1000,
name: url,
data: dropUndefinedKeys({
data: {

@mydeamydeaMar 21, 2025

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should be fine to contain undefined

method,
statusCode,
request,
response,
}),
},
};

return result;
Expand Down
6 changes: 3 additions & 3 deletions packages/sveltekit/src/client/browserTracingIntegration.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { navigating, page } from '$app/stores';
import type { Client, Integration, Span } from '@sentry/core';
import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, dropUndefinedKeys } from '@sentry/core';
import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '@sentry/core';
import {
WINDOW,
browserTracingIntegration as originalBrowserTracingIntegration,
Expand DownExpand Up@@ -113,15 +113,15 @@ function _instrumentNavigations(client: Client): void {
routingSpan.end();
}

const navigationInfo = dropUndefinedKeys({
const navigationInfo = {

@mydeamydeaMar 21, 2025

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

attributes can be undefined, that should not change anything.

// `navigation.type` denotes the origin of the navigation. e.g.:
// - link (clicking on a link)
// - goto (programmatic via goto() or redirect())
// - popstate (back/forward navigation)
'sentry.sveltekit.navigation.type': navigation.type,
'sentry.sveltekit.navigation.from': parameterizedRouteOrigin || undefined,
'sentry.sveltekit.navigation.to': parameterizedRouteDestination || undefined,
});
};

startBrowserTracingNavigationSpan(client, {
name: parameterizedRouteDestination || rawRouteDestination || 'unknown',
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
ref: Remove some usages of `dropUndefinedKeys()` by mydea · Pull Request #15781 · getsentry/sentry-javascript · GitHub
Skip to content
ref: Remove some usages of dropUndefinedKeys()#15781

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

mydea
merged 2 commits into

from

Mar 24, 2025
 Merged


ref: Remove some usages of dropUndefinedKeys()#15781
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
a96e979

ref: Remove some usages of `dropUndefinedKeys()`


mydea Mar 21, 2025
13a0d88

drop one more


mydea Mar 21, 2025

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


54 changes: 26 additions & 28 deletions
packages/astro/src/integration/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ import * as path from 'path';
import { sentryVitePlugin } from '@sentry/vite-plugin';
import type { AstroConfig, AstroIntegration } from 'astro';

import { consoleSandbox, dropUndefinedKeys } from '@sentry/core';
import { consoleSandbox } from '@sentry/core';
import { buildClientSnippet, buildSdkInitFileImportSnippet, buildServerSnippet } from './snippets';
import type { SentryOptions } from './types';

Expand DownExpand Up@@ -62,34 +62,32 @@ export const sentryAstro = (options: SentryOptions = {}): AstroIntegration => {
 sourcemap: computedSourceMapSettings.updatedSourceMapSetting,
 },
 plugins: [
 sentryVitePlugin(
 dropUndefinedKeys({
 org: uploadOptions.org ?? env.SENTRY_ORG,
 project: uploadOptions.project ?? env.SENTRY_PROJECT,
 authToken: uploadOptions.authToken ?? env.SENTRY_AUTH_TOKEN,
 telemetry: uploadOptions.telemetry ?? true,
 _metaOptions: {
 telemetry: {
 metaFramework: 'astro',
 },
 sentryVitePlugin({
 org: uploadOptions.org ?? env.SENTRY_ORG,
 project: uploadOptions.project ?? env.SENTRY_PROJECT,
 authToken: uploadOptions.authToken ?? env.SENTRY_AUTH_TOKEN,
 telemetry: uploadOptions.telemetry ?? true,
 _metaOptions: {
 telemetry: {
 metaFramework: 'astro',
 },
 ...unstable_sentryVitePluginOptions,
 debug: options.debug ?? false,
 sourcemaps: {
 assets: uploadOptions.assets ?? [getSourcemapsAssetsGlob(config)],
 filesToDeleteAfterUpload:
 uploadOptions?.filesToDeleteAfterUpload ?? updatedFilesToDeleteAfterUpload,
...unstable_sentryVitePluginOptions?.sourcemaps,
},
 bundleSizeOptimizations: {
 ...options.bundleSizeOptimizations,
 // TODO: with a future version of the vite plugin (probably 2.22.0) this re-mapping is not needed anymore
// ref: https://github.com/getsentry/sentry-javascript-bundler-plugins/pull/582
 excludePerformanceMonitoring: options.bundleSizeOptimizations?.excludeTracing,
 ...unstable_sentryVitePluginOptions?.bundleSizeOptimizations,
},
 }),
 ),
},
...unstable_sentryVitePluginOptions,
debug: options.debug ?? false,
sourcemaps: {
assets: uploadOptions.assets ?? [getSourcemapsAssetsGlob(config)],
 filesToDeleteAfterUpload:
uploadOptions?.filesToDeleteAfterUpload ?? updatedFilesToDeleteAfterUpload,
...unstable_sentryVitePluginOptions?.sourcemaps,
},
 bundleSizeOptimizations: {
...options.bundleSizeOptimizations,
 // TODO: with a future version of the vite plugin (probably 2.22.0) this re-mapping is not needed anymore
// ref: https://github.com/getsentry/sentry-javascript-bundler-plugins/pull/582
excludePerformanceMonitoring: options.bundleSizeOptimizations?.excludeTracing,
...unstable_sentryVitePluginOptions?.bundleSizeOptimizations,
 },
}),
 ],
 },
 });
Expand Down

5 changes: 2 additions & 3 deletions
packages/browser-utils/src/metrics/inp.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,6 @@ import {
 SEMANTIC_ATTRIBUTE_SENTRY_OP,
 SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
 browserPerformanceTimeOrigin,
 dropUndefinedKeys,
 getActiveSpan,
 getCurrentScope,
 getRootSpan,
Expand DownExpand Up@@ -101,11 +100,11 @@ function _trackINP(): () => void {
 const routeName = spanToUse ? spanToJSON(spanToUse).description : getCurrentScope().getScopeData().transactionName;

 const name = htmlTreeAsString(entry.target);
 const attributes: SpanAttributes = dropUndefinedKeys({
 const attributes: SpanAttributes = {
@mydeamydeaMar 21, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nothing possibly undefined here!
 [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.browser.inp',
 [SEMANTIC_ATTRIBUTE_SENTRY_OP]: `ui.interaction.${interactionType}`,
 [SEMANTIC_ATTRIBUTE_EXCLUSIVE_TIME]: entry.duration,
 });
 };

 const span = startStandaloneWebVitalSpan({
 name,
Expand Down

3 changes: 1 addition & 2 deletions
packages/core/src/checkin.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,6 @@ import type {
} from './types-hoist';
import { dsnToString } from './utils-hoist/dsn';
import { createEnvelope } from './utils-hoist/envelope';
import { dropUndefinedKeys } from './utils-hoist/object';

/**
 * Create envelope from check in item.
Expand DownExpand Up@@ -36,7 +35,7 @@ export function createCheckInEnvelope(
 }

 if (dynamicSamplingContext) {
 headers.trace = dropUndefinedKeys(dynamicSamplingContext) as DynamicSamplingContext;
 headers.trace = dynamicSamplingContext as DynamicSamplingContext;
@mydeamydeaMar 21, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should not care if there is something undefined in there, I believe?
@AbhiPrasadAbhiPrasadMar 21, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it should not!
 }

 const item = createCheckInEnvelopeItem(checkIn);
Expand Down

5 changes: 2 additions & 3 deletions
packages/core/src/feedback.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
import { getClient, getCurrentScope } from './currentScopes';
import type { EventHint, FeedbackEvent, SendFeedbackParams } from './types-hoist';
import { dropUndefinedKeys } from './utils-hoist/object';

/**
 * Send user feedback to Sentry.
Expand All@@ -14,14 +13,14 @@ export function captureFeedback(

 const feedbackEvent: FeedbackEvent = {
 contexts: {
 feedback: dropUndefinedKeys({
 feedback: {
@mydeamydeaMar 21, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should not care about undefined fields
 contact_email: email,
 name,
 message,
 url,
 source,
 associated_event_id: associatedEventId,
 }),
 },
 },
 type: 'feedback',
 level: 'info',
Expand Down

6 changes: 3 additions & 3 deletions
packages/core/src/session.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import type { SerializedSession, Session, SessionContext, SessionStatus } from './types-hoist';
import { dropUndefinedKeys, timestampInSeconds, uuid4 } from './utils-hoist';
import { timestampInSeconds, uuid4 } from './utils-hoist';

/**
 * Creates a new `Session` object by setting certain default parameters. If optional @param context
Expand DownExpand Up@@ -137,7 +137,7 @@ export function closeSession(session: Session, status?: Exclude<SessionStatus, '
 * @returns a JSON object of the passed session
 */
function sessionToJSON(session: Session): SerializedSession {
 return dropUndefinedKeys({
 return {
@mydeamydeaMar 21, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is only called when we send the session, where this should be cleared out by JSON.stringify() anyhow
 sid: `${session.sid}`,
 init: session.init,
 // Make sure that sec is converted to ms for date constructor
Expand All@@ -154,5 +154,5 @@ function sessionToJSON(session: Session): SerializedSession {
 ip_address: session.ipAddress,
 user_agent: session.userAgent,
 },
 });
 };
}

2 changes: 1 addition & 1 deletion
packages/core/src/tracing/dynamicSamplingContext.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,7 @@ export function getDynamicSamplingContextFromClient(trace_id: string, client: Cl
 release: options.release,
 public_key,
 trace_id,
 }) as DynamicSamplingContext;
 }) satisfies DynamicSamplingContext;

 client.emit('createDsc', dsc);

Expand Down

6 changes: 3 additions & 3 deletions
packages/replay-internal/src/coreHandlers/util/networkUtils.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { serializeFormData } from '@sentry-internal/browser-utils';
import type { NetworkMetaWarning } from '@sentry-internal/browser-utils';
import { dropUndefinedKeys, stringMatchesSomePattern } from '@sentry/core';
import { stringMatchesSomePattern } from '@sentry/core';

import { NETWORK_BODY_MAX_SIZE, WINDOW } from '../../constants';
import type {
Expand DownExpand Up@@ -98,12 +98,12 @@ export function makeNetworkReplayBreadcrumb(
 start: startTimestamp / 1000,
 end: endTimestamp / 1000,
 name: url,
 data: dropUndefinedKeys({
 data: {
@mydeamydeaMar 21, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should be fine to contain undefined
 method,
 statusCode,
 request,
 response,
 }),
 },
 };

 return result;
Expand Down

6 changes: 3 additions & 3 deletions
packages/sveltekit/src/client/browserTracingIntegration.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { navigating, page } from '$app/stores';
import type { Client, Integration, Span } from '@sentry/core';
import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, dropUndefinedKeys } from '@sentry/core';
import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '@sentry/core';
import {
 WINDOW,
 browserTracingIntegration as originalBrowserTracingIntegration,
Expand DownExpand Up@@ -113,15 +113,15 @@ function _instrumentNavigations(client: Client): void {
 routingSpan.end();
 }

 const navigationInfo = dropUndefinedKeys({
 const navigationInfo = {
@mydeamydeaMar 21, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

attributes can be undefined, that should not change anything.
 // `navigation.type` denotes the origin of the navigation. e.g.:
 // - link (clicking on a link)
 // - goto (programmatic via goto() or redirect())
 // - popstate (back/forward navigation)
 'sentry.sveltekit.navigation.type': navigation.type,
 'sentry.sveltekit.navigation.from': parameterizedRouteOrigin || undefined,
 'sentry.sveltekit.navigation.to': parameterizedRouteDestination || undefined,
 });
 };

 startBrowserTracingNavigationSpan(client, {
 name: parameterizedRouteDestination || rawRouteDestination || 'unknown',
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
ref: Remove some usages of `dropUndefinedKeys()` by mydea · Pull Request #15781 · getsentry/sentry-javascript · GitHub
Skip to content
ref: Remove some usages of dropUndefinedKeys()#15781

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

mydea
merged 2 commits into

from

Mar 24, 2025
 Merged


ref: Remove some usages of dropUndefinedKeys()#15781
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
a96e979

ref: Remove some usages of `dropUndefinedKeys()`


mydea Mar 21, 2025
13a0d88

drop one more


mydea Mar 21, 2025

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


54 changes: 26 additions & 28 deletions
packages/astro/src/integration/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ import * as path from 'path';
import { sentryVitePlugin } from '@sentry/vite-plugin';
import type { AstroConfig, AstroIntegration } from 'astro';

import { consoleSandbox, dropUndefinedKeys } from '@sentry/core';
import { consoleSandbox } from '@sentry/core';
import { buildClientSnippet, buildSdkInitFileImportSnippet, buildServerSnippet } from './snippets';
import type { SentryOptions } from './types';

Expand DownExpand Up@@ -62,34 +62,32 @@ export const sentryAstro = (options: SentryOptions = {}): AstroIntegration => {
 sourcemap: computedSourceMapSettings.updatedSourceMapSetting,
 },
 plugins: [
 sentryVitePlugin(
 dropUndefinedKeys({
 org: uploadOptions.org ?? env.SENTRY_ORG,
 project: uploadOptions.project ?? env.SENTRY_PROJECT,
 authToken: uploadOptions.authToken ?? env.SENTRY_AUTH_TOKEN,
 telemetry: uploadOptions.telemetry ?? true,
 _metaOptions: {
 telemetry: {
 metaFramework: 'astro',
 },
 sentryVitePlugin({
 org: uploadOptions.org ?? env.SENTRY_ORG,
 project: uploadOptions.project ?? env.SENTRY_PROJECT,
 authToken: uploadOptions.authToken ?? env.SENTRY_AUTH_TOKEN,
 telemetry: uploadOptions.telemetry ?? true,
 _metaOptions: {
 telemetry: {
 metaFramework: 'astro',
 },
 ...unstable_sentryVitePluginOptions,
 debug: options.debug ?? false,
 sourcemaps: {
 assets: uploadOptions.assets ?? [getSourcemapsAssetsGlob(config)],
 filesToDeleteAfterUpload:
 uploadOptions?.filesToDeleteAfterUpload ?? updatedFilesToDeleteAfterUpload,
...unstable_sentryVitePluginOptions?.sourcemaps,
},
 bundleSizeOptimizations: {
 ...options.bundleSizeOptimizations,
 // TODO: with a future version of the vite plugin (probably 2.22.0) this re-mapping is not needed anymore
// ref: https://github.com/getsentry/sentry-javascript-bundler-plugins/pull/582
 excludePerformanceMonitoring: options.bundleSizeOptimizations?.excludeTracing,
 ...unstable_sentryVitePluginOptions?.bundleSizeOptimizations,
},
 }),
 ),
},
...unstable_sentryVitePluginOptions,
debug: options.debug ?? false,
sourcemaps: {
assets: uploadOptions.assets ?? [getSourcemapsAssetsGlob(config)],
 filesToDeleteAfterUpload:
uploadOptions?.filesToDeleteAfterUpload ?? updatedFilesToDeleteAfterUpload,
...unstable_sentryVitePluginOptions?.sourcemaps,
},
 bundleSizeOptimizations: {
...options.bundleSizeOptimizations,
 // TODO: with a future version of the vite plugin (probably 2.22.0) this re-mapping is not needed anymore
// ref: https://github.com/getsentry/sentry-javascript-bundler-plugins/pull/582
excludePerformanceMonitoring: options.bundleSizeOptimizations?.excludeTracing,
...unstable_sentryVitePluginOptions?.bundleSizeOptimizations,
 },
}),
 ],
 },
 });
Expand Down

5 changes: 2 additions & 3 deletions
packages/browser-utils/src/metrics/inp.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,6 @@ import {
 SEMANTIC_ATTRIBUTE_SENTRY_OP,
 SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
 browserPerformanceTimeOrigin,
 dropUndefinedKeys,
 getActiveSpan,
 getCurrentScope,
 getRootSpan,
Expand DownExpand Up@@ -101,11 +100,11 @@ function _trackINP(): () => void {
 const routeName = spanToUse ? spanToJSON(spanToUse).description : getCurrentScope().getScopeData().transactionName;

 const name = htmlTreeAsString(entry.target);
 const attributes: SpanAttributes = dropUndefinedKeys({
 const attributes: SpanAttributes = {
@mydeamydeaMar 21, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nothing possibly undefined here!
 [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.browser.inp',
 [SEMANTIC_ATTRIBUTE_SENTRY_OP]: `ui.interaction.${interactionType}`,
 [SEMANTIC_ATTRIBUTE_EXCLUSIVE_TIME]: entry.duration,
 });
 };

 const span = startStandaloneWebVitalSpan({
 name,
Expand Down

3 changes: 1 addition & 2 deletions
packages/core/src/checkin.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,6 @@ import type {
} from './types-hoist';
import { dsnToString } from './utils-hoist/dsn';
import { createEnvelope } from './utils-hoist/envelope';
import { dropUndefinedKeys } from './utils-hoist/object';

/**
 * Create envelope from check in item.
Expand DownExpand Up@@ -36,7 +35,7 @@ export function createCheckInEnvelope(
 }

 if (dynamicSamplingContext) {
 headers.trace = dropUndefinedKeys(dynamicSamplingContext) as DynamicSamplingContext;
 headers.trace = dynamicSamplingContext as DynamicSamplingContext;
@mydeamydeaMar 21, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should not care if there is something undefined in there, I believe?
@AbhiPrasadAbhiPrasadMar 21, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it should not!
 }

 const item = createCheckInEnvelopeItem(checkIn);
Expand Down

5 changes: 2 additions & 3 deletions
packages/core/src/feedback.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
import { getClient, getCurrentScope } from './currentScopes';
import type { EventHint, FeedbackEvent, SendFeedbackParams } from './types-hoist';
import { dropUndefinedKeys } from './utils-hoist/object';

/**
 * Send user feedback to Sentry.
Expand All@@ -14,14 +13,14 @@ export function captureFeedback(

 const feedbackEvent: FeedbackEvent = {
 contexts: {
 feedback: dropUndefinedKeys({
 feedback: {
@mydeamydeaMar 21, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should not care about undefined fields
 contact_email: email,
 name,
 message,
 url,
 source,
 associated_event_id: associatedEventId,
 }),
 },
 },
 type: 'feedback',
 level: 'info',
Expand Down

6 changes: 3 additions & 3 deletions
packages/core/src/session.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import type { SerializedSession, Session, SessionContext, SessionStatus } from './types-hoist';
import { dropUndefinedKeys, timestampInSeconds, uuid4 } from './utils-hoist';
import { timestampInSeconds, uuid4 } from './utils-hoist';

/**
 * Creates a new `Session` object by setting certain default parameters. If optional @param context
Expand DownExpand Up@@ -137,7 +137,7 @@ export function closeSession(session: Session, status?: Exclude<SessionStatus, '
 * @returns a JSON object of the passed session
 */
function sessionToJSON(session: Session): SerializedSession {
 return dropUndefinedKeys({
 return {
@mydeamydeaMar 21, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is only called when we send the session, where this should be cleared out by JSON.stringify() anyhow
 sid: `${session.sid}`,
 init: session.init,
 // Make sure that sec is converted to ms for date constructor
Expand All@@ -154,5 +154,5 @@ function sessionToJSON(session: Session): SerializedSession {
 ip_address: session.ipAddress,
 user_agent: session.userAgent,
 },
 });
 };
}

2 changes: 1 addition & 1 deletion
packages/core/src/tracing/dynamicSamplingContext.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,7 @@ export function getDynamicSamplingContextFromClient(trace_id: string, client: Cl
 release: options.release,
 public_key,
 trace_id,
 }) as DynamicSamplingContext;
 }) satisfies DynamicSamplingContext;

 client.emit('createDsc', dsc);

Expand Down

6 changes: 3 additions & 3 deletions
packages/replay-internal/src/coreHandlers/util/networkUtils.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { serializeFormData } from '@sentry-internal/browser-utils';
import type { NetworkMetaWarning } from '@sentry-internal/browser-utils';
import { dropUndefinedKeys, stringMatchesSomePattern } from '@sentry/core';
import { stringMatchesSomePattern } from '@sentry/core';

import { NETWORK_BODY_MAX_SIZE, WINDOW } from '../../constants';
import type {
Expand DownExpand Up@@ -98,12 +98,12 @@ export function makeNetworkReplayBreadcrumb(
 start: startTimestamp / 1000,
 end: endTimestamp / 1000,
 name: url,
 data: dropUndefinedKeys({
 data: {
@mydeamydeaMar 21, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should be fine to contain undefined
 method,
 statusCode,
 request,
 response,
 }),
 },
 };

 return result;
Expand Down

6 changes: 3 additions & 3 deletions
packages/sveltekit/src/client/browserTracingIntegration.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { navigating, page } from '$app/stores';
import type { Client, Integration, Span } from '@sentry/core';
import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, dropUndefinedKeys } from '@sentry/core';
import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '@sentry/core';
import {
 WINDOW,
 browserTracingIntegration as originalBrowserTracingIntegration,
Expand DownExpand Up@@ -113,15 +113,15 @@ function _instrumentNavigations(client: Client): void {
 routingSpan.end();
 }

 const navigationInfo = dropUndefinedKeys({
 const navigationInfo = {
@mydeamydeaMar 21, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

attributes can be undefined, that should not change anything.
 // `navigation.type` denotes the origin of the navigation. e.g.:
 // - link (clicking on a link)
 // - goto (programmatic via goto() or redirect())
 // - popstate (back/forward navigation)
 'sentry.sveltekit.navigation.type': navigation.type,
 'sentry.sveltekit.navigation.from': parameterizedRouteOrigin || undefined,
 'sentry.sveltekit.navigation.to': parameterizedRouteDestination || undefined,
 });
 };

 startBrowserTracingNavigationSpan(client, {
 name: parameterizedRouteDestination || rawRouteDestination || 'unknown',
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
ref: Remove some usages of `dropUndefinedKeys()` by mydea · Pull Request #15781 · getsentry/sentry-javascript · GitHub
Skip to content
ref: Remove some usages of dropUndefinedKeys()#15781

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

mydea
merged 2 commits into

from

Mar 24, 2025
 Merged


ref: Remove some usages of dropUndefinedKeys()#15781
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
a96e979

ref: Remove some usages of `dropUndefinedKeys()`


mydea Mar 21, 2025
13a0d88

drop one more


mydea Mar 21, 2025

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


54 changes: 26 additions & 28 deletions
packages/astro/src/integration/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ import * as path from 'path';
import { sentryVitePlugin } from '@sentry/vite-plugin';
import type { AstroConfig, AstroIntegration } from 'astro';

import { consoleSandbox, dropUndefinedKeys } from '@sentry/core';
import { consoleSandbox } from '@sentry/core';
import { buildClientSnippet, buildSdkInitFileImportSnippet, buildServerSnippet } from './snippets';
import type { SentryOptions } from './types';

Expand DownExpand Up@@ -62,34 +62,32 @@ export const sentryAstro = (options: SentryOptions = {}): AstroIntegration => {
 sourcemap: computedSourceMapSettings.updatedSourceMapSetting,
 },
 plugins: [
 sentryVitePlugin(
 dropUndefinedKeys({
 org: uploadOptions.org ?? env.SENTRY_ORG,
 project: uploadOptions.project ?? env.SENTRY_PROJECT,
 authToken: uploadOptions.authToken ?? env.SENTRY_AUTH_TOKEN,
 telemetry: uploadOptions.telemetry ?? true,
 _metaOptions: {
 telemetry: {
 metaFramework: 'astro',
 },
 sentryVitePlugin({
 org: uploadOptions.org ?? env.SENTRY_ORG,
 project: uploadOptions.project ?? env.SENTRY_PROJECT,
 authToken: uploadOptions.authToken ?? env.SENTRY_AUTH_TOKEN,
 telemetry: uploadOptions.telemetry ?? true,
 _metaOptions: {
 telemetry: {
 metaFramework: 'astro',
 },
 ...unstable_sentryVitePluginOptions,
 debug: options.debug ?? false,
 sourcemaps: {
 assets: uploadOptions.assets ?? [getSourcemapsAssetsGlob(config)],
 filesToDeleteAfterUpload:
 uploadOptions?.filesToDeleteAfterUpload ?? updatedFilesToDeleteAfterUpload,
...unstable_sentryVitePluginOptions?.sourcemaps,
},
 bundleSizeOptimizations: {
 ...options.bundleSizeOptimizations,
 // TODO: with a future version of the vite plugin (probably 2.22.0) this re-mapping is not needed anymore
// ref: https://github.com/getsentry/sentry-javascript-bundler-plugins/pull/582
 excludePerformanceMonitoring: options.bundleSizeOptimizations?.excludeTracing,
 ...unstable_sentryVitePluginOptions?.bundleSizeOptimizations,
},
 }),
 ),
},
...unstable_sentryVitePluginOptions,
debug: options.debug ?? false,
sourcemaps: {
assets: uploadOptions.assets ?? [getSourcemapsAssetsGlob(config)],
 filesToDeleteAfterUpload:
uploadOptions?.filesToDeleteAfterUpload ?? updatedFilesToDeleteAfterUpload,
...unstable_sentryVitePluginOptions?.sourcemaps,
},
 bundleSizeOptimizations: {
...options.bundleSizeOptimizations,
 // TODO: with a future version of the vite plugin (probably 2.22.0) this re-mapping is not needed anymore
// ref: https://github.com/getsentry/sentry-javascript-bundler-plugins/pull/582
excludePerformanceMonitoring: options.bundleSizeOptimizations?.excludeTracing,
...unstable_sentryVitePluginOptions?.bundleSizeOptimizations,
 },
}),
 ],
 },
 });
Expand Down

5 changes: 2 additions & 3 deletions
packages/browser-utils/src/metrics/inp.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,6 @@ import {
 SEMANTIC_ATTRIBUTE_SENTRY_OP,
 SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
 browserPerformanceTimeOrigin,
 dropUndefinedKeys,
 getActiveSpan,
 getCurrentScope,
 getRootSpan,
Expand DownExpand Up@@ -101,11 +100,11 @@ function _trackINP(): () => void {
 const routeName = spanToUse ? spanToJSON(spanToUse).description : getCurrentScope().getScopeData().transactionName;

 const name = htmlTreeAsString(entry.target);
 const attributes: SpanAttributes = dropUndefinedKeys({
 const attributes: SpanAttributes = {
@mydeamydeaMar 21, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nothing possibly undefined here!
 [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.browser.inp',
 [SEMANTIC_ATTRIBUTE_SENTRY_OP]: `ui.interaction.${interactionType}`,
 [SEMANTIC_ATTRIBUTE_EXCLUSIVE_TIME]: entry.duration,
 });
 };

 const span = startStandaloneWebVitalSpan({
 name,
Expand Down

3 changes: 1 addition & 2 deletions
packages/core/src/checkin.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,6 @@ import type {
} from './types-hoist';
import { dsnToString } from './utils-hoist/dsn';
import { createEnvelope } from './utils-hoist/envelope';
import { dropUndefinedKeys } from './utils-hoist/object';

/**
 * Create envelope from check in item.
Expand DownExpand Up@@ -36,7 +35,7 @@ export function createCheckInEnvelope(
 }

 if (dynamicSamplingContext) {
 headers.trace = dropUndefinedKeys(dynamicSamplingContext) as DynamicSamplingContext;
 headers.trace = dynamicSamplingContext as DynamicSamplingContext;
@mydeamydeaMar 21, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should not care if there is something undefined in there, I believe?
@AbhiPrasadAbhiPrasadMar 21, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it should not!
 }

 const item = createCheckInEnvelopeItem(checkIn);
Expand Down

5 changes: 2 additions & 3 deletions
packages/core/src/feedback.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
import { getClient, getCurrentScope } from './currentScopes';
import type { EventHint, FeedbackEvent, SendFeedbackParams } from './types-hoist';
import { dropUndefinedKeys } from './utils-hoist/object';

/**
 * Send user feedback to Sentry.
Expand All@@ -14,14 +13,14 @@ export function captureFeedback(

 const feedbackEvent: FeedbackEvent = {
 contexts: {
 feedback: dropUndefinedKeys({
 feedback: {
@mydeamydeaMar 21, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should not care about undefined fields
 contact_email: email,
 name,
 message,
 url,
 source,
 associated_event_id: associatedEventId,
 }),
 },
 },
 type: 'feedback',
 level: 'info',
Expand Down

6 changes: 3 additions & 3 deletions
packages/core/src/session.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import type { SerializedSession, Session, SessionContext, SessionStatus } from './types-hoist';
import { dropUndefinedKeys, timestampInSeconds, uuid4 } from './utils-hoist';
import { timestampInSeconds, uuid4 } from './utils-hoist';

/**
 * Creates a new `Session` object by setting certain default parameters. If optional @param context
Expand DownExpand Up@@ -137,7 +137,7 @@ export function closeSession(session: Session, status?: Exclude<SessionStatus, '
 * @returns a JSON object of the passed session
 */
function sessionToJSON(session: Session): SerializedSession {
 return dropUndefinedKeys({
 return {
@mydeamydeaMar 21, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is only called when we send the session, where this should be cleared out by JSON.stringify() anyhow
 sid: `${session.sid}`,
 init: session.init,
 // Make sure that sec is converted to ms for date constructor
Expand All@@ -154,5 +154,5 @@ function sessionToJSON(session: Session): SerializedSession {
 ip_address: session.ipAddress,
 user_agent: session.userAgent,
 },
 });
 };
}

2 changes: 1 addition & 1 deletion
packages/core/src/tracing/dynamicSamplingContext.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,7 @@ export function getDynamicSamplingContextFromClient(trace_id: string, client: Cl
 release: options.release,
 public_key,
 trace_id,
 }) as DynamicSamplingContext;
 }) satisfies DynamicSamplingContext;

 client.emit('createDsc', dsc);

Expand Down

6 changes: 3 additions & 3 deletions
packages/replay-internal/src/coreHandlers/util/networkUtils.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { serializeFormData } from '@sentry-internal/browser-utils';
import type { NetworkMetaWarning } from '@sentry-internal/browser-utils';
import { dropUndefinedKeys, stringMatchesSomePattern } from '@sentry/core';
import { stringMatchesSomePattern } from '@sentry/core';

import { NETWORK_BODY_MAX_SIZE, WINDOW } from '../../constants';
import type {
Expand DownExpand Up@@ -98,12 +98,12 @@ export function makeNetworkReplayBreadcrumb(
 start: startTimestamp / 1000,
 end: endTimestamp / 1000,
 name: url,
 data: dropUndefinedKeys({
 data: {
@mydeamydeaMar 21, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should be fine to contain undefined
 method,
 statusCode,
 request,
 response,
 }),
 },
 };

 return result;
Expand Down

6 changes: 3 additions & 3 deletions
packages/sveltekit/src/client/browserTracingIntegration.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { navigating, page } from '$app/stores';
import type { Client, Integration, Span } from '@sentry/core';
import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, dropUndefinedKeys } from '@sentry/core';
import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '@sentry/core';
import {
 WINDOW,
 browserTracingIntegration as originalBrowserTracingIntegration,
Expand DownExpand Up@@ -113,15 +113,15 @@ function _instrumentNavigations(client: Client): void {
 routingSpan.end();
 }

 const navigationInfo = dropUndefinedKeys({
 const navigationInfo = {
@mydeamydeaMar 21, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

attributes can be undefined, that should not change anything.
 // `navigation.type` denotes the origin of the navigation. e.g.:
 // - link (clicking on a link)
 // - goto (programmatic via goto() or redirect())
 // - popstate (back/forward navigation)
 'sentry.sveltekit.navigation.type': navigation.type,
 'sentry.sveltekit.navigation.from': parameterizedRouteOrigin || undefined,
 'sentry.sveltekit.navigation.to': parameterizedRouteDestination || undefined,
 });
 };

 startBrowserTracingNavigationSpan(client, {
 name: parameterizedRouteDestination || rawRouteDestination || 'unknown',
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
ref: Remove some usages of `dropUndefinedKeys()` by mydea · Pull Request #15781 · getsentry/sentry-javascript · GitHub
Skip to content
ref: Remove some usages of dropUndefinedKeys()#15781

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

mydea
merged 2 commits into

from

Mar 24, 2025
 Merged


ref: Remove some usages of dropUndefinedKeys()#15781
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
a96e979

ref: Remove some usages of `dropUndefinedKeys()`


mydea Mar 21, 2025
13a0d88

drop one more


mydea Mar 21, 2025

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


54 changes: 26 additions & 28 deletions
packages/astro/src/integration/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ import * as path from 'path';
import { sentryVitePlugin } from '@sentry/vite-plugin';
import type { AstroConfig, AstroIntegration } from 'astro';

import { consoleSandbox, dropUndefinedKeys } from '@sentry/core';
import { consoleSandbox } from '@sentry/core';
import { buildClientSnippet, buildSdkInitFileImportSnippet, buildServerSnippet } from './snippets';
import type { SentryOptions } from './types';

Expand DownExpand Up@@ -62,34 +62,32 @@ export const sentryAstro = (options: SentryOptions = {}): AstroIntegration => {
 sourcemap: computedSourceMapSettings.updatedSourceMapSetting,
 },
 plugins: [
 sentryVitePlugin(
 dropUndefinedKeys({
 org: uploadOptions.org ?? env.SENTRY_ORG,
 project: uploadOptions.project ?? env.SENTRY_PROJECT,
 authToken: uploadOptions.authToken ?? env.SENTRY_AUTH_TOKEN,
 telemetry: uploadOptions.telemetry ?? true,
 _metaOptions: {
 telemetry: {
 metaFramework: 'astro',
 },
 sentryVitePlugin({
 org: uploadOptions.org ?? env.SENTRY_ORG,
 project: uploadOptions.project ?? env.SENTRY_PROJECT,
 authToken: uploadOptions.authToken ?? env.SENTRY_AUTH_TOKEN,
 telemetry: uploadOptions.telemetry ?? true,
 _metaOptions: {
 telemetry: {
 metaFramework: 'astro',
 },
 ...unstable_sentryVitePluginOptions,
 debug: options.debug ?? false,
 sourcemaps: {
 assets: uploadOptions.assets ?? [getSourcemapsAssetsGlob(config)],
 filesToDeleteAfterUpload:
 uploadOptions?.filesToDeleteAfterUpload ?? updatedFilesToDeleteAfterUpload,
...unstable_sentryVitePluginOptions?.sourcemaps,
},
 bundleSizeOptimizations: {
 ...options.bundleSizeOptimizations,
 // TODO: with a future version of the vite plugin (probably 2.22.0) this re-mapping is not needed anymore
// ref: https://github.com/getsentry/sentry-javascript-bundler-plugins/pull/582
 excludePerformanceMonitoring: options.bundleSizeOptimizations?.excludeTracing,
 ...unstable_sentryVitePluginOptions?.bundleSizeOptimizations,
},
 }),
 ),
},
...unstable_sentryVitePluginOptions,
debug: options.debug ?? false,
sourcemaps: {
assets: uploadOptions.assets ?? [getSourcemapsAssetsGlob(config)],
 filesToDeleteAfterUpload:
uploadOptions?.filesToDeleteAfterUpload ?? updatedFilesToDeleteAfterUpload,
...unstable_sentryVitePluginOptions?.sourcemaps,
},
 bundleSizeOptimizations: {
...options.bundleSizeOptimizations,
 // TODO: with a future version of the vite plugin (probably 2.22.0) this re-mapping is not needed anymore
// ref: https://github.com/getsentry/sentry-javascript-bundler-plugins/pull/582
excludePerformanceMonitoring: options.bundleSizeOptimizations?.excludeTracing,
...unstable_sentryVitePluginOptions?.bundleSizeOptimizations,
 },
}),
 ],
 },
 });
Expand Down

5 changes: 2 additions & 3 deletions
packages/browser-utils/src/metrics/inp.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,6 @@ import {
 SEMANTIC_ATTRIBUTE_SENTRY_OP,
 SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
 browserPerformanceTimeOrigin,
 dropUndefinedKeys,
 getActiveSpan,
 getCurrentScope,
 getRootSpan,
Expand DownExpand Up@@ -101,11 +100,11 @@ function _trackINP(): () => void {
 const routeName = spanToUse ? spanToJSON(spanToUse).description : getCurrentScope().getScopeData().transactionName;

 const name = htmlTreeAsString(entry.target);
 const attributes: SpanAttributes = dropUndefinedKeys({
 const attributes: SpanAttributes = {
@mydeamydeaMar 21, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nothing possibly undefined here!
 [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.browser.inp',
 [SEMANTIC_ATTRIBUTE_SENTRY_OP]: `ui.interaction.${interactionType}`,
 [SEMANTIC_ATTRIBUTE_EXCLUSIVE_TIME]: entry.duration,
 });
 };

 const span = startStandaloneWebVitalSpan({
 name,
Expand Down

3 changes: 1 addition & 2 deletions
packages/core/src/checkin.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,6 @@ import type {
} from './types-hoist';
import { dsnToString } from './utils-hoist/dsn';
import { createEnvelope } from './utils-hoist/envelope';
import { dropUndefinedKeys } from './utils-hoist/object';

/**
 * Create envelope from check in item.
Expand DownExpand Up@@ -36,7 +35,7 @@ export function createCheckInEnvelope(
 }

 if (dynamicSamplingContext) {
 headers.trace = dropUndefinedKeys(dynamicSamplingContext) as DynamicSamplingContext;
 headers.trace = dynamicSamplingContext as DynamicSamplingContext;
@mydeamydeaMar 21, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should not care if there is something undefined in there, I believe?
@AbhiPrasadAbhiPrasadMar 21, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it should not!
 }

 const item = createCheckInEnvelopeItem(checkIn);
Expand Down

5 changes: 2 additions & 3 deletions
packages/core/src/feedback.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
import { getClient, getCurrentScope } from './currentScopes';
import type { EventHint, FeedbackEvent, SendFeedbackParams } from './types-hoist';
import { dropUndefinedKeys } from './utils-hoist/object';

/**
 * Send user feedback to Sentry.
Expand All@@ -14,14 +13,14 @@ export function captureFeedback(

 const feedbackEvent: FeedbackEvent = {
 contexts: {
 feedback: dropUndefinedKeys({
 feedback: {
@mydeamydeaMar 21, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should not care about undefined fields
 contact_email: email,
 name,
 message,
 url,
 source,
 associated_event_id: associatedEventId,
 }),
 },
 },
 type: 'feedback',
 level: 'info',
Expand Down

6 changes: 3 additions & 3 deletions
packages/core/src/session.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import type { SerializedSession, Session, SessionContext, SessionStatus } from './types-hoist';
import { dropUndefinedKeys, timestampInSeconds, uuid4 } from './utils-hoist';
import { timestampInSeconds, uuid4 } from './utils-hoist';

/**
 * Creates a new `Session` object by setting certain default parameters. If optional @param context
Expand DownExpand Up@@ -137,7 +137,7 @@ export function closeSession(session: Session, status?: Exclude<SessionStatus, '
 * @returns a JSON object of the passed session
 */
function sessionToJSON(session: Session): SerializedSession {
 return dropUndefinedKeys({
 return {
@mydeamydeaMar 21, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is only called when we send the session, where this should be cleared out by JSON.stringify() anyhow
 sid: `${session.sid}`,
 init: session.init,
 // Make sure that sec is converted to ms for date constructor
Expand All@@ -154,5 +154,5 @@ function sessionToJSON(session: Session): SerializedSession {
 ip_address: session.ipAddress,
 user_agent: session.userAgent,
 },
 });
 };
}

2 changes: 1 addition & 1 deletion
packages/core/src/tracing/dynamicSamplingContext.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,7 @@ export function getDynamicSamplingContextFromClient(trace_id: string, client: Cl
 release: options.release,
 public_key,
 trace_id,
 }) as DynamicSamplingContext;
 }) satisfies DynamicSamplingContext;

 client.emit('createDsc', dsc);

Expand Down

6 changes: 3 additions & 3 deletions
packages/replay-internal/src/coreHandlers/util/networkUtils.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { serializeFormData } from '@sentry-internal/browser-utils';
import type { NetworkMetaWarning } from '@sentry-internal/browser-utils';
import { dropUndefinedKeys, stringMatchesSomePattern } from '@sentry/core';
import { stringMatchesSomePattern } from '@sentry/core';

import { NETWORK_BODY_MAX_SIZE, WINDOW } from '../../constants';
import type {
Expand DownExpand Up@@ -98,12 +98,12 @@ export function makeNetworkReplayBreadcrumb(
 start: startTimestamp / 1000,
 end: endTimestamp / 1000,
 name: url,
 data: dropUndefinedKeys({
 data: {
@mydeamydeaMar 21, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should be fine to contain undefined
 method,
 statusCode,
 request,
 response,
 }),
 },
 };

 return result;
Expand Down

6 changes: 3 additions & 3 deletions
packages/sveltekit/src/client/browserTracingIntegration.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { navigating, page } from '$app/stores';
import type { Client, Integration, Span } from '@sentry/core';
import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, dropUndefinedKeys } from '@sentry/core';
import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '@sentry/core';
import {
 WINDOW,
 browserTracingIntegration as originalBrowserTracingIntegration,
Expand DownExpand Up@@ -113,15 +113,15 @@ function _instrumentNavigations(client: Client): void {
 routingSpan.end();
 }

 const navigationInfo = dropUndefinedKeys({
 const navigationInfo = {
@mydeamydeaMar 21, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

attributes can be undefined, that should not change anything.
 // `navigation.type` denotes the origin of the navigation. e.g.:
 // - link (clicking on a link)
 // - goto (programmatic via goto() or redirect())
 // - popstate (back/forward navigation)
 'sentry.sveltekit.navigation.type': navigation.type,
 'sentry.sveltekit.navigation.from': parameterizedRouteOrigin || undefined,
 'sentry.sveltekit.navigation.to': parameterizedRouteDestination || undefined,
 });
 };

 startBrowserTracingNavigationSpan(client, {
 name: parameterizedRouteDestination || rawRouteDestination || 'unknown',
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
ref: Remove some usages of `dropUndefinedKeys()` by mydea · Pull Request #15781 · getsentry/sentry-javascript · GitHub
Skip to content
ref: Remove some usages of dropUndefinedKeys()#15781

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

mydea
merged 2 commits into

from

Mar 24, 2025
 Merged


ref: Remove some usages of dropUndefinedKeys()#15781
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
a96e979

ref: Remove some usages of `dropUndefinedKeys()`


mydea Mar 21, 2025
13a0d88

drop one more


mydea Mar 21, 2025

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


54 changes: 26 additions & 28 deletions
packages/astro/src/integration/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ import * as path from 'path';
import { sentryVitePlugin } from '@sentry/vite-plugin';
import type { AstroConfig, AstroIntegration } from 'astro';

import { consoleSandbox, dropUndefinedKeys } from '@sentry/core';
import { consoleSandbox } from '@sentry/core';
import { buildClientSnippet, buildSdkInitFileImportSnippet, buildServerSnippet } from './snippets';
import type { SentryOptions } from './types';

Expand DownExpand Up@@ -62,34 +62,32 @@ export const sentryAstro = (options: SentryOptions = {}): AstroIntegration => {
 sourcemap: computedSourceMapSettings.updatedSourceMapSetting,
 },
 plugins: [
 sentryVitePlugin(
 dropUndefinedKeys({
 org: uploadOptions.org ?? env.SENTRY_ORG,
 project: uploadOptions.project ?? env.SENTRY_PROJECT,
 authToken: uploadOptions.authToken ?? env.SENTRY_AUTH_TOKEN,
 telemetry: uploadOptions.telemetry ?? true,
 _metaOptions: {
 telemetry: {
 metaFramework: 'astro',
 },
 sentryVitePlugin({
 org: uploadOptions.org ?? env.SENTRY_ORG,
 project: uploadOptions.project ?? env.SENTRY_PROJECT,
 authToken: uploadOptions.authToken ?? env.SENTRY_AUTH_TOKEN,
 telemetry: uploadOptions.telemetry ?? true,
 _metaOptions: {
 telemetry: {
 metaFramework: 'astro',
 },
 ...unstable_sentryVitePluginOptions,
 debug: options.debug ?? false,
 sourcemaps: {
 assets: uploadOptions.assets ?? [getSourcemapsAssetsGlob(config)],
 filesToDeleteAfterUpload:
 uploadOptions?.filesToDeleteAfterUpload ?? updatedFilesToDeleteAfterUpload,
...unstable_sentryVitePluginOptions?.sourcemaps,
},
 bundleSizeOptimizations: {
 ...options.bundleSizeOptimizations,
 // TODO: with a future version of the vite plugin (probably 2.22.0) this re-mapping is not needed anymore
// ref: https://github.com/getsentry/sentry-javascript-bundler-plugins/pull/582
 excludePerformanceMonitoring: options.bundleSizeOptimizations?.excludeTracing,
 ...unstable_sentryVitePluginOptions?.bundleSizeOptimizations,
},
 }),
 ),
},
...unstable_sentryVitePluginOptions,
debug: options.debug ?? false,
sourcemaps: {
assets: uploadOptions.assets ?? [getSourcemapsAssetsGlob(config)],
 filesToDeleteAfterUpload:
uploadOptions?.filesToDeleteAfterUpload ?? updatedFilesToDeleteAfterUpload,
...unstable_sentryVitePluginOptions?.sourcemaps,
},
 bundleSizeOptimizations: {
...options.bundleSizeOptimizations,
 // TODO: with a future version of the vite plugin (probably 2.22.0) this re-mapping is not needed anymore
// ref: https://github.com/getsentry/sentry-javascript-bundler-plugins/pull/582
excludePerformanceMonitoring: options.bundleSizeOptimizations?.excludeTracing,
...unstable_sentryVitePluginOptions?.bundleSizeOptimizations,
 },
}),
 ],
 },
 });
Expand Down

5 changes: 2 additions & 3 deletions
packages/browser-utils/src/metrics/inp.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,6 @@ import {
 SEMANTIC_ATTRIBUTE_SENTRY_OP,
 SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
 browserPerformanceTimeOrigin,
 dropUndefinedKeys,
 getActiveSpan,
 getCurrentScope,
 getRootSpan,
Expand DownExpand Up@@ -101,11 +100,11 @@ function _trackINP(): () => void {
 const routeName = spanToUse ? spanToJSON(spanToUse).description : getCurrentScope().getScopeData().transactionName;

 const name = htmlTreeAsString(entry.target);
 const attributes: SpanAttributes = dropUndefinedKeys({
 const attributes: SpanAttributes = {
@mydeamydeaMar 21, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nothing possibly undefined here!
 [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.browser.inp',
 [SEMANTIC_ATTRIBUTE_SENTRY_OP]: `ui.interaction.${interactionType}`,
 [SEMANTIC_ATTRIBUTE_EXCLUSIVE_TIME]: entry.duration,
 });
 };

 const span = startStandaloneWebVitalSpan({
 name,
Expand Down

3 changes: 1 addition & 2 deletions
packages/core/src/checkin.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,6 @@ import type {
} from './types-hoist';
import { dsnToString } from './utils-hoist/dsn';
import { createEnvelope } from './utils-hoist/envelope';
import { dropUndefinedKeys } from './utils-hoist/object';

/**
 * Create envelope from check in item.
Expand DownExpand Up@@ -36,7 +35,7 @@ export function createCheckInEnvelope(
 }

 if (dynamicSamplingContext) {
 headers.trace = dropUndefinedKeys(dynamicSamplingContext) as DynamicSamplingContext;
 headers.trace = dynamicSamplingContext as DynamicSamplingContext;
@mydeamydeaMar 21, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should not care if there is something undefined in there, I believe?
@AbhiPrasadAbhiPrasadMar 21, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it should not!
 }

 const item = createCheckInEnvelopeItem(checkIn);
Expand Down

5 changes: 2 additions & 3 deletions
packages/core/src/feedback.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
import { getClient, getCurrentScope } from './currentScopes';
import type { EventHint, FeedbackEvent, SendFeedbackParams } from './types-hoist';
import { dropUndefinedKeys } from './utils-hoist/object';

/**
 * Send user feedback to Sentry.
Expand All@@ -14,14 +13,14 @@ export function captureFeedback(

 const feedbackEvent: FeedbackEvent = {
 contexts: {
 feedback: dropUndefinedKeys({
 feedback: {
@mydeamydeaMar 21, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should not care about undefined fields
 contact_email: email,
 name,
 message,
 url,
 source,
 associated_event_id: associatedEventId,
 }),
 },
 },
 type: 'feedback',
 level: 'info',
Expand Down

6 changes: 3 additions & 3 deletions
packages/core/src/session.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import type { SerializedSession, Session, SessionContext, SessionStatus } from './types-hoist';
import { dropUndefinedKeys, timestampInSeconds, uuid4 } from './utils-hoist';
import { timestampInSeconds, uuid4 } from './utils-hoist';

/**
 * Creates a new `Session` object by setting certain default parameters. If optional @param context
Expand DownExpand Up@@ -137,7 +137,7 @@ export function closeSession(session: Session, status?: Exclude<SessionStatus, '
 * @returns a JSON object of the passed session
 */
function sessionToJSON(session: Session): SerializedSession {
 return dropUndefinedKeys({
 return {
@mydeamydeaMar 21, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is only called when we send the session, where this should be cleared out by JSON.stringify() anyhow
 sid: `${session.sid}`,
 init: session.init,
 // Make sure that sec is converted to ms for date constructor
Expand All@@ -154,5 +154,5 @@ function sessionToJSON(session: Session): SerializedSession {
 ip_address: session.ipAddress,
 user_agent: session.userAgent,
 },
 });
 };
}

2 changes: 1 addition & 1 deletion
packages/core/src/tracing/dynamicSamplingContext.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,7 @@ export function getDynamicSamplingContextFromClient(trace_id: string, client: Cl
 release: options.release,
 public_key,
 trace_id,
 }) as DynamicSamplingContext;
 }) satisfies DynamicSamplingContext;

 client.emit('createDsc', dsc);

Expand Down

6 changes: 3 additions & 3 deletions
packages/replay-internal/src/coreHandlers/util/networkUtils.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { serializeFormData } from '@sentry-internal/browser-utils';
import type { NetworkMetaWarning } from '@sentry-internal/browser-utils';
import { dropUndefinedKeys, stringMatchesSomePattern } from '@sentry/core';
import { stringMatchesSomePattern } from '@sentry/core';

import { NETWORK_BODY_MAX_SIZE, WINDOW } from '../../constants';
import type {
Expand DownExpand Up@@ -98,12 +98,12 @@ export function makeNetworkReplayBreadcrumb(
 start: startTimestamp / 1000,
 end: endTimestamp / 1000,
 name: url,
 data: dropUndefinedKeys({
 data: {
@mydeamydeaMar 21, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should be fine to contain undefined
 method,
 statusCode,
 request,
 response,
 }),
 },
 };

 return result;
Expand Down

6 changes: 3 additions & 3 deletions
packages/sveltekit/src/client/browserTracingIntegration.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { navigating, page } from '$app/stores';
import type { Client, Integration, Span } from '@sentry/core';
import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, dropUndefinedKeys } from '@sentry/core';
import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '@sentry/core';
import {
 WINDOW,
 browserTracingIntegration as originalBrowserTracingIntegration,
Expand DownExpand Up@@ -113,15 +113,15 @@ function _instrumentNavigations(client: Client): void {
 routingSpan.end();
 }

 const navigationInfo = dropUndefinedKeys({
 const navigationInfo = {
@mydeamydeaMar 21, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

attributes can be undefined, that should not change anything.
 // `navigation.type` denotes the origin of the navigation. e.g.:
 // - link (clicking on a link)
 // - goto (programmatic via goto() or redirect())
 // - popstate (back/forward navigation)
 'sentry.sveltekit.navigation.type': navigation.type,
 'sentry.sveltekit.navigation.from': parameterizedRouteOrigin || undefined,
 'sentry.sveltekit.navigation.to': parameterizedRouteDestination || undefined,
 });
 };

 startBrowserTracingNavigationSpan(client, {
 name: parameterizedRouteDestination || rawRouteDestination || 'unknown',
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
ref: Remove some usages of `dropUndefinedKeys()` by mydea · Pull Request #15781 · getsentry/sentry-javascript · GitHub
Skip to content
ref: Remove some usages of dropUndefinedKeys()#15781

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

mydea
merged 2 commits into

from

Mar 24, 2025
 Merged


ref: Remove some usages of dropUndefinedKeys()#15781
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
a96e979

ref: Remove some usages of `dropUndefinedKeys()`


mydea Mar 21, 2025
13a0d88

drop one more


mydea Mar 21, 2025

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


54 changes: 26 additions & 28 deletions
packages/astro/src/integration/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ import * as path from 'path';
import { sentryVitePlugin } from '@sentry/vite-plugin';
import type { AstroConfig, AstroIntegration } from 'astro';

import { consoleSandbox, dropUndefinedKeys } from '@sentry/core';
import { consoleSandbox } from '@sentry/core';
import { buildClientSnippet, buildSdkInitFileImportSnippet, buildServerSnippet } from './snippets';
import type { SentryOptions } from './types';

Expand DownExpand Up@@ -62,34 +62,32 @@ export const sentryAstro = (options: SentryOptions = {}): AstroIntegration => {
 sourcemap: computedSourceMapSettings.updatedSourceMapSetting,
 },
 plugins: [
 sentryVitePlugin(
 dropUndefinedKeys({
 org: uploadOptions.org ?? env.SENTRY_ORG,
 project: uploadOptions.project ?? env.SENTRY_PROJECT,
 authToken: uploadOptions.authToken ?? env.SENTRY_AUTH_TOKEN,
 telemetry: uploadOptions.telemetry ?? true,
 _metaOptions: {
 telemetry: {
 metaFramework: 'astro',
 },
 sentryVitePlugin({
 org: uploadOptions.org ?? env.SENTRY_ORG,
 project: uploadOptions.project ?? env.SENTRY_PROJECT,
 authToken: uploadOptions.authToken ?? env.SENTRY_AUTH_TOKEN,
 telemetry: uploadOptions.telemetry ?? true,
 _metaOptions: {
 telemetry: {
 metaFramework: 'astro',
 },
 ...unstable_sentryVitePluginOptions,
 debug: options.debug ?? false,
 sourcemaps: {
 assets: uploadOptions.assets ?? [getSourcemapsAssetsGlob(config)],
 filesToDeleteAfterUpload:
 uploadOptions?.filesToDeleteAfterUpload ?? updatedFilesToDeleteAfterUpload,
...unstable_sentryVitePluginOptions?.sourcemaps,
},
 bundleSizeOptimizations: {
 ...options.bundleSizeOptimizations,
 // TODO: with a future version of the vite plugin (probably 2.22.0) this re-mapping is not needed anymore
// ref: https://github.com/getsentry/sentry-javascript-bundler-plugins/pull/582
 excludePerformanceMonitoring: options.bundleSizeOptimizations?.excludeTracing,
 ...unstable_sentryVitePluginOptions?.bundleSizeOptimizations,
},
 }),
 ),
},
...unstable_sentryVitePluginOptions,
debug: options.debug ?? false,
sourcemaps: {
assets: uploadOptions.assets ?? [getSourcemapsAssetsGlob(config)],
 filesToDeleteAfterUpload:
uploadOptions?.filesToDeleteAfterUpload ?? updatedFilesToDeleteAfterUpload,
...unstable_sentryVitePluginOptions?.sourcemaps,
},
 bundleSizeOptimizations: {
...options.bundleSizeOptimizations,
 // TODO: with a future version of the vite plugin (probably 2.22.0) this re-mapping is not needed anymore
// ref: https://github.com/getsentry/sentry-javascript-bundler-plugins/pull/582
excludePerformanceMonitoring: options.bundleSizeOptimizations?.excludeTracing,
...unstable_sentryVitePluginOptions?.bundleSizeOptimizations,
 },
}),
 ],
 },
 });
Expand Down

5 changes: 2 additions & 3 deletions
packages/browser-utils/src/metrics/inp.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,6 @@ import {
 SEMANTIC_ATTRIBUTE_SENTRY_OP,
 SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
 browserPerformanceTimeOrigin,
 dropUndefinedKeys,
 getActiveSpan,
 getCurrentScope,
 getRootSpan,
Expand DownExpand Up@@ -101,11 +100,11 @@ function _trackINP(): () => void {
 const routeName = spanToUse ? spanToJSON(spanToUse).description : getCurrentScope().getScopeData().transactionName;

 const name = htmlTreeAsString(entry.target);
 const attributes: SpanAttributes = dropUndefinedKeys({
 const attributes: SpanAttributes = {
@mydeamydeaMar 21, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nothing possibly undefined here!
 [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.browser.inp',
 [SEMANTIC_ATTRIBUTE_SENTRY_OP]: `ui.interaction.${interactionType}`,
 [SEMANTIC_ATTRIBUTE_EXCLUSIVE_TIME]: entry.duration,
 });
 };

 const span = startStandaloneWebVitalSpan({
 name,
Expand Down

3 changes: 1 addition & 2 deletions
packages/core/src/checkin.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,6 @@ import type {
} from './types-hoist';
import { dsnToString } from './utils-hoist/dsn';
import { createEnvelope } from './utils-hoist/envelope';
import { dropUndefinedKeys } from './utils-hoist/object';

/**
 * Create envelope from check in item.
Expand DownExpand Up@@ -36,7 +35,7 @@ export function createCheckInEnvelope(
 }

 if (dynamicSamplingContext) {
 headers.trace = dropUndefinedKeys(dynamicSamplingContext) as DynamicSamplingContext;
 headers.trace = dynamicSamplingContext as DynamicSamplingContext;
@mydeamydeaMar 21, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should not care if there is something undefined in there, I believe?
@AbhiPrasadAbhiPrasadMar 21, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it should not!
 }

 const item = createCheckInEnvelopeItem(checkIn);
Expand Down

5 changes: 2 additions & 3 deletions
packages/core/src/feedback.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
import { getClient, getCurrentScope } from './currentScopes';
import type { EventHint, FeedbackEvent, SendFeedbackParams } from './types-hoist';
import { dropUndefinedKeys } from './utils-hoist/object';

/**
 * Send user feedback to Sentry.
Expand All@@ -14,14 +13,14 @@ export function captureFeedback(

 const feedbackEvent: FeedbackEvent = {
 contexts: {
 feedback: dropUndefinedKeys({
 feedback: {
@mydeamydeaMar 21, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should not care about undefined fields
 contact_email: email,
 name,
 message,
 url,
 source,
 associated_event_id: associatedEventId,
 }),
 },
 },
 type: 'feedback',
 level: 'info',
Expand Down

6 changes: 3 additions & 3 deletions
packages/core/src/session.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import type { SerializedSession, Session, SessionContext, SessionStatus } from './types-hoist';
import { dropUndefinedKeys, timestampInSeconds, uuid4 } from './utils-hoist';
import { timestampInSeconds, uuid4 } from './utils-hoist';

/**
 * Creates a new `Session` object by setting certain default parameters. If optional @param context
Expand DownExpand Up@@ -137,7 +137,7 @@ export function closeSession(session: Session, status?: Exclude<SessionStatus, '
 * @returns a JSON object of the passed session
 */
function sessionToJSON(session: Session): SerializedSession {
 return dropUndefinedKeys({
 return {
@mydeamydeaMar 21, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is only called when we send the session, where this should be cleared out by JSON.stringify() anyhow
 sid: `${session.sid}`,
 init: session.init,
 // Make sure that sec is converted to ms for date constructor
Expand All@@ -154,5 +154,5 @@ function sessionToJSON(session: Session): SerializedSession {
 ip_address: session.ipAddress,
 user_agent: session.userAgent,
 },
 });
 };
}

2 changes: 1 addition & 1 deletion
packages/core/src/tracing/dynamicSamplingContext.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,7 @@ export function getDynamicSamplingContextFromClient(trace_id: string, client: Cl
 release: options.release,
 public_key,
 trace_id,
 }) as DynamicSamplingContext;
 }) satisfies DynamicSamplingContext;

 client.emit('createDsc', dsc);

Expand Down

6 changes: 3 additions & 3 deletions
packages/replay-internal/src/coreHandlers/util/networkUtils.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { serializeFormData } from '@sentry-internal/browser-utils';
import type { NetworkMetaWarning } from '@sentry-internal/browser-utils';
import { dropUndefinedKeys, stringMatchesSomePattern } from '@sentry/core';
import { stringMatchesSomePattern } from '@sentry/core';

import { NETWORK_BODY_MAX_SIZE, WINDOW } from '../../constants';
import type {
Expand DownExpand Up@@ -98,12 +98,12 @@ export function makeNetworkReplayBreadcrumb(
 start: startTimestamp / 1000,
 end: endTimestamp / 1000,
 name: url,
 data: dropUndefinedKeys({
 data: {
@mydeamydeaMar 21, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should be fine to contain undefined
 method,
 statusCode,
 request,
 response,
 }),
 },
 };

 return result;
Expand Down

6 changes: 3 additions & 3 deletions
packages/sveltekit/src/client/browserTracingIntegration.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { navigating, page } from '$app/stores';
import type { Client, Integration, Span } from '@sentry/core';
import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, dropUndefinedKeys } from '@sentry/core';
import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '@sentry/core';
import {
 WINDOW,
 browserTracingIntegration as originalBrowserTracingIntegration,
Expand DownExpand Up@@ -113,15 +113,15 @@ function _instrumentNavigations(client: Client): void {
 routingSpan.end();
 }

 const navigationInfo = dropUndefinedKeys({
 const navigationInfo = {
@mydeamydeaMar 21, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

attributes can be undefined, that should not change anything.
 // `navigation.type` denotes the origin of the navigation. e.g.:
 // - link (clicking on a link)
 // - goto (programmatic via goto() or redirect())
 // - popstate (back/forward navigation)
 'sentry.sveltekit.navigation.type': navigation.type,
 'sentry.sveltekit.navigation.from': parameterizedRouteOrigin || undefined,
 'sentry.sveltekit.navigation.to': parameterizedRouteDestination || undefined,
 });
 };

 startBrowserTracingNavigationSpan(client, {
 name: parameterizedRouteDestination || rawRouteDestination || 'unknown',
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
ref: Remove some usages of `dropUndefinedKeys()` by mydea · Pull Request #15781 · getsentry/sentry-javascript · GitHub
Skip to content
ref: Remove some usages of dropUndefinedKeys()#15781

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

mydea
merged 2 commits into

from

Mar 24, 2025
 Merged


ref: Remove some usages of dropUndefinedKeys()#15781
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
a96e979

ref: Remove some usages of `dropUndefinedKeys()`


mydea Mar 21, 2025
13a0d88

drop one more


mydea Mar 21, 2025

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


54 changes: 26 additions & 28 deletions
packages/astro/src/integration/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ import * as path from 'path';
import { sentryVitePlugin } from '@sentry/vite-plugin';
import type { AstroConfig, AstroIntegration } from 'astro';

import { consoleSandbox, dropUndefinedKeys } from '@sentry/core';
import { consoleSandbox } from '@sentry/core';
import { buildClientSnippet, buildSdkInitFileImportSnippet, buildServerSnippet } from './snippets';
import type { SentryOptions } from './types';

Expand DownExpand Up@@ -62,34 +62,32 @@ export const sentryAstro = (options: SentryOptions = {}): AstroIntegration => {
 sourcemap: computedSourceMapSettings.updatedSourceMapSetting,
 },
 plugins: [
 sentryVitePlugin(
 dropUndefinedKeys({
 org: uploadOptions.org ?? env.SENTRY_ORG,
 project: uploadOptions.project ?? env.SENTRY_PROJECT,
 authToken: uploadOptions.authToken ?? env.SENTRY_AUTH_TOKEN,
 telemetry: uploadOptions.telemetry ?? true,
 _metaOptions: {
 telemetry: {
 metaFramework: 'astro',
 },
 sentryVitePlugin({
 org: uploadOptions.org ?? env.SENTRY_ORG,
 project: uploadOptions.project ?? env.SENTRY_PROJECT,
 authToken: uploadOptions.authToken ?? env.SENTRY_AUTH_TOKEN,
 telemetry: uploadOptions.telemetry ?? true,
 _metaOptions: {
 telemetry: {
 metaFramework: 'astro',
 },
 ...unstable_sentryVitePluginOptions,
 debug: options.debug ?? false,
 sourcemaps: {
 assets: uploadOptions.assets ?? [getSourcemapsAssetsGlob(config)],
 filesToDeleteAfterUpload:
 uploadOptions?.filesToDeleteAfterUpload ?? updatedFilesToDeleteAfterUpload,
...unstable_sentryVitePluginOptions?.sourcemaps,
},
 bundleSizeOptimizations: {
 ...options.bundleSizeOptimizations,
 // TODO: with a future version of the vite plugin (probably 2.22.0) this re-mapping is not needed anymore
// ref: https://github.com/getsentry/sentry-javascript-bundler-plugins/pull/582
 excludePerformanceMonitoring: options.bundleSizeOptimizations?.excludeTracing,
 ...unstable_sentryVitePluginOptions?.bundleSizeOptimizations,
},
 }),
 ),
},
...unstable_sentryVitePluginOptions,
debug: options.debug ?? false,
sourcemaps: {
assets: uploadOptions.assets ?? [getSourcemapsAssetsGlob(config)],
 filesToDeleteAfterUpload:
uploadOptions?.filesToDeleteAfterUpload ?? updatedFilesToDeleteAfterUpload,
...unstable_sentryVitePluginOptions?.sourcemaps,
},
 bundleSizeOptimizations: {
...options.bundleSizeOptimizations,
 // TODO: with a future version of the vite plugin (probably 2.22.0) this re-mapping is not needed anymore
// ref: https://github.com/getsentry/sentry-javascript-bundler-plugins/pull/582
excludePerformanceMonitoring: options.bundleSizeOptimizations?.excludeTracing,
...unstable_sentryVitePluginOptions?.bundleSizeOptimizations,
 },
}),
 ],
 },
 });
Expand Down

5 changes: 2 additions & 3 deletions
packages/browser-utils/src/metrics/inp.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,6 @@ import {
 SEMANTIC_ATTRIBUTE_SENTRY_OP,
 SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
 browserPerformanceTimeOrigin,
 dropUndefinedKeys,
 getActiveSpan,
 getCurrentScope,
 getRootSpan,
Expand DownExpand Up@@ -101,11 +100,11 @@ function _trackINP(): () => void {
 const routeName = spanToUse ? spanToJSON(spanToUse).description : getCurrentScope().getScopeData().transactionName;

 const name = htmlTreeAsString(entry.target);
 const attributes: SpanAttributes = dropUndefinedKeys({
 const attributes: SpanAttributes = {
@mydeamydeaMar 21, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nothing possibly undefined here!
 [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.browser.inp',
 [SEMANTIC_ATTRIBUTE_SENTRY_OP]: `ui.interaction.${interactionType}`,
 [SEMANTIC_ATTRIBUTE_EXCLUSIVE_TIME]: entry.duration,
 });
 };

 const span = startStandaloneWebVitalSpan({
 name,
Expand Down

3 changes: 1 addition & 2 deletions
packages/core/src/checkin.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,6 @@ import type {
} from './types-hoist';
import { dsnToString } from './utils-hoist/dsn';
import { createEnvelope } from './utils-hoist/envelope';
import { dropUndefinedKeys } from './utils-hoist/object';

/**
 * Create envelope from check in item.
Expand DownExpand Up@@ -36,7 +35,7 @@ export function createCheckInEnvelope(
 }

 if (dynamicSamplingContext) {
 headers.trace = dropUndefinedKeys(dynamicSamplingContext) as DynamicSamplingContext;
 headers.trace = dynamicSamplingContext as DynamicSamplingContext;
@mydeamydeaMar 21, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should not care if there is something undefined in there, I believe?
@AbhiPrasadAbhiPrasadMar 21, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it should not!
 }

 const item = createCheckInEnvelopeItem(checkIn);
Expand Down

5 changes: 2 additions & 3 deletions
packages/core/src/feedback.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
import { getClient, getCurrentScope } from './currentScopes';
import type { EventHint, FeedbackEvent, SendFeedbackParams } from './types-hoist';
import { dropUndefinedKeys } from './utils-hoist/object';

/**
 * Send user feedback to Sentry.
Expand All@@ -14,14 +13,14 @@ export function captureFeedback(

 const feedbackEvent: FeedbackEvent = {
 contexts: {
 feedback: dropUndefinedKeys({
 feedback: {
@mydeamydeaMar 21, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should not care about undefined fields
 contact_email: email,
 name,
 message,
 url,
 source,
 associated_event_id: associatedEventId,
 }),
 },
 },
 type: 'feedback',
 level: 'info',
Expand Down

6 changes: 3 additions & 3 deletions
packages/core/src/session.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import type { SerializedSession, Session, SessionContext, SessionStatus } from './types-hoist';
import { dropUndefinedKeys, timestampInSeconds, uuid4 } from './utils-hoist';
import { timestampInSeconds, uuid4 } from './utils-hoist';

/**
 * Creates a new `Session` object by setting certain default parameters. If optional @param context
Expand DownExpand Up@@ -137,7 +137,7 @@ export function closeSession(session: Session, status?: Exclude<SessionStatus, '
 * @returns a JSON object of the passed session
 */
function sessionToJSON(session: Session): SerializedSession {
 return dropUndefinedKeys({
 return {
@mydeamydeaMar 21, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is only called when we send the session, where this should be cleared out by JSON.stringify() anyhow
 sid: `${session.sid}`,
 init: session.init,
 // Make sure that sec is converted to ms for date constructor
Expand All@@ -154,5 +154,5 @@ function sessionToJSON(session: Session): SerializedSession {
 ip_address: session.ipAddress,
 user_agent: session.userAgent,
 },
 });
 };
}

2 changes: 1 addition & 1 deletion
packages/core/src/tracing/dynamicSamplingContext.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,7 @@ export function getDynamicSamplingContextFromClient(trace_id: string, client: Cl
 release: options.release,
 public_key,
 trace_id,
 }) as DynamicSamplingContext;
 }) satisfies DynamicSamplingContext;

 client.emit('createDsc', dsc);

Expand Down

6 changes: 3 additions & 3 deletions
packages/replay-internal/src/coreHandlers/util/networkUtils.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { serializeFormData } from '@sentry-internal/browser-utils';
import type { NetworkMetaWarning } from '@sentry-internal/browser-utils';
import { dropUndefinedKeys, stringMatchesSomePattern } from '@sentry/core';
import { stringMatchesSomePattern } from '@sentry/core';

import { NETWORK_BODY_MAX_SIZE, WINDOW } from '../../constants';
import type {
Expand DownExpand Up@@ -98,12 +98,12 @@ export function makeNetworkReplayBreadcrumb(
 start: startTimestamp / 1000,
 end: endTimestamp / 1000,
 name: url,
 data: dropUndefinedKeys({
 data: {
@mydeamydeaMar 21, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should be fine to contain undefined
 method,
 statusCode,
 request,
 response,
 }),
 },
 };

 return result;
Expand Down

6 changes: 3 additions & 3 deletions
packages/sveltekit/src/client/browserTracingIntegration.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { navigating, page } from '$app/stores';
import type { Client, Integration, Span } from '@sentry/core';
import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, dropUndefinedKeys } from '@sentry/core';
import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '@sentry/core';
import {
 WINDOW,
 browserTracingIntegration as originalBrowserTracingIntegration,
Expand DownExpand Up@@ -113,15 +113,15 @@ function _instrumentNavigations(client: Client): void {
 routingSpan.end();
 }

 const navigationInfo = dropUndefinedKeys({
 const navigationInfo = {
@mydeamydeaMar 21, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

attributes can be undefined, that should not change anything.
 // `navigation.type` denotes the origin of the navigation. e.g.:
 // - link (clicking on a link)
 // - goto (programmatic via goto() or redirect())
 // - popstate (back/forward navigation)
 'sentry.sveltekit.navigation.type': navigation.type,
 'sentry.sveltekit.navigation.from': parameterizedRouteOrigin || undefined,
 'sentry.sveltekit.navigation.to': parameterizedRouteDestination || undefined,
 });
 };

 startBrowserTracingNavigationSpan(client, {
 name: parameterizedRouteDestination || rawRouteDestination || 'unknown',
Expand Down