Merge branch 'master' into fix-platform-section-spacing

Author: a-hariti

develop-docs/backend/application-domains/options.mdx

@@ -69,15 +69,13 @@ If you expect to frequently update your option, you can make it editable in the
 If you're working on a system-wide feature, you may choose to use options for your rollout instead of feature flags. Unlike feature flags, options don't allow for easy segmentation, but they are performant, stable, and simple to implement. e.g.,
 
 ```python
-import random
-from sentry import options
+from sentry.options.rollout import in_random_rollout
 
-rate = options.get("performance.some-feature-rate")
-if rate > random.random():
+if in_random_rollout("performance.some-feature-rate"):
     do_feature_stuff()
 ```
 
-However, be careful! Using `random.random` will cause your feature to be enabled and disabled randomly between page requests. This may be unacceptable for user-facing features. To avoid this, you can use the `sample_modulo` helper. e.g.,
+However, be careful! `in_random_rollout` uses `random.random` under the hood, and will cause your feature to be enabled and disabled randomly between page requests. This may be unacceptable for user-facing features. To avoid this, you can use the `sample_modulo` helper. e.g.,
 
 ```python
 from sentry.utils.options import sample_modulo

docs/concepts/key-terms/tracing/span-metrics.mdx

@@ -20,22 +20,17 @@ By attaching attributes directly to spans, you create a unified view of both the
 // Simple database query with dynamic attributes
 Sentry.startSpan(
   {
-    name: 'Database Query',
-    op: 'db.query'
+    name: "Database Query",
+    op: "db.query",
   },
-  () => {
-    // Get active span to set attributes as data becomes available
-    const span = Sentry.getActiveSpan();
-    
+  (span) => {
     // Execute query and add results to span
-    const result = executeQuery('SELECT * FROM users WHERE active = true');
-    
+    const result = executeQuery("SELECT * FROM users WHERE active = true");
+
     // Set attributes with the results data
-    if (span) {
-      span.setAttribute('db.rows_returned', result.length);
-      span.setAttribute('db.execution_time_ms', result.executionTime);
-    }
-    
+    span.setAttribute("db.rows_returned", result.length);
+    span.setAttribute("db.execution_time_ms", result.executionTime);
+
     return result;
   }
 );
@@ -55,14 +50,14 @@ By integrating these attributes into tracing, you can maintain a single telemetr
 // Adding business context to a payment processing span
 Sentry.startSpan(
   {
-    name: 'Process Payment',
-    op: 'payment.process',
+    name: "Process Payment",
+    op: "payment.process",
     attributes: {
-      'payment.amount': 99.99,
-      'payment.currency': 'USD',
-      'payment.method': 'credit_card',
-      'customer.type': 'returning'
-    }
+      "payment.amount": 99.99,
+      "payment.currency": "USD",
+      "payment.method": "credit_card",
+      "customer.type": "returning",
+    },
   },
   async () => {
     // Payment processing implementation
@@ -91,12 +86,12 @@ Augment automatically-created or manually-defined spans with additional attribut
 const span = Sentry.getActiveSpan();
 if (span) {
   // User context
-  span.setAttribute('user.subscription_tier', 'premium');
-  
+  span.setAttribute("user.subscription_tier", "premium");
+
   // Multiple metrics in a single operation
   span.setAttributes({
-    'memory.heap_used': 1024000,
-    'processing.total_steps': 5
+    "memory.heap_used": 1024000,
+    "processing.total_steps": 5,
   });
 }
 ```
