Resolve merge conflicts with master

Author: smeubank

.github/ISSUE_TEMPLATE/issue-content-01-sdks.yml

@@ -1,6 +1,7 @@
-name: "📝 SDK Documentation"
-labels: ["Type: Content", "SDKs"]
+name: '📝 SDK Documentation'
+labels: ['Type: Content', 'SDKs']
 description: Missing, incorrect, or unclear documentation of SDKs.
+type: Improvement
 body:
   - type: markdown
     attributes:

.github/ISSUE_TEMPLATE/issue-content-02-product.yml

@@ -1,6 +1,7 @@
-name: "📝 Product Documentation"
-labels: ["Type: Content", "Product"]
+name: '📝 Product Documentation'
+labels: ['Type: Content', 'Product']
 description: Missing, incorrect, or unclear documentation of product features.
+type: Improvement
 body:
   - type: markdown
     attributes:

.github/ISSUE_TEMPLATE/issue-content-03-develop.yml

@@ -1,6 +1,7 @@
-name: "📝 Documentation on develop.sentry.dev"
-labels: ["Type: Content", "Develop"]
+name: '📝 Documentation on develop.sentry.dev'
+labels: ['Type: Content', 'Develop']
 description: Missing, incorrect, or unclear developer documentation.
+type: Improvement
 body:
   - type: markdown
     attributes:
@@ -35,4 +36,3 @@ body:
       value: |-
         ## Thanks 🙏
         Check our [triage docs](https://open.sentry.io/triage/) for what to expect next.
-  

.github/ISSUE_TEMPLATE/issue-platform-404.yml

@@ -1,7 +1,7 @@
-name: "💻 Docs Platform: 🔗 404 Error"
-labels: "Type: Platform,404"
+name: '💻 Docs Platform: 🔗 404 Error'
+labels: 'Type: Platform,404'
 description: Broken links, missing pages, and other 404 errors.
-
+type: Bug
 body:
   - type: textarea
     id: url

.github/ISSUE_TEMPLATE/issue-platform-bug.yml

@@ -1,5 +1,6 @@
-name: "💻 Docs Platform: 🐞 Bug"
-labels: "Type: Platform,Bug"
+name: '💻 Docs Platform: 🐞 Bug'
+labels: 'Type: Platform'
+type: Bug
 description: Problems with the technical platform of our docs.
 body:
   - type: textarea

.github/ISSUE_TEMPLATE/issue-platform-improvement.yml

@@ -1,6 +1,7 @@
-name: "💻 Docs Platform: ✨ Improvement"
-labels: "Type: Platform,Improvement"
+name: '💻 Docs Platform: ✨ Improvement'
+labels: 'Type: Platform'
 description: Ideas on how we can improve the technical capabilities of our docs platform.
+type: Improvement
 body:
   - type: textarea
     id: problem

apps/changelog/package.json

@@ -25,7 +25,7 @@
     "@radix-ui/react-icons": "^1.3.2",
     "@radix-ui/react-toolbar": "^1.1.0",
     "@radix-ui/themes": "^3.1.3",
-    "@sentry/nextjs": "9.2.0",
+    "@sentry/nextjs": "9.3.0",
     "@spotlightjs/spotlight": "^2.1.1",
     "next": "15.1.2",
     "next-auth": "^4.24.5",

apps/changelog/vercel.json

@@ -16,7 +16,7 @@
           "value": "1; mode=block"
         },
         {
-          "key": "Content-Security-Policy-Report-Only",
+          "key": "Content-Security-Policy",
           "value": "default-src 'none'; font-src 'self'; style-src 'self' 'unsafe-inline'; script-src 'self' plausible.io 'unsafe-inline' 'unsafe-eval' 'report-sample'; img-src 'self' changelog.sentry.dev lh3.googleusercontent.com storage.googleapis.com; worker-src blob:; connect-src o1.ingest.us.sentry.io plausible.io 'self' changelog.sentry.dev sentry.io sentry.sentry.io storage.googleapis.com; report-uri https://o1.ingest.us.sentry.io/api/4507670276341760/security/?sentry_key=e90f5ea060a4102c0a4c50c740e43ae1;"
         }
       ]

develop-docs/sdk/expected-features/index.mdx

@@ -120,7 +120,7 @@ This functionality should be gated behind the `includeLocalVariables` option, wh
 
 An SDK may optionally support feature flag collection. Feature flags are collected on evaluation, stored on the scope, and submitted to Sentry on error obeying the schema specified in the <Link to="/sdk/data-model/event-payloads/contexts/#feature-flag-context">Feature Flag Context</Link> protocol documentation.
 
-If an SDK supports feature flags it must expose a function `set_flag` which has identical behavior to the `set_tag` function. It must accept a key of type string and a value which is a union of string, boolean, integer, float, and structure. An SDK may hold up to 100 evaluations. Evaluations are ordered based on their evaluation time. Typically, an LRU cache is used to store feature flags. When the capacity of the cache is exceeded the oldest flag is dropped. Any (or multiple) data structure(s) may be chosen by the SDK to store feature flags as long as the evaluation order of the flags is maintained.
+If an SDK supports feature flags it must expose a function `addFeatureFlag` which has similar behavior to the `set_tag` function. It must accept a key of type string and a value which is a union of string, boolean, integer, float, and structure. An SDK may hold up to 100 evaluations (similar to the breadcrumb implementation). Evaluations are ordered based on their evaluation time. Typically, an LRU cache is used to store feature flags. When the capacity of the cache is exceeded the oldest flag is dropped. Any (or multiple) data structure(s) may be chosen by the SDK to store feature flags as long as the evaluation order of the flags is maintained.
 
 Because flags are stored on the scope, when a scope forks the flags data structure must be cloned. Failure to clone the data structure appropriately will lead to flags leaking across thread boundaries and lead to unexpected results.
 

develop-docs/sdk/telemetry/traces/index.mdx

@@ -230,7 +230,8 @@ To improve the likelihood of capturing complete traces when backend services use
 
 The random value (`sample_rand`) is set according to the following rules:
 
-1. When tracing is enabled and a new trace is started, the SDK generates a `sample_rand` value for the current execution context. A `sample_rand` is a float (`0.1234` notation) in the range of `[0, 1)` (including 0.0, excluding 1.0).
+1. A `sample_rand` is a float (`0.123456` notation) in the range of `[0, 1)` (including 0.0, excluding 1.0), with six digits after the decimal point.
+1. When tracing is enabled and a new trace is started, the SDK generates a `sample_rand` value for the current execution context.
   1. This also applies to Tracing without Performance where we simply want to generate `sample_rand` every time a new trace is started. This `sample_rand` value can then be stored on `PropagationContext`.
 1. It is _recommended_ to generate the random number deterministically using the trace ID as seed or source of randomness (make sure to do this atomically so multiple threads accessing the same random instance don't mix their seeds). The exact method by which the random number is created is implementation-defined and may vary between SDK implementations.
 1. The `sample_rand` is part of the DSC (Dynamic Sampling Context) and as with other values on the `baggage` header, the `sample_rand` value from the current execution context should be propagated to downstream SDKs. It should also be sent to other system as part of the `baggage` header if Performance is disabled and sampling decision is deferred.