Skip to content

Commit 951cd3d

Browse files
committed
only add settings if defined
1 parent f517664 commit 951cd3d

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

packages/core/src/envelope.ts

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,13 @@ function enhanceEventWithSdkInfo(event: Event, sdkInfo?: SdkInfo): Event {
4343
...sdkInfo,
4444
integrations: [...(event.sdk?.integrations || []), ...(sdkInfo.integrations || [])],
4545
packages: [...(event.sdk?.packages || []), ...(sdkInfo.packages || [])],
46-
settings: {
47-
...event.sdk?.settings,
48-
...sdkInfo.settings,
49-
},
46+
settings:
47+
event.sdk?.settings || sdkInfo.settings
48+
? {
49+
...event.sdk?.settings,
50+
...sdkInfo.settings,
51+
}
52+
: undefined,
5053
};
5154

5255
return event;

packages/deno/test/__snapshots__/mod.test.ts.snap

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,6 @@ snapshot[`captureException 1`] = `
122122
version: "{{version}}",
123123
},
124124
],
125-
settings: {},
126125
version: "{{version}}",
127126
},
128127
server_name: "{{server}}",
@@ -194,7 +193,6 @@ snapshot[`captureMessage 1`] = `
194193
version: "{{version}}",
195194
},
196195
],
197-
settings: {},
198196
version: "{{version}}",
199197
},
200198
server_name: "{{server}}",
@@ -273,7 +271,6 @@ snapshot[`captureMessage twice 1`] = `
273271
version: "{{version}}",
274272
},
275273
],
276-
settings: {},
277274
version: "{{version}}",
278275
},
279276
server_name: "{{server}}",
@@ -359,7 +356,6 @@ snapshot[`captureMessage twice 2`] = `
359356
version: "{{version}}",
360357
},
361358
],
362-
settings: {},
363359
version: "{{version}}",
364360
},
365361
server_name: "{{server}}",

packages/solid/test/sdk.test.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ describe('Initialize Solid SDK', () => {
2222
packages: [{ name: 'npm:@sentry/solid', version: SDK_VERSION }],
2323
version: SDK_VERSION,
2424
},
25+
settings: {
26+
infer_ip: 'never',
27+
},
2528
},
2629
};
2730

0 commit comments

Comments
 (0)