@@ -109,16 +104,16 @@ Create spans specifically for grouping related attributes or metrics, particular
 // Creating a span for monitoring external API usage
 Sentry.startSpan(
   {
-    name: 'Third-Party API Usage',
-    op: 'external.api',
+    name: "Third-Party API Usage",
+    op: "external.api",
     attributes: {
       // Performance metrics
-      'api.response_time_ms': 245,
-      
+      "api.response_time_ms": 245,
+
       // Context data
-      'feature.using_api': 'image_recognition',
-      'user.plan': 'enterprise'
-    }
+      "feature.using_api": "image_recognition",
+      "user.plan": "enterprise",
+    },
   },
   async () => {
     // API call implementation
@@ -138,15 +133,15 @@ Monitor client-side performance metrics related to user experience:
 // UI performance monitoring
 Sentry.startSpan(
   {
-    name: 'Page Interaction',
-    op: 'ui.interaction',
+    name: "Page Interaction",
+    op: "ui.interaction",
     attributes: {
-      'ui.first_input_delay_ms': 24,
-      'ui.time_to_interactive_ms': 320,
-      'ui.frames_dropped': 0,
-      'user.device_type': 'mobile',
-      'feature.being_used': 'image_carousel'
-    }
+      "ui.first_input_delay_ms": 24,
+      "ui.time_to_interactive_ms": 320,
+      "ui.frames_dropped": 0,
+      "user.device_type": "mobile",
+      "feature.being_used": "image_carousel",
+    },
   },
   async () => {
     // UI interaction handling
@@ -162,17 +157,17 @@ Track database performance characteristics and their impact on application behav
 // Database query monitoring
 Sentry.startSpan(
   {
-    name: 'Product Search Query',
-    op: 'db.query',
+    name: "Product Search Query",
+    op: "db.query",
     attributes: {
-      'db.query_type': 'SELECT',
-      'db.table': 'products',
-      'db.execution_time_ms': 145,
-      'db.rows_returned': 87,
-      'db.index_used': 'product_category_idx',
-      'business.search_term': 'winter jacket',
-      'business.search_filters_applied': 3
-    }
+      "db.query_type": "SELECT",
+      "db.table": "products",
+      "db.execution_time_ms": 145,
+      "db.rows_returned": 87,
+      "db.index_used": "product_category_idx",
+      "business.search_term": "winter jacket",
+      "business.search_filters_applied": 3,
+    },
   },
   async () => {
     // Database query execution
@@ -188,21 +183,21 @@ Monitor file handling operations across your application stack:
 // File processing monitoring
 Sentry.startSpan(
   {
-    name: 'Process Uploaded Image',
-    op: 'file.process',
+    name: "Process Uploaded Image",
+    op: "file.process",
     attributes: {
       // Technical metrics
-      'file.size_bytes': 2500000,
-      'file.type': 'image/jpeg',
-      
+      "file.size_bytes": 2500000,
+      "file.type": "image/jpeg",
+
       // Processing metrics
-      'processing.steps_completed': ['virus_scan', 'resize', 'compress'],
-      'processing.total_time_ms': 850,
-      
+      "processing.steps_completed": ["virus_scan", "resize", "compress"],
+      "processing.total_time_ms": 850,
+
       // Context data
-      'feature.using_upload': 'user_avatar',
-      'subscription.allows_hd': true
-    }
+      "feature.using_upload": "user_avatar",
+      "subscription.allows_hd": true,
+    },
   },
   async () => {
     // Image processing implementation
@@ -218,21 +213,21 @@ Monitor performance and reliability of third-party service interactions:
 // Payment gateway monitoring
 Sentry.startSpan(
   {
-    name: 'Payment Gateway',
-    op: 'payment.gateway',
+    name: "Payment Gateway",
+    op: "payment.gateway",
     attributes: {
       // Performance metrics
-      'gateway.response_time_ms': 980,
-      'gateway.retry_count': 0,
-      
+      "gateway.response_time_ms": 980,
+      "gateway.retry_count": 0,
+
       // Transaction data
-      'order.total_amount': 159.99,
-      'order.items_count': 3,
-      
+      "order.total_amount": 159.99,
+      "order.items_count": 3,
+
       // Service metrics
-      'gateway.fee_amount': 4.50,
-      'gateway.fee_percent': 0.029
-    }
+      "gateway.fee_amount": 4.5,
+      "gateway.fee_percent": 0.029,
+    },
   },
   async () => {
     // Payment gateway integration
@@ -255,6 +250,7 @@ Maintain consistent naming patterns following the format `category.metric_name`
 #### Data Type Selection
 
 Choose appropriate data types for your metrics:
+
 - Numeric values for measurements (`response_time_ms`: 250)
 - Boolean values for state indicators (`cache.hit`: true)
 - String values for categorical data (`user.subscription`: 'premium')
@@ -263,6 +259,7 @@ Choose appropriate data types for your metrics:
 #### Performance Considerations
 
 Be mindful of the performance impact of collecting metrics, especially for high-volume operations:
+
 - Consider implementing sampling for high-frequency operations
 - Prioritize metrics with the highest analytical value
 - Avoid redundant or closely correlated metrics
@@ -276,6 +273,7 @@ If you're currently using Sentry's standalone Metrics product, migrating to span
 - **Improved correlation**: Direct association between attributes, traces, and errors
 
 Migration process:
+
 1. Identify your current metric instrumentation points
 2. Locate corresponding spans in your application
 3. Transfer your metrics to span attributes

docs/organization/integrations/deployment/vercel/index.mdx

@@ -1,9 +1,11 @@
 ---
 title: Vercel
 sidebar_order: 1
-description: "Learn more about Sentry's Vercel integration and how you can sync release deployments and source map uploads."
+description: "Learn more about Sentry's Vercel integrations and how you can sync release deployments and source map uploads, as well as the Vercel Marketplace integration."
 ---
 
+## Releases and Source Map Integration
+
 <Alert level="warning">
 
 If you make changes to your organization slug, you'll need to update your configuration for this integration. Learn more in our [troubleshooting guide](/organization/integrations/troubleshooting).
@@ -13,7 +15,7 @@ If you make changes to your organization slug, you'll need to update your config
 Connect your Sentry and Vercel projects to automatically notify Sentry of every deployment and upload source maps for your Next.js application.
 To learn more about using Sentry in your Next.js app, check out the [Next.js SDK](/platforms/javascript/guides/nextjs/).
 
-## Install
+### Install
 
 <Alert>
 
@@ -35,11 +37,11 @@ Sentry owner, manager, or admin permissions are required to install this integra
 
    ![Sentry modal showing Vercel internal integration](./img/vercel_internal_integration.png)
 
-## Configure
+### Configure
 
 Use Vercel to [link projects](#project-linking) for uploading source maps and notifiying Sentry of release deployment.
 
-### Project Linking
+#### Project Linking
 
 1. When prompted by the installer, select a Sentry project and a Vercel project to link together.
 
@@ -56,25 +58,66 @@ Use Vercel to [link projects](#project-linking) for uploading source maps and no
 
 2. Redeploy your Vercel project in order to trigger a release.
 
-## Usage
+### Usage
 
 - If you have not already done so, [instrument your code with Sentry](/platforms/javascript/).
 - Ensure you have [installed a repository integration](/product/releases/setup/release-automation/) and added the relevant repository.
 - Add a Sentry bundler plugin to your bundler configuration ([webpack plugin](https://www.npmjs.com/package/@sentry/webpack-plugin), [Vite Plugin](https://www.npmjs.com/package/@sentry/vite-plugin), [Esbuild Plugin](https://www.npmjs.com/package/@sentry/esbuild-plugin), [Rollup Plugin](https://www.npmjs.com/package/@sentry/rollup-plugin)). If you are using Sentry's Next.js, or SvelteKit SDKs this will already have been done for you.
 - In case you already have a Vercel project integrated with Sentry, ensure the Sentry project you link is the one you're already using to report errors.
 
-## Uninstallation
+### Uninstallation
 
 1. You can uninstall the integration from Vercel or Sentry. To do so in Sentry, navigate to **Settings > Integrations > Vercel > Configurations**, click "Uninstall", and confirm.
 
 2. Delete the internal integration that was created by navigating to **Settings > Developer Settings** and clicking the trash can icon next to "Vercel Internal Integration". You will be prompted to confirm the deletion by entering a string provided in the modal. Enter the string and click "Confirm" to finalize the deletion:
 
    ![Sentry modal showing uninstalling Vercel integration](./img/vercel_delete_internal_integration.png)
 
-## Troubleshooting
+### Troubleshooting
 
-### Failed to fetch
+#### Failed to fetch
 
 ![Failed to fetch error message](./img/vercel_failed_to_fetch.png)
 
 This issue typically occurs if you have an ad blocker blocking the conversation between Vercel and Sentry during setup. To remediate the issue, disable your ad blocker and go through the installation flow again.
+
+## Vercel Marketplace
+
+The Vercel Marketplace integration allows existing Vercel users to onboard to Sentry with a one-click workflow. This setup is designed for **new Sentry users** and unifies billing within the Vercel platform. 
+
+There is no path for existing Sentry organizations to use the Vercel Marketplace integration.
+
+When you configure Sentry using the Vercel Marketplace, you'll be able to set the name of your new Sentry Organization (referred to as an "Installation" in Vercel) and projects (Resources/Products in Vercel) during the setup process. 
+
+### Billing Settings 
+
+When using the Vercel Marketplace native integration, users can modify their organizations billing information from within the Vercel platform, or within Sentry directly. Credit card settings can only be modified within Vercel. 
+
+Subscription settings can only be modified within Sentry. During setup, organizations can choose between Team or Business plans. Pay-as-you-go budgets can be set after the initial setup is completed.
+
+### User Access
+
+Vercel users will have single sign-on access to Sentry using the "Open in Sentry" button within Vercel, and will be able to create new projects in either Vercel or Sentry. 
+
+Users will still be able to login to their Sentry organization directly, without using the Vercel single-sign on, by using the login they configured during the setup process. For non social based login (Google, Github, etc.) users, Sentry will prompt for password creation.
+
+### Automatically Configured Environment Variables
+
+For every project configured, the following environment variables will be set within the Vercel deployment: 
+
+- **SENTRY_PROJECT**
+- **SENTRY_AUTH_TOKEN**
+- **NEXT_PUBLIC_SENTRY_DSN**
+- **SENTRY_ORG** 
+
+### Integration Deletion 
+
+If the integration is deleted within Vercel, the Sentry organization **will not** be deleted. The deletion will permanently remove the connection between the Vercel account and the Sentry account, and is **irreversible**. 
+
+Preserving the Sentry organization allows teams to still access historical data from within Sentry, even if they are not sending monitoring data anymore. 
+
+If the native integration is deleted, teams are still able to leverage the non-native Vercel integration described at the top of this document. Only one integration can be active at a time. 
+
+For more information, see the [Introducing the Vercel Marketplace blog post](https://vercel.com/blog/introducing-the-vercel-marketplace).
+
+

docs/organization/membership/index.mdx

@@ -118,9 +118,6 @@ Projects can only be accessed by that project's team(s). Team Admins, Org Manage
 Any Org Member can get access to a project by joining the team that's associated with that project. Once you've joined a project you'll also be able to edit [ownership rules](/product/issues/ownership-rules/) for that project.
 
 ### Adding New Members
-<Alert>
-This feature is currently only available for [Early Adopters](/organization/early-adopter-features/).
-</Alert>
 
 Users with Manager and Owner-level permissions can add, remove, and change members for a project or organization. They can also toggle on the "Let Members Invite Others" setting to allow any org member to freely invite anyone they like without needing org owner or manager approval.