Merge branch 'develop' into ci-yarn-deduplicate

Author: nwalters512

dev-packages/e2e-tests/test-applications/sveltekit-2-svelte-5/tests/performance.client.test.ts

@@ -109,30 +109,6 @@ test.describe('client-specific performance events', () => {
           op: 'ui.svelte.init',
           origin: 'auto.ui.svelte',
         }),
-        expect.objectContaining({
-          data: { 'sentry.op': 'ui.svelte.update', 'sentry.origin': 'auto.ui.svelte' },
-          description: '<components/+page>',
-          op: 'ui.svelte.update',
-          origin: 'auto.ui.svelte',
-        }),
-        expect.objectContaining({
-          data: { 'sentry.op': 'ui.svelte.update', 'sentry.origin': 'auto.ui.svelte' },
-          description: '<Component1>',
-          op: 'ui.svelte.update',
-          origin: 'auto.ui.svelte',
-        }),
-        expect.objectContaining({
-          data: { 'sentry.op': 'ui.svelte.update', 'sentry.origin': 'auto.ui.svelte' },
-          description: '<Component2>',
-          op: 'ui.svelte.update',
-          origin: 'auto.ui.svelte',
-        }),
-        expect.objectContaining({
-          data: { 'sentry.op': 'ui.svelte.update', 'sentry.origin': 'auto.ui.svelte' },
-          description: '<Component3>',
-          op: 'ui.svelte.update',
-          origin: 'auto.ui.svelte',
-        }),
       ]),
     );
   });

dev-packages/e2e-tests/test-applications/sveltekit-2/src/routes/components/+page.svelte

@@ -5,7 +5,7 @@
   import Component2 from "./Component2.svelte";
   import Component3 from "./Component3.svelte";
 
-  Sentry.trackComponent({componentName: 'components/+page'})
+  Sentry.trackComponent({componentName: 'components/+page', trackUpdates: true})
 
 </script>
 <h2>Demonstrating Component Tracking</h2>

dev-packages/e2e-tests/test-applications/sveltekit-2/src/routes/components/Component1.svelte

@@ -2,7 +2,7 @@
   import Component2 from "./Component2.svelte";
   import {trackComponent} from '@sentry/sveltekit';
 
-  trackComponent({componentName: 'Component1'});
+  trackComponent({componentName: 'Component1', trackUpdates: true});
 
 </script>
 <h3>Howdy, I'm component 1</h3>

dev-packages/e2e-tests/test-applications/sveltekit-2/src/routes/components/Component2.svelte

@@ -2,7 +2,7 @@
   import Component3 from "./Component3.svelte";
   import {trackComponent} from '@sentry/sveltekit';
 
-  trackComponent({componentName: 'Component2'});
+  trackComponent({componentName: 'Component2', trackUpdates: true});
 </script>
 <h3>Howdy, I'm component 2</h3>
 

dev-packages/e2e-tests/test-applications/sveltekit-2/src/routes/components/Component3.svelte

@@ -1,6 +1,6 @@
 <script lang="ts">
   import * as Sentry from '@sentry/sveltekit';
-  Sentry.trackComponent({componentName: 'Component3'});
+  Sentry.trackComponent({componentName: 'Component3', trackUpdates: true});
 </script>
 
 <h3>Howdy, I'm component 3</h3>

dev-packages/node-integration-tests/suites/tracing/sample-rate-propagation/tracesSampler/server.js

