Skip to content

fix(node): contexts cannot be overridden and culture never included #5677

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
AbhiPrasad merged 1 commit into from
Sep 1, 2022
Merged

fix(node): contexts cannot be overridden and culture never included #5677

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

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions packages/node/src/integrations/context.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,15 @@ export class Context implements Integration {
this._cachedContext = this._getContexts();
}

event.contexts = { ...event.contexts, ...this._updateContext(await this._cachedContext) };
const updatedContext = this._updateContext(await this._cachedContext);

event.contexts = {
...event.contexts,
app: { ...updatedContext.app, ...event.contexts?.app },
os: { ...updatedContext.os, ...event.contexts?.os },
device: { ...updatedContext.device, ...event.contexts?.device },
culture: { ...updatedContext.culture, ...event.contexts?.culture },
};

return event;
}
Expand Down Expand Up @@ -148,7 +156,7 @@ async function getOsContext(): Promise<OsContext> {
function getCultureContext(): CultureContext | undefined {
try {
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-explicit-any
if ((process.versions as unknown as any).icu !== 'string') {
if (typeof (process.versions as unknown as any).icu !== 'string') {
// Node was built without ICU support
return;
}
Expand Down