Просмотр исходного кода

ref(dynamic-sampling): Merge server-side-sampling flag into dynamic-sampling flag - (#42067)

Priscila Oliveira 2 лет назад
Родитель
Сommit
65518a50ff

+ 1 - 1
static/app/utils/performance/contexts/metricsEnhancedSetting.tsx

@@ -78,7 +78,7 @@ export function canUseMetricsData(organization: Organization) {
     'performance-transaction-name-only-search'
   ); // TODO: Swap this flag out.
 
-  const samplingRolloutFlag = organization.features.includes('server-side-sampling');
+  const samplingRolloutFlag = organization.features.includes('dynamic-sampling');
   const isRollingOut =
     samplingRolloutFlag && organization.features.includes('mep-rollout-flag');
 

+ 1 - 5
static/app/views/dashboardsV2/widgetBuilder/buildSteps/visualizationStep.spec.tsx

@@ -161,11 +161,7 @@ describe('VisualizationStep', function () {
         context: routerContext,
         organization: {
           ...organization,
-          features: [
-            ...organization.features,
-            'server-side-sampling',
-            'mep-rollout-flag',
-          ],
+          features: [...organization.features, 'dynamic-sampling', 'mep-rollout-flag'],
         },
       }
     );

+ 2 - 2
static/app/views/dashboardsV2/widgetBuilder/widgetBuilderDataset.spec.tsx

@@ -851,7 +851,7 @@ describe('WidgetBuilder', function () {
           orgFeatures: [
             ...defaultOrgFeatures,
             'dashboards-mep',
-            'server-side-sampling',
+            'dynamic-sampling',
             'mep-rollout-flag',
           ],
         });
@@ -903,7 +903,7 @@ describe('WidgetBuilder', function () {
           orgFeatures: [
             ...defaultOrgFeatures,
             'dashboards-mep',
-            'server-side-sampling',
+            'dynamic-sampling',
             'mep-rollout-flag',
           ],
         });

+ 1 - 1
static/app/views/settings/project/dynamicSampling/dynamicSampling.spec.tsx

@@ -6,7 +6,7 @@ import {DynamicSamplingBiasType} from 'sentry/types/sampling';
 
 import DynamicSampling from '.';
 
-const ORG_FEATURES = ['server-side-sampling', 'dynamic-sampling'];
+const ORG_FEATURES = ['dynamic-sampling'];
 
 const dynamicSamplingBiases = [
   {id: DynamicSamplingBiasType.BOOST_LATEST_RELEASES, active: true},

+ 2 - 5
static/app/views/settings/project/dynamicSampling/index.tsx

@@ -16,15 +16,12 @@ export default function DynamicSamplingContainer({project}: Props) {
 
   return (
     <Feature
-      features={['server-side-sampling', 'dynamic-sampling']}
+      features={['dynamic-sampling']}
       organization={organization}
       renderDisabled={() => (
         <FeatureDisabled
           alert={PanelAlert}
-          features={[
-            'organizations:server-side-sampling',
-            'organizations:dynamic-sampling',
-          ]}
+          features={['organizations:dynamic-sampling']}
           featureName={t('Dynamic Sampling')}
         />
       )}

+ 1 - 8
static/app/views/settings/project/navigationConfiguration.tsx

@@ -72,14 +72,7 @@ export default function getConfiguration({
           title: t('Dynamic Sampling'),
           show: () => {
             const orgFeatures = organization?.features ?? [];
-            if (
-              orgFeatures.includes('server-side-sampling') &&
-              orgFeatures.includes('dynamic-sampling')
-            ) {
-              return true;
-            }
-
-            return false;
+            return orgFeatures.includes('dynamic-sampling');
           },
           description: t(
             "Per-Project basis solution to configure sampling rules within Sentry's UI"