@@ -4,12 +4,8 @@ const Sentry = require('@sentry/node');
 Sentry.init({
   dsn: 'https://[email protected]/1337',
   transport: loggingTransport,
-  tracesSampler: ({ parentSampleRate }) => {
-    if (parentSampleRate) {
-      return parentSampleRate;
-    }
-
-    return 0.69;
+  tracesSampler: ({ inheritOrSampleWith }) => {
+    return inheritOrSampleWith(0.69);
   },
 });
 

dev-packages/node-integration-tests/suites/tracing/sample-rate-propagation/tracesSampler/test.ts

@@ -11,7 +11,7 @@ describe('parentSampleRate propagation with tracesSampler', () => {
     expect((response as any).propagatedData.baggage).toMatch(/sentry-sample_rate=0\.69/);
   });
 
-  test('should propagate sample_rate equivalent to sample rate returned by tracesSampler when there is no incoming sample rate', async () => {
+  test('should propagate sample_rate equivalent to sample rate returned by tracesSampler when there is no incoming sample rate (1 -> because there is a positive sampling decision and inheritOrSampleWith was used)', async () => {
     const runner = createRunner(__dirname, 'server.js').start();
     const response = await runner.makeRequest('get', '/check', {
       headers: {
@@ -20,6 +20,30 @@ describe('parentSampleRate propagation with tracesSampler', () => {
       },
     });
 
+    expect((response as any).propagatedData.baggage).toMatch(/sentry-sample_rate=1/);
+  });
+
+  test('should propagate sample_rate equivalent to sample rate returned by tracesSampler when there is no incoming sample rate (0 -> because there is a negative sampling decision and inheritOrSampleWith was used)', async () => {
+    const runner = createRunner(__dirname, 'server.js').start();
+    const response = await runner.makeRequest('get', '/check', {
+      headers: {
+        'sentry-trace': '530699e319cc067ce440315d74acb312-414dc2a08d5d1dac-0',
+        baggage: '',
+      },
+    });
+
+    expect((response as any).propagatedData.baggage).toMatch(/sentry-sample_rate=0/);
+  });
+
+  test('should propagate sample_rate equivalent to sample rate returned by tracesSampler when there is no incoming sample rate (the fallback value -> because there is no sampling decision and inheritOrSampleWith was used)', async () => {
+    const runner = createRunner(__dirname, 'server.js').start();
+    const response = await runner.makeRequest('get', '/check', {
+      headers: {
+        'sentry-trace': '530699e319cc067ce440315d74acb312-414dc2a08d5d1dac',
+        baggage: '',
+      },
+    });
+
     expect((response as any).propagatedData.baggage).toMatch(/sentry-sample_rate=0\.69/);
   });
 

packages/browser/src/client.ts

@@ -9,7 +9,13 @@ import type {
   Scope,
   SeverityLevel,
 } from '@sentry/core';
-import { Client, applySdkMetadata, getSDKSource } from '@sentry/core';
+import {
+  Client,
+  addAutoIpAddressToSession,
+  addAutoIpAddressToUser,
+  applySdkMetadata,
+  getSDKSource,
+} from '@sentry/core';
 import { eventFromException, eventFromMessage } from './eventbuilder';
 import { WINDOW } from './helpers';
 import type { BrowserTransportOptions } from './transports/types';
@@ -84,29 +90,8 @@ export class BrowserClient extends Client<BrowserClientOptions> {
     }
 
     if (this._options.sendDefaultPii) {
-      this.on('postprocessEvent', event => {
-        if (event.user?.ip_address === undefined) {
-          event.user = {
-            ...event.user,
-            ip_address: '{{auto}}',
-          };
-        }
-      });
-
-      this.on('beforeSendSession', session => {
-        if ('aggregates' in session) {
-          if (session.attrs?.['ip_address'] === undefined) {
-            session.attrs = {
-              ...session.attrs,
-              ip_address: '{{auto}}',
-            };
-          }
-        } else {
-          if (session.ipAddress === undefined) {
-            session.ipAddress = '{{auto}}';
-          }
-        }
-      });
+      this.on('postprocessEvent', addAutoIpAddressToUser);
+      this.on('beforeSendSession', addAutoIpAddressToSession);
     }
   }
 

packages/core/src/index.ts

@@ -72,6 +72,7 @@ export { hasTracingEnabled } from './utils/hasTracingEnabled';
 export { isSentryRequestUrl } from './utils/isSentryRequestUrl';
 export { handleCallbackErrors } from './utils/handleCallbackErrors';
 export { parameterize } from './utils/parameterize';
+export { addAutoIpAddressToSession, addAutoIpAddressToUser } from './utils/ipAddress';
 export {
   spanToTraceHeader,
   spanToJSON,

packages/core/src/tracing/sampling.ts

@@ -27,7 +27,24 @@ export function sampleSpan(
   // work; prefer the hook if so
   let sampleRate;
   if (typeof options.tracesSampler === 'function') {
-    sampleRate = options.tracesSampler(samplingContext);
+    sampleRate = options.tracesSampler({
+      ...samplingContext,
+      inheritOrSampleWith: fallbackSampleRate => {
+        // If we have an incoming parent sample rate, we'll just use that one.
+        // The sampling decision will be inherited because of the sample_rand that was generated when the trace reached the incoming boundaries of the SDK.
+        if (typeof samplingContext.parentSampleRate === 'number') {
+          return samplingContext.parentSampleRate;
+        }
+
+        // Fallback if parent sample rate is not on the incoming trace (e.g. if there is no baggage)
+        // This is to provide backwards compatibility if there are incoming traces from older SDKs that don't send a parent sample rate or a sample rand. In these cases we just want to force either a sampling decision on the downstream traces via the sample rate.
+        if (typeof samplingContext.parentSampled === 'boolean') {
+          return Number(samplingContext.parentSampled);
+        }
+
+        return fallbackSampleRate;
+      },
+    });
     localSampleRateWasApplied = true;
   } else if (samplingContext.parentSampled !== undefined) {
     sampleRate = samplingContext.parentSampled;