Home Explore Help
Sign In
SMusatov
/
sentry
mirror of https://github.com/getsentry/sentry
1
0
Fork 0
Files
Browse Source

ref(sampling): Update copies - (#36842)

Priscila Oliveira 2 years ago
parent
c6f872ae7f
commit
0c86c48c93
10 changed files with 41 additions and 53 deletions
Split View Show Diff Stats
  1. 6 4
      static/app/components/assistant/getGuidesContent.tsx
  2. 5 12
      static/app/views/settings/project/server-side-sampling/modals/recommendedStepsModal.tsx
  3. 1 1
      static/app/views/settings/project/server-side-sampling/modals/uniformRateChart.tsx
  4. 6 8
      static/app/views/settings/project/server-side-sampling/modals/uniformRateModal.tsx
  5. 7 5
      static/app/views/settings/project/server-side-sampling/promo.tsx
  6. 3 3
      static/app/views/settings/project/server-side-sampling/rule.tsx
  7. 6 13
      static/app/views/settings/project/server-side-sampling/samplingSDKAlert.tsx
  8. 1 1
      static/app/views/settings/project/server-side-sampling/serverSideSampling.tsx
  9. 3 3
      static/app/views/settings/project/server-side-sampling/utils/projectStatsToPredictedSeries.tsx
  10. 3 3
      static/app/views/settings/project/server-side-sampling/utils/projectStatsToSeries.tsx

+ 6 - 4
static/app/components/assistant/getGuidesContent.tsx
View File 

@@ -232,9 +232,11 @@ export default function getGuidesContent(orgSlug: string | null): GuidesContent
 
       dateThreshold: new Date('2022-07-05'),
 
       steps: [
 
         {
 
-          title: t('Activate first rule'),
 
+          title: t('Activate your first rule'),
 
           target: 'sampling_rule_toggle',
 
-          description: t('Rules will propagate within a few minutes.'),
 
+          description: t(
 
+            'Start keeping what you need and dropping what you don’t - get up and running in minutes.'
 
+          ),
 
           nextText: t('Activate Rule'),
 
           dismissText: t('Later'),
 
           hasNextGuide: true,
 
@@ -247,10 +249,10 @@ export default function getGuidesContent(orgSlug: string | null): GuidesContent
 
       dateThreshold: new Date('2022-07-05'),
 
       steps: [
 
         {
 
-          title: t('Create a new rule based on specific conditions'),
 
+          title: t('Create a new sample rule'),
 
           target: 'add_conditional_rule',
 
           description: t(
 
-            'Target the transactions you want more details on (where your quota actually goes).'
 
+            'Define sample rules to retain the transactions you care about most such as the highest converting pages, critical API endpoints, or latency issues from your latest release. '
 
           ),
 
           dismissText: t('Enough already'),
 
         },

+ 5 - 12
static/app/views/settings/project/server-side-sampling/modals/recommendedStepsModal.tsx
View File 

@@ -6,7 +6,6 @@ import styled from '@emotion/styled';
 
 import {ModalRenderProps} from 'sentry/actionCreators/modal';
 
 import Button from 'sentry/components/button';
 
 import ButtonBar from 'sentry/components/buttonBar';
 
-import ExternalLink from 'sentry/components/links/externalLink';
 
 import List from 'sentry/components/list';
 
 import ListItem from 'sentry/components/list/listItem';
 
 import {
 
@@ -130,7 +129,7 @@ export function RecommendedStepsModal({
 
   return (
 
     <Fragment>
 
       <Header closeButton>
 
-        <h4>{t('Recommended next steps\u2026')}</h4>
 
+        <h4>{t('Next steps')}</h4>
 
       </Header>
 
       <Body>
 
         <List symbol="colored-numeric">
 
@@ -138,14 +137,8 @@ export function RecommendedStepsModal({
 
             <ListItem>
 
               <h5>{t('Update the following SDK versions')}</h5>
 
               <TextBlock>
 
-                {tct(
 
-                  "I know what you're thinking, [italic:“[strong:It's already working, why should I?]”]. By updating the following SDK's before activating any server sampling rules, you're avoiding situations when our servers aren't accepting enough transactions ([doubleSamplingLink:double sampling]) or our servers are accepting too many transactions ([exceededQuotaLink:exceeded quota]).",
 
-                  {
 
-                    strong: <strong />,
 
-                    italic: <i />,
 
-                    doubleSamplingLink: <ExternalLink href="" />,
 
-                    exceededQuotaLink: <ExternalLink href="" />,
 
-                  }
 
+                {t(
 
+                  'To ensure you are properly monitoring the performance of all your other services, we require you update to the latest version of the following SDK(s):'
 
                 )}
 
               </TextBlock>
 
               <UpgradeSDKfromProjects>
 
@@ -172,10 +165,10 @@ export function RecommendedStepsModal({
 
             </ListItem>
 
           )}
 
           <ListItem>
 
-            <h5>{t('Increase your SDK Transaction sample rate')}</h5>
 
+            <h5>{t('Increase your client-side transaction sample rate')}</h5>
 
             <TextBlock>
 
               {t(
 
-                'This comes in handy when server-side sampling target the transactions you want to accept, but you need more of those transactions being sent by your client. Here we  already suggest a value based on your quota and throughput.'
 
+                'Once you’ve updated the above SDK(s), you can increase the client-side transaction sample rate in your application. This helps to ensure you are sending enough transactions to accurately monitor overall performance and ensure all transactions you have deemed important in your server-side sample rules are available. Below is the suggested rate we’ve calculated based on your organization’s usage and quota.'
 
               )}
 
             </TextBlock>
 
             <div>

+ 1 - 1
static/app/views/settings/project/server-side-sampling/modals/uniformRateChart.tsx
View File 

@@ -26,7 +26,7 @@ function UniformRateChart({series, isLoading}: Props) {
 
     <ChartPanel>
 
       <ChartContainer>
 
         <TransitionChart loading={isLoading} reloading={false} height="224px">
 
-          <HeaderTitle>{t('Last 30 days of Transactions ')}</HeaderTitle>
 
+          <HeaderTitle>{t('Transactions (Last 30 days) ')}</HeaderTitle>
 
 
           {getDynamicText({
 
             value: (

+ 6 - 8
static/app/views/settings/project/server-side-sampling/modals/uniformRateModal.tsx
View File 

@@ -5,6 +5,7 @@ import Alert from 'sentry/components/alert';
 
 import Button from 'sentry/components/button';
 
 import ButtonBar from 'sentry/components/buttonBar';
 
 import {NumberField} from 'sentry/components/forms';
 
+import ExternalLink from 'sentry/components/links/externalLink';
 
 import LoadingIndicator from 'sentry/components/loadingIndicator';
 
 import {PanelTable} from 'sentry/components/panels';
 
 import QuestionTooltip from 'sentry/components/questionTooltip';
 
@@ -235,17 +236,14 @@ function UniformRateModal({
 
   return (
 
     <Fragment>
 
       <Header closeButton>
 
-        <h4>{t('Set a uniform sample rate for Transactions')}</h4>
 
+        <h4>{t('Define a global sample rate')}</h4>
 
       </Header>
 
       <Body>
 
         <TextBlock>
 
           {tct(
 
-            'Similarly to how you would configure a [transactionSampleRate: Transaction Sample Rate] from within your client’s [sentryInit: Sentry.init()], we ask you to [uniformRate: set a uniform sample rate] which provides an even cross-section of transactions from [allProjects: all projects].',
 
+            'Set a global sample rate for the percent of transactions you want to process (Client) and those you want to index (Server) for your project. Below are suggested rates based on your organization’s usage and quota. Once set, the number of transactions processed and indexed for this project come from your organization’s overall quota and might impact the amount of transactions retained for other projects. [learnMoreLink:Learn more about quota management.]',
 
             {
 
-              transactionSampleRate: <strong />,
 
-              sentryInit: <strong />,
 
-              uniformRate: <strong />,
 
-              allProjects: <strong />,
 
+              learnMoreLink: <ExternalLink href="" />,
 
             }
 
           )}
 
         </TextBlock>
 
@@ -303,7 +301,7 @@ function UniformRateModal({
 
                       setSelectedStrategy(Strategy.RECOMMENDED);
 
                     }}
 
                   />
 
-                  {isEdited ? t('New') : t('Recommended')}
 
+                  {isEdited ? t('New') : t('Suggested')}
 
                   {!isEdited && (
 
                     <QuestionTooltip
 
                       title={t(
 
@@ -345,7 +343,7 @@ function UniformRateModal({
 
                   {isEdited && (
 
                     <Button
 
                       icon={<IconRefresh size="sm" />}
 
-                      aria-label={t('Reset to recommended values')}
 
+                      aria-label={t('Reset to suggested values')}
 
                       onClick={() => {
 
                         setClientInput(rateToPercentage(recommendedClientSampling));
 
                         setServerInput(rateToPercentage(recommendedServerSampling));

+ 7 - 5
static/app/views/settings/project/server-side-sampling/promo.tsx
View File 

@@ -21,8 +21,12 @@ export function Promo({onGetStarted, onReadDocs, hasAccess}: Props) {
 
     <StyledEmptyStateWarning withIcon={false}>
 
       <img src={onboardingServerSideSampling} />
 
       <Description>
 
-        <h3>{t('No sampling rules active yet')}</h3>
 
-        <p>{t('Set up your project for sampling success')}</p>
 
+        <h3>{t('Set sample rules for your project')}</h3>
 
+        <p>
 
+          {t(
 
+            'Because every project is different – some need more events from high converting pages, critical API endpoints, or just want to focus on latency issues from the latest release – set multiple sample rules with different sample rates per project so you can keep what you need and drop what you don’t.'
 
+          )}
 
+        </p>
 
         <Actions gap={1}>
 
           <Button href={SERVER_SIDE_SAMPLING_DOC_LINK} onClick={onReadDocs} external>
 
             {t('Read Docs')}
 
@@ -32,9 +36,7 @@ export function Promo({onGetStarted, onReadDocs, hasAccess}: Props) {
 
             onClick={onGetStarted}
 
             disabled={!hasAccess}
 
             title={
 
-              hasAccess
 
-                ? undefined
 
-                : t('You do not have permission to set up the sampling rules.')
 
+              hasAccess ? undefined : t('You do not have permission to set up rules')
 
             }
 
           >
 
             {t('Start Setup')}

+ 3 - 3
static/app/views/settings/project/server-side-sampling/rule.tsx
View File 

@@ -174,7 +174,7 @@ export function Rule({
 
           >
 
             <Tooltip
 
               disabled={!noPermission}
 
-              title={t('You do not have permission to edit sampling rules')}
 
+              title={t('You do not have permission to edit rules')}
 
               containerDisplayMode="block"
 
             >
 
               {t('Edit')}
 
@@ -182,7 +182,7 @@ export function Rule({
 
           </MenuItemActionLink>
 
           <MenuItemActionLink
 
             onAction={onDeleteRule}
 
-            message={t('Are you sure you wish to delete this sampling rule?')}
 
+            message={t('Are you sure you wish to delete this rule?')}
 
             icon={<IconDownload size="xs" />}
 
             title={t('Delete')}
 
             disabled={!canDelete}
 
@@ -194,7 +194,7 @@ export function Rule({
 
               title={
 
                 isUniform
 
                   ? t("You can't delete the uniform rule")
 
-                  : t('You do not have permission to delete sampling rules')
 
+                  : t('You do not have permission to delete rules')
 
               }
 
               containerDisplayMode="block"
 
             >

+ 6 - 13
static/app/views/settings/project/server-side-sampling/samplingSDKAlert.tsx
View File 

@@ -5,7 +5,7 @@ import {openModal} from 'sentry/actionCreators/modal';
 
 import Alert from 'sentry/components/alert';
 
 import Button from 'sentry/components/button';
 
 import ProjectBadge from 'sentry/components/idBadge/projectBadge';
 
-import {t, tn} from 'sentry/locale';
 
+import {t} from 'sentry/locale';
 
 import space from 'sentry/styles/space';
 
 import {Organization} from 'sentry/types';
 
 import {RecommendedSdkUpgrade, SamplingRule} from 'sentry/types/sampling';
 
@@ -59,31 +59,24 @@ export function SamplingSDKAlert({
 
     ));
 
   }
 
 
-  const atLeastOneRuleActive = rules.some(rule => rule.active);
 
   const uniformRule = rules.find(isUniformRule);
 
 
   return (
 
     <Alert
 
       data-test-id="recommended-sdk-upgrades-alert"
 
-      type={atLeastOneRuleActive ? 'error' : 'info'}
 
+      type="info"
 
       showIcon
 
       trailingItems={
 
         showLinkToTheModal && uniformRule ? (
 
           <Button onClick={handleOpenRecommendedSteps} priority="link" borderless>
 
-            {atLeastOneRuleActive ? t('Resolve Now') : t('Learn More')}
 
+            {t('Learn More')}
 
           </Button>
 
         ) : undefined
 
       }
 
     >
 
-      {atLeastOneRuleActive
 
-        ? t(
 
-            'Server-side sampling rules are in effect without the following SDK’s being updated to their latest version.'
 
-          )
 
-        : tn(
 
-            'To keep a consistent amount of transactions across your applications multiple services, we recommend you update the SDK versions for the following project:',
 
-            'To keep a consistent amount of transactions across your applications multiple services, we recommend you update the SDK versions for the following projects:',
 
-            recommendedSdkUpgrades.length
 
-          )}
 
+      {t(
 
+        'To ensure you are properly monitoring the performance of all your other services, we require you update to the latest version of the following SDK(s):'
 
+      )}
 
       <Projects>
 
         {recommendedSdkUpgrades.map(recommendedSdkUpgrade => (
 
           <ProjectBadge

+ 1 - 1
static/app/views/settings/project/server-side-sampling/serverSideSampling.tsx
View File 

@@ -401,7 +401,7 @@ export function ServerSideSampling({project}: Props) {
 
         <SettingsPageHeader title={t('Server-side Sampling')} />
 
         <TextBlock>
 
           {t(
 
-            'Server-side sampling provides an additional dial for dropping transactions. This comes in handy when your server-side sampling rules target the transactions you want to keep, but you need more of those transactions being sent by the SDK.'
 
+            'Server-side sampling lets you control what transactions Sentry retains by setting sample rules and rates so you see more of the transactions you want to explore further in Sentry – and less of the ones you don’t – without re-configuring the Sentry SDK and redeploying anything.'
 
           )}
 
         </TextBlock>
 
         <PermissionAlert

+ 3 - 3
static/app/views/settings/project/server-side-sampling/utils/projectStatsToPredictedSeries.tsx
View File 

@@ -87,19 +87,19 @@ export function projectStatsToPredictedSeries(
 
 
   return [
 
     {
 
-      seriesName: t('Accepted'),
 
+      seriesName: t('Indexed'),
 
       color: COLOR_TRANSACTIONS,
 
       ...commonSeriesConfig,
 
       data: seriesData.accepted,
 
     },
 
     {
 
-      seriesName: t('Dropped (Server)'),
 
+      seriesName: t('Processed'),
 
       color: COLOR_DROPPED,
 
       data: seriesData.droppedServer,
 
       ...commonSeriesConfig,
 
     },
 
     {
 
-      seriesName: t('Dropped (Client)'),
 
+      seriesName: t('Dropped'),
 
       color: commonTheme.yellow300,
 
       data: seriesData.droppedClient,
 
       ...commonSeriesConfig,

+ 3 - 3
static/app/views/settings/project/server-side-sampling/utils/projectStatsToSeries.tsx
View File 

@@ -58,19 +58,19 @@ export function projectStatsToSeries(projectStats: SeriesApi | undefined): Serie
 
 
   return [
 
     {
 
-      seriesName: t('Accepted'),
 
+      seriesName: t('Indexed'),
 
       color: COLOR_TRANSACTIONS,
 
       ...commonSeriesConfig,
 
       data: seriesData.accepted,
 
     },
 
     {
 
-      seriesName: t('Dropped (Server)'),
 
+      seriesName: t('Processed'),
 
       color: COLOR_DROPPED,
 
       data: seriesData.droppedServer,
 
       ...commonSeriesConfig,
 
     },
 
     {
 
-      seriesName: t('Dropped (Client)'),
 
+      seriesName: t('Dropped'),
 
       color: commonTheme.yellow300,
 
       data: seriesData.droppedClient,
 
       ...commonSeriesConfig,

Some files were not shown because too many files changed in this diff