Skip to content

fix(explore): Improve improvement of conversion to TimeSeries #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

fix(explore): Improve improvement of conversion to TimeSeries #20

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3b48a2b
Always assign `isOther`
gggritso Oct 3, 2025
f58ffff
Use `groupData` for order
gggritso Oct 3, 2025
7a55614
Mark delayed data
gggritso Oct 3, 2025
1721cc9
Whoops
gggritso Oct 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 12 additions & 14 deletions static/app/views/insights/common/queries/useSortedTimeSeries.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import {
import {DiscoverDatasets} from 'sentry/utils/discover/types';
import {intervalToMilliseconds} from 'sentry/utils/duration/intervalToMilliseconds';
import {getTimeSeriesInterval} from 'sentry/utils/timeSeries/getTimeSeriesInterval';
import {markDelayedData} from 'sentry/utils/timeSeries/markDelayedData';
import {parseGroupBy} from 'sentry/utils/timeSeries/parseGroupBy';
import type {MutableSearch} from 'sentry/utils/tokenizeSearch';
import {useLocation} from 'sentry/utils/useLocation';
Expand All @@ -28,6 +29,7 @@ import {
import type {
TimeSeries,
TimeSeriesItem,
TimeSeriesMeta,
} from 'sentry/views/dashboards/widgets/common/types';
import type {SamplingMode} from 'sentry/views/explore/hooks/useProgressiveQuery';
import {FALLBACK_SERIES_NAME} from 'sentry/views/explore/settings';
Expand Down Expand Up @@ -199,9 +201,7 @@ export function transformToSeriesMap(
const groupByFields = fields.filter(field => !yAxis.includes(field));
const groupBy = parseGroupBy(groupName, groupByFields);
timeSeries.groupBy = groupBy;
if (groupName === 'Other') {
timeSeries.meta.isOther = true;
}
timeSeries.meta.isOther = groupName === 'Other';
}

allTimeSeries.push(timeSeries);
Expand All @@ -224,16 +224,14 @@ export function transformToSeriesMap(
const [, timeSeries] = convertEventsStatsToTimeSeriesData(
axis,
seriesData,
seriesData.order
groupData.order as unknown as number // `order` is always present
);

if (fields) {
const groupByFields = fields.filter(field => !yAxis.includes(field));
const groupBy = parseGroupBy(groupName, groupByFields);
timeSeries.groupBy = groupBy;
if (groupName === 'Other') {
timeSeries.meta.isOther = true;
}
timeSeries.meta.isOther = groupName === 'Other';
}

allTimeSeries.push(timeSeries);
Expand Down Expand Up @@ -277,22 +275,22 @@ export function convertEventsStatsToTimeSeriesData(
}
);

const interval = getTimeSeriesInterval(values);

const serie: TimeSeries = {
yAxis: yAxis ?? FALLBACK_SERIES_NAME,
const timeSeries: TimeSeries = {
values,
yAxis: yAxis ?? FALLBACK_SERIES_NAME,
meta: {
valueType: seriesData.meta?.fields?.[yAxis]!,
valueUnit: seriesData.meta?.units?.[yAxis] as DataUnit,
interval,
interval: getTimeSeriesInterval(values),
dataScanned: seriesData.meta?.dataScanned,
},
};

const delayedTimeSeries = markDelayedData(timeSeries, 90);

if (defined(order)) {
serie.meta.order = order;
delayedTimeSeries.meta.order = order;
}

return [serie.meta.order ?? 0, serie];
return [timeSeries.meta.order ?? 0, delayedTimeSeries];
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[CriticalError]

Potential bug: The return value references timeSeries.meta.order but order is only assigned to delayedTimeSeries.meta.order. This will always return 0 when order is provided, potentially causing incorrect sorting.

Suggested change
return [timeSeries.meta.order ?? 0, delayedTimeSeries];
return [delayedTimeSeries.meta.order ?? 0, delayedTimeSeries];

⚡ Committable suggestion

Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation.

Context for Agents 
[**CriticalError**]

Potential bug: The return value references `timeSeries.meta.order` but `order` is only assigned to `delayedTimeSeries.meta.order`. This will always return 0 when order is provided, potentially causing incorrect sorting.

```suggestion
  return [delayedTimeSeries.meta.order ?? 0, delayedTimeSeries];
```

⚡ **Committable suggestion**

Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation.

File: static/app/views/insights/common/queries/useSortedTimeSeries.tsx
Line: 295

}