fix(core): Ensure partially set SDK metadata options are preserved

Author: Lms24

packages/browser/src/client.ts

@@ -91,6 +91,8 @@ export class BrowserClient extends Client<BrowserClientOptions> {
     const sdkSource = WINDOW.SENTRY_SDK_SOURCE || getSDKSource();
     applySdkMetadata(opts, 'browser', ['browser'], sdkSource);
 
+    console.log('xx opts._metadata', opts._metadata);
+
     // Only allow IP inferral by Relay if sendDefaultPii is true
     if (opts._metadata?.sdk) {
       opts._metadata.sdk.settings = {

packages/browser/test/client.test.ts

@@ -148,7 +148,7 @@ describe('applyDefaultOptions', () => {
 
 describe('SDK metadata', () => {
   describe('sdk.settings', () => {
-    it('sets infer_ipto "never" by default', () => {
+    it('sets infer_ip to "never" by default', () => {
       const options = getDefaultBrowserClientOptions({});
       const client = new BrowserClient(options);
 
@@ -233,5 +233,30 @@ describe('SDK metadata', () => {
 
       expect(client.getOptions()._metadata?.sdk?.name).toBe('sentry.javascript.angular');
     });
+
+    it('preserves passed-in partial SDK metadata', () => {
+      const options = getDefaultBrowserClientOptions({
+        _metadata: {
+          sdk: {
+            settings: {
+              infer_ip: 'auto',
+            },
+          },
+        },
+        // Usually, this would cause infer_ip to be set to 'never'
+        // but we're passing it in explicitly, so it should be preserved
+        sendDefaultPii: false,
+      });
+      const client = new BrowserClient(options);
+
+      expect(client.getOptions()._metadata?.sdk).toEqual({
+        name: 'sentry.javascript.browser',
+        version: expect.any(String),
+        packages: [{ name: 'npm:@sentry/browser', version: expect.any(String) }],
+        settings: {
+          infer_ip: 'auto',
+        },
+      });
+    });
   });
 });

packages/core/src/utils/sdkMetadata.ts

@@ -28,5 +28,18 @@ export function applySdkMetadata(options: CoreOptions, name: string, names = [na
     };
   }
 
+  if (!metadata.sdk) {
+    metadata.sdk = {};
+  }
+
+  if (!metadata.sdk.name) {
+    metadata.sdk.name = `sentry.javascript.${name}`;
+    metadata.sdk.packages = names.map(name => ({
+      name: `${source}:@sentry/${name}`,
+      version: SDK_VERSION,
+    }));
+    metadata.sdk.version = SDK_VERSION;
+  }
+
   options._metadata = metadata;
 }