Browse Source

fix(mep): Remove metricsEnhanced from our txn summary charts (#37713)

We were still passing metrics enhanced qp if you had the main metric flag enabled.
Kev 2 years ago
parent
commit
3a2f02abd5

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

@@ -100,10 +100,10 @@ export const MEPSettingProvider = ({
 
   const canUseMEP = canUseMetricsData(organization);
 
-  const allowedStates = [MEPState.auto, MEPState.metricsOnly, MEPState.transactionsOnly];
+  const allowedStates = [MEPState.metricsOnly, MEPState.transactionsOnly];
   const _metricSettingFromParam = location
     ? decodeScalar(location.query[METRIC_SETTING_PARAM])
-    : MEPState.auto;
+    : MEPState.metricsOnly;
   let defaultMetricsState = MEPState.metricsOnly;
 
   if (forceTransactions) {

+ 0 - 4
static/app/views/performance/transactionSummary/transactionOverview/durationChart/index.tsx

@@ -12,9 +12,7 @@ import QuestionTooltip from 'sentry/components/questionTooltip';
 import {t, tct} from 'sentry/locale';
 import {OrganizationSummary} from 'sentry/types';
 import {getUtcToLocalDateObject} from 'sentry/utils/dates';
-import {useMEPSettingContext} from 'sentry/utils/performance/contexts/metricsEnhancedSetting';
 import useApi from 'sentry/utils/useApi';
-import {getMEPQueryParams} from 'sentry/views/performance/landing/widgets/utils';
 
 import {ViewProps} from '../../../types';
 import {
@@ -61,7 +59,6 @@ function DurationChart({
 }: Props) {
   const api = useApi();
   const theme = useTheme();
-  const mepContext = useMEPSettingContext();
 
   function handleLegendSelectChanged(legendChange: {
     name: string;
@@ -148,7 +145,6 @@ function DurationChart({
         partial
         withoutZerofill={withoutZerofill}
         referrer="api.performance.transaction-summary.duration-chart"
-        queryExtras={getMEPQueryParams(mepContext)}
       >
         {({results, errored, loading, reloading, timeframe: timeFrame}) => (
           <Content

+ 0 - 4
static/app/views/performance/transactionSummary/transactionOverview/sidebarCharts.tsx

@@ -31,12 +31,10 @@ import {
 } from 'sentry/utils/formatters';
 import getDynamicText from 'sentry/utils/getDynamicText';
 import AnomaliesQuery from 'sentry/utils/performance/anomalies/anomaliesQuery';
-import {useMEPSettingContext} from 'sentry/utils/performance/contexts/metricsEnhancedSetting';
 import {decodeScalar} from 'sentry/utils/queryString';
 import useApi from 'sentry/utils/useApi';
 import {getTermHelp, PERFORMANCE_TERM} from 'sentry/views/performance/data';
 
-import {getMEPQueryParams} from '../../landing/widgets/utils';
 import {
   anomaliesRouteWithQuery,
   ANOMALY_FLAG,
@@ -250,7 +248,6 @@ function SidebarChartsContainer({
 }: ContainerProps) {
   const api = useApi();
   const theme = useTheme();
-  const mepSetting = useMEPSettingContext();
 
   const colors = theme.charts.getColorPalette(3);
   const statsPeriod = eventView.statsPeriod;
@@ -390,7 +387,6 @@ function SidebarChartsContainer({
       yAxis={['apdex()', 'failure_rate()', 'epm()']}
       partial
       referrer="api.performance.transaction-summary.sidebar-chart"
-      queryExtras={getMEPQueryParams(mepSetting)}
     >
       {({results, errored, loading, reloading}) => {
         const series = results

+ 3 - 3
tests/js/spec/views/performance/landing/widgets/widgetContainer.spec.tsx

@@ -355,7 +355,7 @@ describe('Performance > Widgets > WidgetContainer', function () {
       1,
       expect.anything(),
       expect.objectContaining({
-        query: expect.objectContaining({dataset: 'metricsEnhanced'}),
+        query: expect.objectContaining({dataset: 'metrics'}),
       })
     );
     expect(await screen.findByTestId('has-metrics-data-tag')).toHaveTextContent(
@@ -393,7 +393,7 @@ describe('Performance > Widgets > WidgetContainer', function () {
       1,
       expect.anything(),
       expect.objectContaining({
-        query: expect.objectContaining({dataset: 'metricsEnhanced'}),
+        query: expect.objectContaining({dataset: 'metrics'}),
       })
     );
   });
@@ -427,7 +427,7 @@ describe('Performance > Widgets > WidgetContainer', function () {
       1,
       expect.anything(),
       expect.objectContaining({
-        query: expect.objectContaining({dataset: 'metricsEnhanced'}),
+        query: expect.objectContaining({dataset: 'metrics'}),
       })
     );
     expect(await screen.findByTestId('has-metrics-data-tag')).toHaveTextContent(

+ 2 - 2
tests/js/spec/views/performance/table.spec.tsx

@@ -314,7 +314,7 @@ describe('Performance > Table', function () {
               'count_miserable(user)',
               'user_misery()',
             ],
-            dataset: 'metricsEnhanced',
+            dataset: 'metrics',
             per_page: 50,
             project: ['1', '2'],
             query: 'event.type:transaction transaction:/api*',
@@ -455,7 +455,7 @@ describe('Performance > Table', function () {
               'count_miserable(user)',
               'user_misery()',
             ],
-            dataset: 'metricsEnhanced',
+            dataset: 'metrics',
             per_page: 50,
             project: ['1', '2'],
             query: 'event.type:transaction transaction:/api*',