[pull] master from getsentry:master

src/apigw/proxy.py

@@ -31,6 +31,7 @@
     (["/files/dsyms/"], 90.0),
     (["/installablepreprodartifact/"], 90.0),
     (["/objectstore/"], 90.0),
+    (["/preprodartifacts/snapshots/", "/download/"], 90.0),
 ]
 
 

src/sentry/features/temporary.py

@@ -496,6 +496,8 @@ def register_temporary_features(manager: FeatureManager) -> None:
     manager.add("projects:relay-minidump-uploads", ProjectFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
     # Enables the uploading of playstation attachments to the objectstore.
     manager.add("projects:relay-playstation-uploads", ProjectFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
+    # Enables smarter measurements -> attributes conversion in Relay (see https://github.com/getsentry/relay/pull/6007)
+    manager.add("projects:relay-measurements-smart-conversion", ProjectFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
 
     # Enable lightweight RCA clustering write path (generate embeddings on new issues)
     manager.add("organizations:supergroups-lightweight-rca-clustering-write", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)

src/sentry/relay/config/__init__.py

@@ -74,6 +74,7 @@
     "projects:relay-minidump-attachment-uploads",
     "projects:relay-minidump-uploads",
     "projects:relay-playstation-uploads",
+    "projects:relay-measurements-smart-conversion",
 ]
 
 EXTRACT_METRICS_VERSION = 1

static/app/components/events/autofix/v3/artifactLoadingDetails.tsx

@@ -1,11 +1,11 @@
 import styled from '@emotion/styled';
 
 import {Flex} from '@sentry/scraps/layout';
+import {Markdown} from '@sentry/scraps/markdown';
 import {Text} from '@sentry/scraps/text';
 
 import {type AutofixSection} from 'sentry/components/events/autofix/useExplorerAutofix';
 import {ArtifactDetails} from 'sentry/components/events/autofix/v3/artifactDetails';
-import {StyledMarkedText} from 'sentry/components/events/autofix/v3/styled';
 import {LoadingIndicator} from 'sentry/components/loadingIndicator';
 import {useAutoScroll} from 'sentry/utils/useAutoScroll';
 
@@ -40,11 +40,11 @@ export function ArtifactLoadingDetails({
           }
 
           if (block.message.content && block.message.content !== 'Thinking...') {
-            return <StyledMarkedText key={index} text={block.message.content} />;
+            return <Markdown key={index} raw={block.message.content} />;
           }
 
           if (block.message.thinking_content) {
-            return <StyledMarkedText key={index} text={block.message.thinking_content} />;
+            return <Markdown key={index} raw={block.message.thinking_content} />;
           }
 
           return null;

static/app/components/events/autofix/v3/autofixPreviews.tsx

@@ -5,6 +5,7 @@ import {Tag} from '@sentry/scraps/badge';
 import {LinkButton} from '@sentry/scraps/button';
 import {Flex} from '@sentry/scraps/layout';
 import {ExternalLink} from '@sentry/scraps/link';
+import {Markdown} from '@sentry/scraps/markdown';
 import {Text} from '@sentry/scraps/text';
 
 import {
@@ -21,7 +22,6 @@ import {
   isSolutionArtifact,
   type AutofixSection,
 } from 'sentry/components/events/autofix/useExplorerAutofix';
-import {StyledMarkedText} from 'sentry/components/events/autofix/v3/styled';
 import {LoadingIndicator} from 'sentry/components/loadingIndicator';
 import {Placeholder} from 'sentry/components/placeholder';
 import {IconOpen} from 'sentry/icons';
@@ -50,7 +50,7 @@ export function RootCausePreview({section}: ArtifactPreviewProps) {
           <Text>{t('Finding the root cause\u2026')}</Text>
         </Flex>
       ) : artifact?.data ? (
-        <StyledMarkedText text={artifact.data.one_line_description} />
+        <Markdown raw={artifact.data.one_line_description} />
       ) : (
         <Text variant="muted">
           {t(
@@ -76,7 +76,7 @@ export function SolutionPreview({section}: ArtifactPreviewProps) {
           <Text>{t('Formulating a plan\u2026')}</Text>
         </Flex>
       ) : artifact?.data ? (
-        <StyledMarkedText text={artifact.data.one_line_summary} />
+        <Markdown raw={artifact.data.one_line_summary} />
       ) : (
         <Text variant="muted">
           {t('Seer failed to generate a plan. This one is on us. Try running it again.')}

static/app/components/events/autofix/v3/rootCauseCard.tsx

@@ -2,6 +2,7 @@ import {Fragment, useMemo} from 'react';
 
 import {Button} from '@sentry/scraps/button';
 import {Container, Flex} from '@sentry/scraps/layout';
+import {Markdown} from '@sentry/scraps/markdown';
 import {Text} from '@sentry/scraps/text';
 
 import {
@@ -15,7 +16,6 @@ import {ArtifactDetails} from 'sentry/components/events/autofix/v3/artifactDetai
 import {ArtifactLoadingDetails} from 'sentry/components/events/autofix/v3/artifactLoadingDetails';
 import {AutofixEvidence} from 'sentry/components/events/autofix/v3/autofixEvidence';
 import {AutofixResetPrompt} from 'sentry/components/events/autofix/v3/autofixResetPrompt';
-import {StyledMarkedText} from 'sentry/components/events/autofix/v3/styled';
 import {useAutofixSectionEvidence} from 'sentry/components/events/autofix/v3/useAutofixSectionEvidence';
 import {useResetAutofixStep} from 'sentry/components/events/autofix/v3/useResetAutofixStep';
 import {artifactToMarkdown} from 'sentry/components/events/autofix/v3/utils';
@@ -79,7 +79,7 @@ export function RootCauseCard({autofix, groupId, section}: RootCauseCardProps) {
             />
           )}
           <ArtifactDetails>
-            <StyledMarkedText text={artifact.data.one_line_description} />
+            <Markdown raw={artifact.data.one_line_description} />
           </ArtifactDetails>
           {artifact.data.five_whys?.length ? (
             <Fragment>
@@ -88,7 +88,7 @@ export function RootCauseCard({autofix, groupId, section}: RootCauseCardProps) {
                 <Container as="ul" margin="0">
                   {artifact.data.five_whys.map((why, index) => (
                     <li key={index}>
-                      <StyledMarkedText text={why} />
+                      <Markdown raw={why} />
                     </li>
                   ))}
                 </Container>
@@ -99,7 +99,7 @@ export function RootCauseCard({autofix, groupId, section}: RootCauseCardProps) {
                   <Container as="ol" margin="0">
                     {artifact.data?.reproduction_steps.map((step, index) => (
                       <li key={index}>
-                        <StyledMarkedText text={step} />
+                        <Markdown raw={step} />
                       </li>
                     ))}
                   </Container>

static/app/components/events/autofix/v3/solutionCard.tsx

@@ -2,6 +2,7 @@ import {Fragment, useMemo} from 'react';
 
 import {Button} from '@sentry/scraps/button';
 import {Container, Flex} from '@sentry/scraps/layout';
+import {Markdown} from '@sentry/scraps/markdown';
 import {Text} from '@sentry/scraps/text';
 
 import {
@@ -14,7 +15,6 @@ import {ArtifactCard} from 'sentry/components/events/autofix/v3/artifactCard';
 import {ArtifactDetails} from 'sentry/components/events/autofix/v3/artifactDetails';
 import {ArtifactLoadingDetails} from 'sentry/components/events/autofix/v3/artifactLoadingDetails';
 import {AutofixResetPrompt} from 'sentry/components/events/autofix/v3/autofixResetPrompt';
-import {StyledMarkedText} from 'sentry/components/events/autofix/v3/styled';
 import {useResetAutofixStep} from 'sentry/components/events/autofix/v3/useResetAutofixStep';
 import {artifactToMarkdown} from 'sentry/components/events/autofix/v3/utils';
 import {IconList} from 'sentry/icons/iconList';
@@ -74,7 +74,7 @@ export function SolutionCard({autofix, section}: SolutionCardProps) {
             />
           )}
           <ArtifactDetails>
-            <StyledMarkedText text={artifact.data.one_line_summary} />
+            <Markdown raw={artifact.data.one_line_summary} />
           </ArtifactDetails>
           {artifact.data.steps ? (
             <ArtifactDetails>
@@ -83,7 +83,7 @@ export function SolutionCard({autofix, section}: SolutionCardProps) {
                 {artifact.data.steps.map((step, index) => (
                   <li key={index}>
                     <Flex direction="column">
-                      <StyledMarkedText text={step.title} />
+                      <Markdown raw={step.title} />
                       <Text size="sm" variant="muted">
                         {step.description}
                       </Text>

static/app/components/preprod/preprodBuildsSnapshotTable.snapshots.tsx

@@ -69,6 +69,7 @@ function makeBuild(
       images_removed: 0,
       images_changed: 3,
       images_unchanged: 19,
+      images_skipped: 0,
     },
     ...overrides,
   };
@@ -117,6 +118,7 @@ describe('PreprodBuildsSnapshotTable', () => {
               images_removed: 0,
               images_changed: 3,
               images_unchanged: 19,
+              images_skipped: 0,
             },
           })
         ),
@@ -137,6 +139,7 @@ describe('PreprodBuildsSnapshotTable', () => {
               images_removed: 0,
               images_changed: 0,
               images_unchanged: 0,
+              images_skipped: 0,
             },
           })
         ),
@@ -168,6 +171,7 @@ describe('PreprodBuildsSnapshotTable', () => {
               images_removed: 0,
               images_changed: 0,
               images_unchanged: 20,
+              images_skipped: 0,
             },
           })
         ),

static/app/components/preprod/preprodBuildsSnapshotTable.tsx

@@ -31,18 +31,20 @@ function ChangeCounts({
   removed,
   changed,
   unchanged,
+  skipped,
   comparisonState,
 }: {
   added: number;
   changed: number;
   comparisonState: SnapshotComparisonState | null | undefined;
   removed: number;
+  skipped: number;
   unchanged: number;
 }) {
   if (comparisonState !== 'success') {
     return <Text variant="muted">{'–'}</Text>;
   }
-  if (added === 0 && removed === 0 && changed === 0) {
+  if (added === 0 && removed === 0 && changed === 0 && skipped === 0) {
     return (
       <Text size="sm" variant="muted">
         {t('No changes')}
@@ -62,6 +64,9 @@ function ChangeCounts({
   if (unchanged > 0) {
     parts.push(t('%s unchanged', unchanged));
   }
+  if (skipped > 0) {
+    parts.push(t('%s skipped', skipped));
+  }
   return (
     <Text size="sm" variant="muted">
       {parts.join(', ')}
@@ -113,6 +118,7 @@ export function PreprodBuildsSnapshotTable({
               removed={info?.images_removed ?? 0}
               changed={info?.images_changed ?? 0}
               unchanged={info?.images_unchanged ?? 0}
+              skipped={info?.images_skipped ?? 0}
               comparisonState={info?.comparison_state}
             />
           </SimpleTable.RowCell>

static/app/views/preprod/types/buildDetailsTypes.ts

@@ -211,5 +211,6 @@ interface SnapshotComparisonInfo {
   images_added: number;
   images_changed: number;
   images_removed: number;
+  images_skipped: number;
   images_unchanged: number;
 }