Skip to content

:hedgehog: PostHog is the leading platform for building self-driving products. Our developer tools – AI observability, analytics, session replay, flags, experiments, error tracking, logs, and more – capture all the context agents need to diagnose problems, uncover opportunities, and ship fixes. Steer it all from Slack, web, desktop, or the MCP.

feat(metrics): restructure the viewer into a logs-style layout (#127303)

Frank Hamand33869068a653
diff --git a/products/metrics/frontend/components/FacetRail/MetricsFacetRail.tsx b/products/metrics/frontend/components/FacetRail/MetricsFacetRail.tsx
index 00a1ae2cf921..c5e45a69171d 100644
--- a/products/metrics/frontend/components/FacetRail/MetricsFacetRail.tsx
+++ b/products/metrics/frontend/components/FacetRail/MetricsFacetRail.tsx
@@ -1,5 +1,4 @@
import { useActions, useValues } from 'kea'
-import { ReactNode } from 'react'
import { IconChevronLeft, IconChevronRight } from '@posthog/icons'
import { LemonButton, Link } from '@posthog/lemon-ui'
@@ -68,16 +67,3 @@ export function MetricsFacetRailToggle(): JSX.Element {
</LemonButton>
)
}
-
-/** Puts the rail beside the viewer, with the viewer scrolling on its own so the rail keeps its height. */
-export function MetricsFacetRailLayout({ enabled, children }: { enabled: boolean; children: ReactNode }): JSX.Element {
- if (!enabled) {
- return <div className="flex flex-col gap-3">{children}</div>
- }
- return (
- <div className="flex gap-2 flex-1 min-h-0">
- <MetricsFacetRail />
- <div className="flex flex-col gap-3 flex-1 min-w-0 min-h-0 overflow-y-auto">{children}</div>
- </div>
- )
-}
diff --git a/products/metrics/frontend/components/MetricsClauseRow.tsx b/products/metrics/frontend/components/MetricsClauseRow.tsx
index acad01ef93c6..674d1776f40d 100644
--- a/products/metrics/frontend/components/MetricsClauseRow.tsx
+++ b/products/metrics/frontend/components/MetricsClauseRow.tsx
@@ -16,7 +16,7 @@ import { MetricsOperations } from './MetricsOperations'
import { MAX_CLAUSES, MetricsViewerClause, metricsViewerLogic } from './metricsViewerLogic'
/** One query line of the viewer: alias, metric picker, filters, operations, and group-by.
- * Editing any control focuses the row — the samples panel, anomaly badge, and picker
+ * Editing any control focuses the row — the anomaly badge, related links, and picker
* scoping follow the focused (active) clause. */
export function MetricsClauseRow({
clause,
@@ -71,8 +71,8 @@ export function MetricsClauseRow({
<Tooltip
title={
isActive
- ? 'Samples and related links follow this series'
- : 'Click to focus this series. Samples and related links follow it.'
+ ? 'The anomaly badge and related links follow this series'
+ : 'Click to focus this series. The anomaly badge and related links follow it.'
}
>
<LemonButton
diff --git a/products/metrics/frontend/components/MetricsDateRangeFilter.tsx b/products/metrics/frontend/components/MetricsDateRangeFilter.tsx
new file mode 100644
index 000000000000..ecabc2287f7a
--- /dev/null
+++ b/products/metrics/frontend/components/MetricsDateRangeFilter.tsx
@@ -0,0 +1,67 @@
+import { useActions, useValues } from 'kea'
+
+import { DateFilter } from 'lib/components/DateFilter/DateFilter'
+import { dayjs } from 'lib/dayjs'
+import { CUSTOM_OPTION_KEY } from 'lib/utils/dateFilters'
+import { DATE_TIME_FORMAT, formatDateRange } from 'lib/utils/datetime'
+
+import { DateMappingOption } from '~/types'
+
+import { metricsViewerLogic } from './metricsViewerLogic'
+
+// Mirrors the curated set used by `LogsViewer/Filters/DateRangeFilter`.
+const METRICS_DATE_OPTIONS: DateMappingOption[] = [
+ { key: CUSTOM_OPTION_KEY, values: [] },
+ {
+ key: 'Last 5 minutes',
+ values: ['-5M'],
+ getFormattedDate: (date: dayjs.Dayjs): string => date.subtract(5, 'minute').format(DATE_TIME_FORMAT),
+ defaultInterval: 'minute',
+ },
+ {
+ key: 'Last 30 minutes',
+ values: ['-30M'],
+ getFormattedDate: (date: dayjs.Dayjs): string => date.subtract(30, 'minute').format(DATE_TIME_FORMAT),
+ defaultInterval: 'minute',
+ },
+ {
+ key: 'Last 1 hour',
+ values: ['-1h'],
+ getFormattedDate: (date: dayjs.Dayjs): string => formatDateRange(date.subtract(1, 'h'), date.endOf('d')),
+ defaultInterval: 'hour',
+ },
+ {
+ key: 'Last 24 hours',
+ values: ['-24h'],
+ getFormattedDate: (date: dayjs.Dayjs): string => formatDateRange(date.subtract(24, 'h'), date.endOf('d')),
+ defaultInterval: 'hour',
+ },
+ {
+ key: 'Last 7 days',
+ values: ['-7d'],
+ getFormattedDate: (date: dayjs.Dayjs): string => formatDateRange(date.subtract(7, 'd'), date.endOf('d')),
+ defaultInterval: 'day',
+ },
+]
+
+export function MetricsDateRangeFilter({ disabledReason }: { disabledReason: string | null }): JSX.Element {
+ const { dateFrom, dateTo } = useValues(metricsViewerLogic)
+ const { setDateFrom, setDateTo } = useActions(metricsViewerLogic)
+ return (
+ <DateFilter
+ size="small"
+ dateFrom={dateFrom}
+ dateTo={dateTo}
+ dateOptions={METRICS_DATE_OPTIONS}
+ onChange={(changedDateFrom, changedDateTo) => {
+ setDateFrom(changedDateFrom)
+ setDateTo(changedDateTo)
+ }}
+ allowTimePrecision
+ allowFixedRangeWithTime
+ allowedRollingDateOptions={['minutes', 'hours', 'days', 'weeks']}
+ use24HourFormat
+ disabledReason={disabledReason}
+ />
+ )
+}
diff --git a/products/metrics/frontend/components/MetricsDisplayTypeSelect.tsx b/products/metrics/frontend/components/MetricsDisplayTypeSelect.tsx
new file mode 100644
index 000000000000..9de425e8b333
--- /dev/null
+++ b/products/metrics/frontend/components/MetricsDisplayTypeSelect.tsx
@@ -0,0 +1,64 @@
+import { useActions, useValues } from 'kea'
+import { useMemo } from 'react'
+
+import { LemonSelect } from '@posthog/lemon-ui'
+
+import { useFeatureFlag } from 'lib/hooks/useFeatureFlag'
+
+import { type MetricsDisplayType } from '~/queries/schema/schema-general'
+
+import { METRICS_PANELS } from '../panels/registry'
+import { metricsViewerLogic } from './metricsViewerLogic'
+
+const BASE_DISPLAY_TYPES: MetricsDisplayType[] = ['line', 'area', 'bar']
+const PANEL_DISPLAY_TYPES: MetricsDisplayType[] = ['stat', 'gauge', 'bargauge', 'table']
+
+export function MetricsDisplayTypeSelect({
+ dataAttrPrefix,
+ resultIsGrouped: resultIsGroupedProp,
+ heatmap,
+ disabledReason,
+}: {
+ dataAttrPrefix: string
+ /** Whether the result has labels. Without it, the builder's group-bys decide. */
+ resultIsGrouped?: boolean
+ /** Offers the heatmap display, which saves a histogram query instead of a time series. */
+ heatmap?: { eligible: boolean }
+ disabledReason: string | null
+}): JSX.Element {
+ const { displayType, language, formula, namedClauses } = useValues(metricsViewerLogic)
+ const { setDisplayType } = useActions(metricsViewerLogic)
+ const dashboardPanelsEnabled = useFeatureFlag('METRICS_DASHBOARD_PANELS')
+
+ // A formula result is ungrouped even when its input clauses group. PromQL and SQL results can have any labels.
+ const resultIsGrouped =
+ resultIsGroupedProp ??
+ (language !== 'builder' || (!formula && namedClauses.some((clause) => clause.groupByKeys.length > 0)))
+ const options = useMemo(() => {
+ const types: MetricsDisplayType[] = dashboardPanelsEnabled
+ ? [...BASE_DISPLAY_TYPES, ...PANEL_DISPLAY_TYPES, ...(heatmap ? (['heatmap'] as const) : [])]
+ : BASE_DISPLAY_TYPES
+ return types.map((value) => {
+ const def = METRICS_PANELS[value]
+ const reason = def.needsGroupBy
+ ? !resultIsGrouped
+ ? 'Add a group-by to use this panel'
+ : undefined
+ : def.needsHistogram && !heatmap?.eligible
+ ? 'Pick a single histogram metric (no formula) to use this panel'
+ : undefined
+ return { value, label: def.label, disabledReason: reason }
+ })
+ }, [dashboardPanelsEnabled, resultIsGrouped, heatmap])
+
+ return (
+ <LemonSelect
+ size="small"
+ value={displayType}
+ options={options}
+ onChange={setDisplayType}
+ data-attr={`${dataAttrPrefix}-display-type`}
+ disabledReason={disabledReason}
+ />
+ )
+}
diff --git a/products/metrics/frontend/components/MetricsFormulaInput.tsx b/products/metrics/frontend/components/MetricsFormulaInput.tsx
new file mode 100644
index 000000000000..f8ae4b5ad7e9
--- /dev/null
+++ b/products/metrics/frontend/components/MetricsFormulaInput.tsx
@@ -0,0 +1,42 @@
+import { useActions, useValues } from 'kea'
+import { useEffect, useState } from 'react'
+
+import { LemonInput, Tooltip } from '@posthog/lemon-ui'
+
+import { metricsViewerLogic, sanitizeFormulaInput } from './metricsViewerLogic'
+
+// Committed on blur/Enter (mirroring TrendsFormula) so a half-typed formula doesn't fire
+// a query per keystroke. Input is lowercased — clause aliases are lowercase and the
+// backend parser is case-sensitive.
+export function MetricsFormulaInput({ disabledReason }: { disabledReason: string | null }): JSX.Element {
+ const { formula } = useValues(metricsViewerLogic)
+ const { setFormula } = useActions(metricsViewerLogic)
+ const [draft, setDraft] = useState(formula)
+
+ // An external change (URL restore, clause reset) replaces the local draft.
+ useEffect(() => {
+ setDraft(formula)
+ }, [formula])
+
+ const commit = (): void => {
+ if (draft !== formula) {
+ setFormula(draft)
+ }
+ }
+
+ return (
+ <Tooltip title="Arithmetic over the series letters, with + - * / and parentheses. Only the formula result is charted.">
+ <LemonInput
+ size="small"
+ className="min-w-48"
+ value={draft}
+ onChange={(value) => setDraft(sanitizeFormulaInput(value))}
+ onBlur={commit}
+ onPressEnter={commit}
+ placeholder="Formula, e.g. (a - b) / a"
+ data-attr="metrics-viewer-formula"
+ disabledReason={disabledReason}
+ />
+ </Tooltip>
+ )
+}
diff --git a/products/metrics/frontend/components/MetricsQueryControls.tsx b/products/metrics/frontend/components/MetricsQueryControls.tsx
index 5c32436b6f5e..ba058901c876 100644
--- a/products/metrics/frontend/components/MetricsQueryControls.tsx
+++ b/products/metrics/frontend/components/MetricsQueryControls.tsx
@@ -1,265 +1,60 @@
import { useActions, useMountedLogic, useValues } from 'kea'
-import { ReactNode, useEffect, useMemo, useState } from 'react'
-import { IconPlusSmall } from '@posthog/icons'
-import { LemonButton, LemonInput, LemonSelect, Tooltip } from '@posthog/lemon-ui'
+import { LemonButton } from '@posthog/lemon-ui'
-import { DateFilter } from 'lib/components/DateFilter/DateFilter'
-import { dayjs } from 'lib/dayjs'
-import { useFeatureFlag } from 'lib/hooks/useFeatureFlag'
-import { CodeEditorResizeable } from 'lib/monaco/CodeEditorResizable'
-import { setPromQLCompletionProvider } from 'lib/monaco/languages/promqlCompletionRegistry'
import { getAccessControlDisabledReason } from 'lib/utils/accessControlUtils'
-import { CUSTOM_OPTION_KEY } from 'lib/utils/dateFilters'
-import { DATE_TIME_FORMAT, formatDateRange } from 'lib/utils/datetime'
-import { teamLogic } from 'scenes/teamLogic'
-import {
- type MetricsDisplayType,
- type MetricsQuery,
- type MetricsQueryLanguage,
- NodeKind,
-} from '~/queries/schema/schema-general'
-import { AccessControlLevel, AccessControlResourceType, DateMappingOption } from '~/types'
+import { type MetricsQuery, type MetricsQueryLanguage } from '~/queries/schema/schema-general'
+import { AccessControlLevel, AccessControlResourceType } from '~/types'
-import { METRICS_PANELS } from '../panels/registry'
-import { getPromQLCompletions } from '../queryLanguages/promqlCompletion'
-import { createMetricsPromQLCompletionSource } from '../queryLanguages/promqlCompletionSource'
import { MetricsChartSettings } from './MetricsChartSettings'
-import { MetricsClauseRow } from './MetricsClauseRow'
+import { MetricsDateRangeFilter } from './MetricsDateRangeFilter'
+import { MetricsDisplayTypeSelect } from './MetricsDisplayTypeSelect'
import { MetricsIntervalPicker } from './MetricsIntervalPicker'
+import { metricsQueryForLanguageSwitch, runMetricsQueryDraft } from './metricsQueryDraft'
import { MetricsQueryLanguagePicker } from './MetricsQueryLanguagePicker'
-import { MAX_CLAUSES, metricsViewerLogic, sanitizeFormulaInput } from './metricsViewerLogic'
-
-// Mirrors the curated set used by `LogsViewer/Filters/DateRangeFilter`.
-const METRICS_DATE_OPTIONS: DateMappingOption[] = [
- { key: CUSTOM_OPTION_KEY, values: [] },
- {
- key: 'Last 5 minutes',
- values: ['-5M'],
- getFormattedDate: (date: dayjs.Dayjs): string => date.subtract(5, 'minute').format(DATE_TIME_FORMAT),
- defaultInterval: 'minute',
- },
- {
- key: 'Last 30 minutes',
- values: ['-30M'],
- getFormattedDate: (date: dayjs.Dayjs): string => date.subtract(30, 'minute').format(DATE_TIME_FORMAT),
- defaultInterval: 'minute',
- },
- {
- key: 'Last 1 hour',
- values: ['-1h'],
- getFormattedDate: (date: dayjs.Dayjs): string => formatDateRange(date.subtract(1, 'h'), date.endOf('d')),
- defaultInterval: 'hour',
- },
- {
- key: 'Last 24 hours',
- values: ['-24h'],
- getFormattedDate: (date: dayjs.Dayjs): string => formatDateRange(date.subtract(24, 'h'), date.endOf('d')),
- defaultInterval: 'hour',
- },
- {
- key: 'Last 7 days',
- values: ['-7d'],
- getFormattedDate: (date: dayjs.Dayjs): string => formatDateRange(date.subtract(7, 'd'), date.endOf('d')),
- defaultInterval: 'day',
- },
-]
-
-const BASE_DISPLAY_TYPES: MetricsDisplayType[] = ['line', 'area', 'bar']
-const PANEL_DISPLAY_TYPES: MetricsDisplayType[] = ['stat', 'gauge', 'bargauge', 'table']
-
-// Shown in an empty editor, so the expected shape is visible without help text.
-const PLACEHOLDERS: Record<Exclude<MetricsQueryLanguage, 'builder'>, string> = {
- promql: 'sum by (service_name) (rate(http_requests_total))',
- sql: 'SELECT … AS time, … AS value FROM posthog.metrics WHERE timestamp >= {date_from}',
-}
-
-function MetricsQueryTextEditor({
- language,
- disabledReason,
- onRun,
-}: {
- language: Exclude<MetricsQueryLanguage, 'builder'>
- disabledReason: string | null
- onRun: () => void
-}): JSX.Element {
- const { queryDraft } = useValues(metricsViewerLogic)
- const { setQueryDraft } = useActions(metricsViewerLogic)
- const { currentTeamId } = useValues(teamLogic)
-
- useEffect(() => {
- if (language !== 'promql' || !currentTeamId) {
- return
- }
- const source = createMetricsPromQLCompletionSource(String(currentTeamId))
- // Load the metric names now, so the first suggestions do not wait for them.
- void source.metricNames('').catch(() => undefined)
- return setPromQLCompletionProvider((text, offset) => getPromQLCompletions(text, offset, source))
- }, [language, currentTeamId])
-
- return (
- <div className="w-full" data-attr={`metrics-query-editor-${language}`}>
- <CodeEditorResizeable
- // HogQL validation would flag the date placeholders, so SQL gets plain SQL highlighting.
- language={language === 'promql' ? 'promql' : 'sql'}
- value={queryDraft}
- onChange={(value) => setQueryDraft(value ?? '')}
- onPressCmdEnter={onRun}
- minHeight={language === 'sql' ? '8rem' : '2.5rem'}
- maxHeight="24rem"
- options={{
- readOnly: !!disabledReason,
- placeholder: PLACEHOLDERS[language],
- minimap: { enabled: false },
- wordWrap: 'on',
- scrollBeyondLastLine: false,
- lineNumbers: language === 'sql' ? 'on' : 'off',
- folding: false,
- glyphMargin: false,
- lineDecorationsWidth: 10,
- overviewRulerLanes: 0,
- hideCursorInOverviewRuler: true,
- renderLineHighlight: 'none',
- padding: { top: 6, bottom: 6 },
- scrollbar: { useShadows: false, verticalScrollbarSize: 8, alwaysConsumeMouseWheel: false },
- // Label values and quoted OTel names are typed inside strings.
- quickSuggestions: { other: true, comments: false, strings: true },
- }}
- />
- </div>
- )
-}
+import { MetricsQueryTextEditor } from './MetricsQueryTextEditor'
+import { MetricsSeriesBuilder } from './MetricsSeriesBuilder'
+import { metricsViewerLogic } from './metricsViewerLogic'
export interface MetricsQueryControlsProps {
/** Prefix of the `data-attr` of each control, so each surface keeps its own analytics names. */
- dataAttrPrefix: 'metrics-viewer' | 'metrics-query-editor'
+ dataAttrPrefix: 'metrics-query-editor'
/** The query a language switch converts while the builder has no metric yet. */
fallbackQuery?: MetricsQuery
/** Shows the builder / PromQL / SQL switch. Gets the query as it is now, including an unrun draft. */
onSwitchLanguage?: (current: MetricsQuery, to: MetricsQueryLanguage) => void
/** Runs the current PromQL or SQL query again when Run is pressed without a change, as after a failure. */
onRerun?: () => void
- /** Whether the result has labels. Without it, the builder's group-bys decide. */
- resultIsGrouped?: boolean
/** Offers the heatmap display, which saves a histogram query instead of a time series. */
heatmap?: { eligible: boolean }
- /** Controls after the date range and interval. */
- toolbarExtras?: ReactNode
- /** Controls after the display settings. */
- displayExtras?: ReactNode
- /** Buttons on the right of the display row. */
- actions?: ReactNode
}
-/** The metrics query controls of the `/metrics` viewer and the metrics insight editor. */
+/** The metrics query controls of the metrics insight editor. */
export function MetricsQueryControls({
dataAttrPrefix,
fallbackQuery,
onSwitchLanguage,
onRerun,
- resultIsGrouped: resultIsGroupedProp,
heatmap,
- toolbarExtras,
- displayExtras,
- actions,
}: MetricsQueryControlsProps): JSX.Element {
- const { viewerClauses, activeClauseIndex, formula, namedClauses, dateFrom, dateTo, interval } =
- useValues(metricsViewerLogic)
- const { displayType, language, queryDraft } = useValues(metricsViewerLogic)
- const { addClause, setDateFrom, setDateTo, setInterval, setDisplayType, runQueryText } =
- useActions(metricsViewerLogic)
+ const { language, queryDraft, interval } = useValues(metricsViewerLogic)
+ const { setInterval } = useActions(metricsViewerLogic)
const logic = useMountedLogic(metricsViewerLogic)
- const dashboardPanelsEnabled = useFeatureFlag('METRICS_DASHBOARD_PANELS')
const disabledReason = getAccessControlDisabledReason(AccessControlResourceType.Metrics, AccessControlLevel.Viewer)
- // A changed query runs through the query node. An unchanged one (after a failure) runs again in place.
- const runQuery = (): void => (logic.values.queryTextChanged ? runQueryText() : onRerun?.())
-
- const switchLanguage = (to: MetricsQueryLanguage): void => {
- // Read the logic at click time, so a draft the user has not run yet still converts.
- const { metricsQueryNode: node, queryDraft } = logic.values
- const current = node ?? fallbackQuery ?? { kind: NodeKind.MetricsQuery, clauses: [] }
- onSwitchLanguage?.(language === 'builder' ? current : { ...current, [language]: queryDraft.trim() }, to)
- }
-
- // A formula result is ungrouped even when its input clauses group. PromQL and SQL results can have any labels.
- const resultIsGrouped =
- resultIsGroupedProp ??
- (language !== 'builder' || (!formula && namedClauses.some((clause) => clause.groupByKeys.length > 0)))
- const displayTypeOptions = useMemo(() => {
- const types: MetricsDisplayType[] = dashboardPanelsEnabled
- ? [...BASE_DISPLAY_TYPES, ...PANEL_DISPLAY_TYPES, ...(heatmap ? (['heatmap'] as const) : [])]
- : BASE_DISPLAY_TYPES
- return types.map((value) => {
- const def = METRICS_PANELS[value]
- const reason = def.needsGroupBy
- ? !resultIsGrouped
- ? 'Add a group-by to use this panel'
- : undefined
- : def.needsHistogram && !heatmap?.eligible
- ? 'Pick a single histogram metric (no formula) to use this panel'
- : undefined
- return { value, label: def.label, disabledReason: reason }
- })
- }, [dashboardPanelsEnabled, resultIsGrouped, heatmap])
-
- const showFormulaInput = viewerClauses.length > 1 || formula !== ''
+ const runQuery = (): void => runMetricsQueryDraft(logic, onRerun)
+ const switchLanguage = (to: MetricsQueryLanguage): void =>
+ onSwitchLanguage?.(metricsQueryForLanguageSwitch(logic, fallbackQuery), to)
const dateControls = (
<div className="flex flex-wrap items-center gap-2">
- <DateFilter
- size="small"
- dateFrom={dateFrom}
- dateTo={dateTo}
- dateOptions={METRICS_DATE_OPTIONS}
- onChange={(changedDateFrom, changedDateTo) => {
- setDateFrom(changedDateFrom)
- setDateTo(changedDateTo)
- }}
- allowTimePrecision
- allowFixedRangeWithTime
- allowedRollingDateOptions={['minutes', 'hours', 'days', 'weeks']}
- use24HourFormat
- disabledReason={disabledReason}
- />
+ <MetricsDateRangeFilter disabledReason={disabledReason} />
<MetricsIntervalPicker value={interval} onChange={setInterval} disabledReason={disabledReason} />
- {toolbarExtras}
</div>
)
- const builderControls = (
- <div className="flex flex-col gap-2 flex-1 min-w-[16rem]">
- {viewerClauses.map((clause, index) => (
- <MetricsClauseRow
- key={clause.name}
- clause={clause}
- index={index}
- isActive={index === activeClauseIndex}
- showAlias={viewerClauses.length > 1}
- disabledReason={disabledReason}
- />
- ))}
- <div className="flex flex-wrap items-center gap-2">
- <LemonButton
- size="small"
- type="secondary"
- icon={<IconPlusSmall />}
- onClick={() => addClause()}
- disabledReason={
- disabledReason ??
- (viewerClauses.length >= MAX_CLAUSES
- ? `A query can have at most ${MAX_CLAUSES} series`
- : undefined)
- }
- data-attr={`${dataAttrPrefix}-add-series`}
- >
- Add series
- </LemonButton>
- {showFormulaInput && <MetricsFormulaInput disabledReason={disabledReason} />}
- </div>
- </div>
- )
+ const builderControls = <MetricsSeriesBuilder dataAttrPrefix={dataAttrPrefix} disabledReason={disabledReason} />
return (
<div className="flex flex-col gap-2" data-attr={dataAttrPrefix}>
@@ -287,68 +82,25 @@ export function MetricsQueryControls({
)}
<div className="flex flex-wrap items-center justify-between gap-2">
<div className="flex flex-wrap items-center gap-2">
- <LemonSelect
- size="small"
- value={displayType}
- options={displayTypeOptions}
- onChange={setDisplayType}
- data-attr={`${dataAttrPrefix}-display-type`}
+ <MetricsDisplayTypeSelect
+ dataAttrPrefix={dataAttrPrefix}
+ heatmap={heatmap}
disabledReason={disabledReason}
/>
<MetricsChartSettings />
- {displayExtras}
- </div>
- <div className="flex flex-wrap items-center gap-2">
- {actions}
- {language !== 'builder' && (
- <LemonButton
- type="primary"
- size="small"
- onClick={runQuery}
- disabledReason={disabledReason ?? (queryDraft.trim() ? undefined : 'Write a query first')}
- data-attr={`metrics-query-editor-run-${language}`}
- >
- Run
- </LemonButton>
- )}
</div>
+ {language !== 'builder' && (
+ <LemonButton
+ type="primary"
+ size="small"
+ onClick={runQuery}
+ disabledReason={disabledReason ?? (queryDraft.trim() ? undefined : 'Write a query first')}
+ data-attr={`metrics-query-editor-run-${language}`}
+ >
+ Run
+ </LemonButton>
+ )}
</div>
</div>
)
}
-
-// Committed on blur/Enter (mirroring TrendsFormula) so a half-typed formula doesn't fire
-// a query per keystroke. Input is lowercased — clause aliases are lowercase and the
-// backend parser is case-sensitive.
-const MetricsFormulaInput = ({ disabledReason }: { disabledReason: string | null }): JSX.Element => {
- const { formula } = useValues(metricsViewerLogic)
- const { setFormula } = useActions(metricsViewerLogic)
- const [draft, setDraft] = useState(formula)
-
- // An external change (URL restore, clause reset) replaces the local draft.
- useEffect(() => {
- setDraft(formula)
- }, [formula])
-
- const commit = (): void => {
- if (draft !== formula) {
- setFormula(draft)
- }
- }
-
- return (
- <Tooltip title="Arithmetic over the series letters, with + - * / and parentheses. Only the formula result is charted.">
- <LemonInput
- size="small"
- className="min-w-48"
- value={draft}
- onChange={(value) => setDraft(sanitizeFormulaInput(value))}
- onBlur={commit}
- onPressEnter={commit}
- placeholder="Formula, e.g. (a - b) / a"
- data-attr="metrics-viewer-formula"
- disabledReason={disabledReason}
- />
- </Tooltip>
- )
-}
diff --git a/products/metrics/frontend/components/MetricsQueryTextEditor.tsx b/products/metrics/frontend/components/MetricsQueryTextEditor.tsx
new file mode 100644
index 000000000000..9faf3e79c4cf
--- /dev/null
+++ b/products/metrics/frontend/components/MetricsQueryTextEditor.tsx
@@ -0,0 +1,74 @@
+import { useActions, useValues } from 'kea'
+import { useEffect } from 'react'
+
+import { CodeEditorResizeable } from 'lib/monaco/CodeEditorResizable'
+import { setPromQLCompletionProvider } from 'lib/monaco/languages/promqlCompletionRegistry'
+import { teamLogic } from 'scenes/teamLogic'
+
+import { type MetricsQueryLanguage } from '~/queries/schema/schema-general'
+
+import { getPromQLCompletions } from '../queryLanguages/promqlCompletion'
+import { createMetricsPromQLCompletionSource } from '../queryLanguages/promqlCompletionSource'
+import { metricsViewerLogic } from './metricsViewerLogic'
+
+// Shown in an empty editor, so the expected shape is visible without help text.
+const PLACEHOLDERS: Record<Exclude<MetricsQueryLanguage, 'builder'>, string> = {
+ promql: 'sum by (service_name) (rate(http_requests_total))',
+ sql: 'SELECT … AS time, … AS value FROM posthog.metrics WHERE timestamp >= {date_from}',
+}
+
+export function MetricsQueryTextEditor({
+ language,
+ disabledReason,
+ onRun,
+}: {
+ language: Exclude<MetricsQueryLanguage, 'builder'>
+ disabledReason: string | null
+ onRun: () => void
+}): JSX.Element {
+ const { queryDraft } = useValues(metricsViewerLogic)
+ const { setQueryDraft } = useActions(metricsViewerLogic)
+ const { currentTeamId } = useValues(teamLogic)
+
+ useEffect(() => {
+ if (language !== 'promql' || !currentTeamId) {
+ return
+ }
+ const source = createMetricsPromQLCompletionSource(String(currentTeamId))
+ // Load the metric names now, so the first suggestions do not wait for them.
+ void source.metricNames('').catch(() => undefined)
+ return setPromQLCompletionProvider((text, offset) => getPromQLCompletions(text, offset, source))
+ }, [language, currentTeamId])
+
+ return (
+ <div className="w-full" data-attr={`metrics-query-editor-${language}`}>
+ <CodeEditorResizeable
+ // HogQL validation would flag the date placeholders, so SQL gets plain SQL highlighting.
+ language={language === 'promql' ? 'promql' : 'sql'}
+ value={queryDraft}
+ onChange={(value) => setQueryDraft(value ?? '')}
+ onPressCmdEnter={onRun}
+ minHeight={language === 'sql' ? '8rem' : '2.5rem'}
+ maxHeight="24rem"
+ options={{
+ readOnly: !!disabledReason,
+ placeholder: PLACEHOLDERS[language],
+ minimap: { enabled: false },
+ wordWrap: 'on',
+ scrollBeyondLastLine: false,
+ lineNumbers: language === 'sql' ? 'on' : 'off',
+ folding: false,
+ glyphMargin: false,
+ lineDecorationsWidth: 10,
+ overviewRulerLanes: 0,
+ hideCursorInOverviewRuler: true,
+ renderLineHighlight: 'none',
+ padding: { top: 6, bottom: 6 },
+ scrollbar: { useShadows: false, verticalScrollbarSize: 8, alwaysConsumeMouseWheel: false },
+ // Label values and quoted OTel names are typed inside strings.
+ quickSuggestions: { other: true, comments: false, strings: true },
+ }}
+ />
+ </div>
+ )
+}
diff --git a/products/metrics/frontend/components/MetricsRefreshButton.tsx b/products/metrics/frontend/components/MetricsRefreshButton.tsx
new file mode 100644
index 000000000000..ed9b79946a3d
--- /dev/null
+++ b/products/metrics/frontend/components/MetricsRefreshButton.tsx
@@ -0,0 +1,53 @@
+import { useActions, useValues } from 'kea'
+
+import { IconRefresh } from '@posthog/icons'
+import { LemonButton, LemonSwitch } from '@posthog/lemon-ui'
+
+import { LIVE_REFRESH_MS, metricsViewerLogic } from './metricsViewerLogic'
+
+export function MetricsRefreshButton({
+ disabledReason,
+ noQueryReason,
+}: {
+ disabledReason: string | null
+ noQueryReason: string | undefined
+}): JSX.Element {
+ const { liveRefresh, queryLoading } = useValues(metricsViewerLogic)
+ const { setLiveRefresh, refresh } = useActions(metricsViewerLogic)
+ const refreshSeconds = LIVE_REFRESH_MS / 1000
+
+ return (
+ <LemonButton
+ size="small"
+ type="secondary"
+ icon={<IconRefresh />}
+ onClick={() => refresh()}
+ loading={queryLoading}
+ tooltip={liveRefresh ? `Refreshing every ${refreshSeconds}s` : 'Refresh'}
+ disabledReason={disabledReason ?? noQueryReason}
+ data-attr="metrics-viewer-refresh"
+ sideAction={{
+ 'data-attr': 'metrics-viewer-refresh-options',
+ tooltip: 'Auto-refresh',
+ dropdown: {
+ placement: 'bottom-end',
+ actionable: true,
+ closeOnClickInside: false,
+ overlay: (
+ <div className="p-1">
+ <LemonSwitch
+ label={`Auto-refresh every ${refreshSeconds}s`}
+ checked={liveRefresh}
+ onChange={setLiveRefresh}
+ data-attr="metrics-viewer-live-toggle"
+ disabledReason={disabledReason}
+ />
+ </div>
+ ),
+ },
+ }}
+ >
+ {liveRefresh ? `Every ${refreshSeconds}s` : null}
+ </LemonButton>
+ )
+}
diff --git a/products/metrics/frontend/components/MetricsSamplesPanel.tsx b/products/metrics/frontend/components/MetricsSamplesPanel.tsx
index 08a7561cf3b6..6356f3c9534b 100644
--- a/products/metrics/frontend/components/MetricsSamplesPanel.tsx
+++ b/products/metrics/frontend/components/MetricsSamplesPanel.tsx
@@ -3,7 +3,7 @@ import { useActions, useValues } from 'kea'
import { Fragment, useEffect, useRef, useState } from 'react'
import { IconCollapse, IconExpand } from '@posthog/icons'
-import { LemonButton, LemonSegmentedButton, LemonTable, LemonTabs, Link, Tooltip } from '@posthog/lemon-ui'
+import { LemonBanner, LemonButton, LemonTable, LemonTabs, Link, Tooltip } from '@posthog/lemon-ui'
import { getColorVar } from 'lib/colors'
import { TZLabel } from 'lib/components/TZLabel'
@@ -17,14 +17,16 @@ import { AccessControlLevel, AccessControlResourceType } from '~/types'
import { LogRowScrollButtons } from 'products/logs/frontend/components/VirtualizedLogsList/LogRowScrollButtons'
import { useOpenTraceDialog } from 'products/tracing/frontend/components/TraceDialog/useOpenTraceDialog'
-import { type MetricsSeriesRow, type MetricsPanelTab, metricsSamplesLogic } from './metricsSamplesLogic'
+import { type MetricsPanelTab, type MetricsSeriesRow, metricsSamplesLogic } from './metricsSamplesLogic'
+import { type MetricsSampleRow } from './metricsSamplesMerge'
import { metricsUsageTrackingLogic } from './metricsUsageTrackingLogic'
import { metricsViewerLogic } from './metricsViewerLogic'
import { SampleAttributes } from './SampleAttributes'
function SamplesTab(): JSX.Element {
- const { samples, samplesLoading } = useValues(metricsSamplesLogic)
- const { hasMetricName } = useValues(metricsViewerLogic)
+ const { samples, samplesLoading, failedSampleClauses } = useValues(metricsSamplesLogic)
+ const { hasMetricName, namedClauses } = useValues(metricsViewerLogic)
+ const multipleSeries = namedClauses.length > 1
const { timezone } = useValues(teamLogic)
const { sampleRowExpanded, tracePivotClicked } = useActions(metricsUsageTrackingLogic)
const openTraceDialog = useOpenTraceDialog()
@@ -34,93 +36,116 @@ function SamplesTab(): JSX.Element {
)
return (
- <LemonTable
- dataSource={samples}
- loading={samplesLoading}
- size="small"
- rowKey={(sample, rowIndex) => `${rowIndex}-${sample.timestamp}-${sample.trace_id}`}
- emptyState={
- hasMetricName
- ? 'No emissions for this metric in the selected range.'
- : 'Pick a metric to see its raw emissions.'
- }
- expandable={{
- expandedRowRender: (sample) => <SampleAttributes sample={sample} />,
- onRowExpand: (sample) => sampleRowExpanded(sample),
- }}
- columns={[
- {
- title: 'Timestamp',
- key: 'timestamp',
- render: (_, sample) => (
- <TZLabel
- time={sample.timestamp}
- formatDate="MMM D"
- formatTime="HH:mm:ss"
- displayTimezone={timezone}
- />
- ),
- },
- {
- title: 'Value',
- key: 'value',
- align: 'right',
- render: (_, sample) => (
- <Tooltip
- title={
- sample.count > 1
- ? `Distribution sum over ${sample.count} observations${sample.unit ? ` (${sample.unit})` : ''}`
- : sample.unit || undefined
- }
- >
- <span className="font-mono">{humanFriendlyNumber(sample.value, 2)}</span>
- </Tooltip>
- ),
- },
- {
- title: 'Trace',
- key: 'trace',
- render: (_, sample) =>
- sample.trace_id && !tracingDisabledReason ? (
- <Tooltip title="Open the trace this emission was recorded in">
- <Link
- to={traceUrl({
- traceId: sample.trace_id,
- spanId: sample.span_id || null,
- ts: sample.timestamp,
- })}
- className="font-mono"
- onClick={(event) => {
- tracePivotClicked(sample)
- openTraceDialog(
- event,
- {
- traceId: sample.trace_id,
- spanId: sample.span_id || null,
- ts: sample.timestamp,
- },
- { entryPoint: 'metric_sample' }
- )
- }}
- >
- {/* Link doesn't take data-attr; the span gives autocapture a named element. */}
- <span data-attr="metrics-trace-pivot">
- {sample.trace_id.slice(0, 8).toLowerCase()}
- </span>
- </Link>
- </Tooltip>
- ) : sample.trace_id ? (
- <Tooltip title={tracingDisabledReason}>
- <span className="font-mono text-secondary cursor-not-allowed">
- {sample.trace_id.slice(0, 8).toLowerCase()}
- </span>
+ <>
+ {failedSampleClauses.length > 0 && (
+ <LemonBanner type="warning" className="mb-2" data-attr="metrics-samples-partial-failure">
+ Couldn't load samples for series {failedSampleClauses.join(', ')}. The table shows the other series
+ only.
+ </LemonBanner>
+ )}
+ <LemonTable
+ dataSource={samples}
+ loading={samplesLoading}
+ size="small"
+ rowKey={(sample, rowIndex) => `${rowIndex}-${sample.timestamp}-${sample.trace_id}`}
+ emptyState={
+ hasMetricName
+ ? multipleSeries
+ ? 'No emissions for these metrics in the selected range.'
+ : 'No emissions for this metric in the selected range.'
+ : 'Pick a metric to see its raw emissions.'
+ }
+ expandable={{
+ expandedRowRender: (sample) => <SampleAttributes sample={sample} />,
+ onRowExpand: (sample) => sampleRowExpanded(sample),
+ }}
+ columns={[
+ ...(multipleSeries
+ ? [
+ {
+ title: 'Series',
+ key: 'series',
+ render: (_: unknown, sample: MetricsSampleRow) => (
+ <Tooltip title={sample.metric_name}>
+ <span className="font-mono">{sample.clauses.join(', ')}</span>
+ </Tooltip>
+ ),
+ },
+ ]
+ : []),
+ {
+ title: 'Timestamp',
+ key: 'timestamp',
+ render: (_, sample) => (
+ <TZLabel
+ time={sample.timestamp}
+ formatDate="MMM D"
+ formatTime="HH:mm:ss"
+ displayTimezone={timezone}
+ />
+ ),
+ },
+ {
+ title: 'Value',
+ key: 'value',
+ align: 'right',
+ render: (_, sample) => (
+ <Tooltip
+ title={
+ sample.count > 1
+ ? `Distribution sum over ${sample.count} observations${sample.unit ? ` (${sample.unit})` : ''}`
+ : sample.unit || undefined
+ }
+ >
+ <span className="font-mono">{humanFriendlyNumber(sample.value, 2)}</span>
</Tooltip>
- ) : (
- <span className="text-secondary">—</span>
),
- },
- ]}
- />
+ },
+ {
+ title: 'Trace',
+ key: 'trace',
+ render: (_, sample) =>
+ sample.trace_id && !tracingDisabledReason ? (
+ <Tooltip title="Open the trace this emission was recorded in">
+ <Link
+ to={traceUrl({
+ traceId: sample.trace_id,
+ spanId: sample.span_id || null,
+ ts: sample.timestamp,
+ })}
+ className="font-mono"
+ onClick={(event) => {
+ tracePivotClicked(sample)
+ openTraceDialog(
+ event,
+ {
+ traceId: sample.trace_id,
+ spanId: sample.span_id || null,
+ ts: sample.timestamp,
+ },
+ { entryPoint: 'metric_sample' }
+ )
+ }}
+ >
+ {/* Link doesn't take data-attr; the span gives autocapture a named element. */}
+ <span data-attr="metrics-trace-pivot">
+ {sample.trace_id.slice(0, 8).toLowerCase()}
+ </span>
+ </Link>
+ </Tooltip>
+ ) : sample.trace_id ? (
+ <Tooltip title={tracingDisabledReason}>
+ <span className="font-mono text-secondary cursor-not-allowed">
+ {sample.trace_id.slice(0, 8).toLowerCase()}
+ </span>
+ </Tooltip>
+ ) : (
+ <span className="text-secondary">—</span>
+ ),
+ },
+ ]}
+ />
+ </>
)
}
@@ -294,42 +319,18 @@ function SeriesTab(): JSX.Element {
)
}
-/** Side panel next to the chart: per-series totals, or the raw emissions
+/** Panel under the chart: per-series totals, or the raw emissions
* behind the chart with a link to the trace each one was recorded in. */
export function MetricsSamplesPanel(): JSX.Element {
const { activeTab } = useValues(metricsSamplesLogic)
const { setActiveTab } = useActions(metricsSamplesLogic)
- const { viewerClauses, activeClauseIndex } = useValues(metricsViewerLogic)
- const { setActiveClauseIndex } = useActions(metricsViewerLogic)
const metricsViewerDisabledReason = getAccessControlDisabledReason(
AccessControlResourceType.Metrics,
AccessControlLevel.Viewer
)
return (
- <div className="border rounded p-2 overflow-y-auto">
- {/* Samples and the anomaly badge describe one series at a time; with several
- clauses this picks which one they follow. The Series tab always covers all series. */}
- {viewerClauses.length > 1 && (
- <div className="flex flex-wrap items-center gap-2 pb-1">
- <span className="text-xs text-secondary">Samples follow series</span>
- <LemonSegmentedButton
- size="xsmall"
- value={activeClauseIndex}
- onChange={(index) => {
- if (!metricsViewerDisabledReason) {
- setActiveClauseIndex(index)
- }
- }}
- options={viewerClauses.map((clause, index) => ({
- value: index,
- label: clause.name,
- tooltip: clause.metricName.trim() || 'No metric picked',
- }))}
- data-attr="metrics-samples-panel-series-picker"
- />
- </div>
- )}
+ <div className="border rounded p-2 overflow-y-auto bg-surface-primary flex-1 min-h-0">
<LemonTabs<MetricsPanelTab>
size="small"
activeKey={activeTab}
diff --git a/products/metrics/frontend/components/MetricsSeriesBuilder.tsx b/products/metrics/frontend/components/MetricsSeriesBuilder.tsx
new file mode 100644
index 000000000000..508904dcb003
--- /dev/null
+++ b/products/metrics/frontend/components/MetricsSeriesBuilder.tsx
@@ -0,0 +1,58 @@
+import { useActions, useValues } from 'kea'
+
+import { IconPlusSmall } from '@posthog/icons'
+import { LemonButton } from '@posthog/lemon-ui'
+
+import { MetricsClauseRow } from './MetricsClauseRow'
+import { MetricsFormulaInput } from './MetricsFormulaInput'
+import { MAX_CLAUSES, metricsViewerLogic } from './metricsViewerLogic'
+
+export function MetricsSeriesBuilder({
+ dataAttrPrefix,
+ disabledReason,
+}: {
+ dataAttrPrefix: string
+ disabledReason: string | null
+}): JSX.Element {
+ const { viewerClauses, activeClauseIndex, formula } = useValues(metricsViewerLogic)
+ const { addClause } = useActions(metricsViewerLogic)
+
+ const showFormulaInput = viewerClauses.length > 1 || formula !== ''
+
+ return (
+ <div
+ className="flex flex-col flex-1 min-w-[16rem] border rounded bg-surface-primary divide-y"
+ data-attr={`${dataAttrPrefix}-series`}
+ >
+ {viewerClauses.map((clause, index) => (
+ <div key={clause.name} className="p-2">
+ <MetricsClauseRow
+ clause={clause}
+ index={index}
+ isActive={index === activeClauseIndex}
+ showAlias={viewerClauses.length > 1}
+ disabledReason={disabledReason}
+ />
+ </div>
+ ))}
+ <div className="flex flex-wrap items-center gap-2 p-2 bg-surface-secondary rounded-b">
+ <LemonButton
+ size="small"
+ type="tertiary"
+ icon={<IconPlusSmall />}
+ onClick={() => addClause()}
+ disabledReason={
+ disabledReason ??
+ (viewerClauses.length >= MAX_CLAUSES
+ ? `A query can have at most ${MAX_CLAUSES} series`
+ : undefined)
+ }
+ data-attr={`${dataAttrPrefix}-add-series`}
+ >
+ Add series
+ </LemonButton>
+ {showFormulaInput && <MetricsFormulaInput disabledReason={disabledReason} />}
+ </div>
+ </div>
+ )
+}
diff --git a/products/metrics/frontend/components/MetricsViewer.test.tsx b/products/metrics/frontend/components/MetricsViewer.test.tsx
index 9747908dbf29..e391282936b3 100644
--- a/products/metrics/frontend/components/MetricsViewer.test.tsx
+++ b/products/metrics/frontend/components/MetricsViewer.test.tsx
@@ -181,7 +181,8 @@ describe('MetricsViewer', () => {
</Provider>
)
- fireEvent.click(screen.getByText('Add to dashboard'))
+ fireEvent.click(screen.getByText('Save'))
+ fireEvent.click(await screen.findByText('Add to dashboard'))
fireEvent.click(await screen.findByText('Add to a new dashboard'))
diff --git a/products/metrics/frontend/components/MetricsViewer.tsx b/products/metrics/frontend/components/MetricsViewer.tsx
index ba813bfed0e3..7882f0974e78 100644
--- a/products/metrics/frontend/components/MetricsViewer.tsx
+++ b/products/metrics/frontend/components/MetricsViewer.tsx
@@ -1,159 +1,39 @@
import { useActions, useMountedLogic, useValues } from 'kea'
-import { router } from 'kea-router'
-import { useEffect, useMemo } from 'react'
-
-import { LemonBanner, LemonButton, LemonSwitch, SpinnerOverlay } from '@posthog/lemon-ui'
+import { useEffect } from 'react'
import { AddToDashboardModal } from 'lib/components/AddToDashboard/AddToDashboardModal'
-import { traceUrl } from 'lib/components/ViewTraceButton/traceUrl'
-import { dayjs } from 'lib/dayjs'
import { useFeatureFlag } from 'lib/hooks/useFeatureFlag'
-import { getAccessControlDisabledReason } from 'lib/utils/accessControlUtils'
import { NewDashboardModal } from 'scenes/dashboard/NewDashboardModal'
import { teamLogic } from 'scenes/teamLogic'
-import { urls } from 'scenes/urls'
-
-import { AccessControlLevel, AccessControlResourceType } from '~/types'
-
-import { useOpenTraceDialog } from 'products/tracing/frontend/components/TraceDialog/useOpenTraceDialog'
import { getMetricsInsightEditorDisabledReason } from '../metricsAccess'
-import { MetricsHistogramQueryNode } from '../nodes/MetricsHistogramQueryNode'
-import { MetricsPanel } from '../panels/MetricsPanel'
-import { MetricsFacetRailLayout, MetricsFacetRailToggle } from './FacetRail/MetricsFacetRail'
-import { MetricsAnomalyPanel } from './MetricsAnomalyPanel'
-import { type MetricsExemplar } from './MetricsExemplarMarkers'
-import { MetricsLogsSourceTag } from './MetricsLogsSourceTag'
-import { MetricsPercentileResolutionHint } from './MetricsPercentileResolutionHint'
-import { MetricsQueryControls } from './MetricsQueryControls'
-import { switchMetricsQueryLanguage } from './metricsQueryLanguageSwitch'
-import { MetricsRelatedMenu } from './MetricsRelatedMenu'
+import { MetricsFacetRail, MetricsFacetRailToggle } from './FacetRail/MetricsFacetRail'
import { metricsSamplesLogic } from './metricsSamplesLogic'
import { MetricsSamplesPanel } from './MetricsSamplesPanel'
-import { metricsStarterDashboardLogic } from './metricsStarterDashboardLogic'
import { MetricsStarterDashboardModal } from './MetricsStarterDashboardModal'
-import { metricsUsageTrackingLogic } from './metricsUsageTrackingLogic'
-import { LIVE_REFRESH_MS, MAX_UNAGGREGATED_SERIES, metricsViewerLogic } from './metricsViewerLogic'
+import { MetricsViewerChart } from './MetricsViewerChart'
+import { MetricsViewerChartHeader } from './MetricsViewerChartHeader'
+import { metricsViewerLogic } from './metricsViewerLogic'
+import { MetricsViewerQueryBar } from './MetricsViewerQueryBar'
export const MetricsViewer = (): JSX.Element => {
const logic = metricsViewerLogic()
// The side panel's logic listens to this viewer's filter changes; mounting it
// here keeps samples in sync even while the panel itself is off-screen.
useMountedLogic(metricsSamplesLogic())
- const { openModal: openStarterDashboardModal } = useActions(metricsStarterDashboardLogic)
const {
- formula,
queryFingerprint,
anomalyFingerprint,
- metricName,
dateFrom,
dateTo,
- chartSeries,
- anomalyBadge,
- liveRefresh,
- queryLoading,
- queryError,
- savedInsightLoading,
savedInsight,
isAddToDashboardModalOpen,
hasMetricName,
- hasQuery,
language,
- queryText,
- hasResults,
- queryResults,
- seriesCapReached,
- displayType,
- metricsDisplay,
- heatmapEligible,
- histogramQueryNode,
- metricsQueryNode,
} = useValues(logic)
- const {
- setLiveRefresh,
- fetchQueryResults,
- fetchAnomaly,
- clearAnomaly,
- saveAsInsight,
- addToDashboard,
- createAlert,
- closeAddToDashboardModal,
- applyQuery,
- } = useActions(logic)
- const { traceExemplars, errorSpikes, showErrorSpikes } = useValues(metricsSamplesLogic)
+ const { fetchQueryResults, fetchAnomaly, clearAnomaly, closeAddToDashboardModal } = useActions(logic)
const { timezone } = useValues(teamLogic)
- const { toggleShowErrorSpikes } = useActions(metricsSamplesLogic)
- // Staff-only PoC gate, layered on top of the wider metrics alpha flag.
- const errorOverlaysEnabled = useFeatureFlag('METRICS_ERROR_OVERLAYS')
-
- // Gate on the result shape, not the clause edits: a formula result is ungrouped even
- // when its input clauses group, and a clause without a metric name never runs.
- const resultIsGrouped = chartSeries.some((s) => Object.keys(s.labels).length > 0)
- // The heatmap saves a MetricsHistogramQuery, but insight alerts only support MetricsQuery,
- // so alert creation would save a query the alerts page cannot validate.
- const isHeatmap = displayType === 'heatmap' && histogramQueryNode !== null
- const { exemplarDotClicked } = useActions(metricsUsageTrackingLogic)
- const metricsViewerDisabledReason = getAccessControlDisabledReason(
- AccessControlResourceType.Metrics,
- AccessControlLevel.Viewer
- )
const insightEditorDisabledReason = getMetricsInsightEditorDisabledReason()
- const noQueryReason = hasQuery ? undefined : language === 'builder' ? 'Pick a metric first' : 'Write a query first'
- const openTraceDialog = useOpenTraceDialog()
- const tracingDisabledReason = getAccessControlDisabledReason(
- AccessControlResourceType.Tracing,
- AccessControlLevel.Viewer
- )
- const errorTrackingDisabledReason = getAccessControlDisabledReason(
- AccessControlResourceType.ErrorTracking,
- AccessControlLevel.Viewer
- )
-
- // Clickable dots along the bottom of the chart: traced emissions (the
- // metric->trace pivot) and Error Tracking issue spikes (team-wide — spike
- // events carry no service attribution). Each kind is skipped entirely when
- // the user can't view its target product, so a dot never leads to a dead
- // end. One memo, so the chart prop keeps a stable identity across renders.
- const chartMarkers: MetricsExemplar[] = useMemo(() => {
- const traceMarkers: MetricsExemplar[] = tracingDisabledReason
- ? []
- : traceExemplars.map((exemplar) => ({
- timeMs: dayjs(exemplar.timestamp).valueOf(),
- tooltipLabel: `Traced emission at ${dayjs(exemplar.timestamp).tz(timezone).format('D MMM HH:mm:ss')}. Click to view the trace.`,
- onClick: (event) => {
- exemplarDotClicked(!!exemplar.spanId)
- const trace = {
- traceId: exemplar.traceId,
- spanId: exemplar.spanId || null,
- ts: exemplar.timestamp,
- }
- if (!openTraceDialog(event, trace, { entryPoint: 'metric_exemplar' })) {
- router.actions.push(traceUrl(trace))
- }
- },
- }))
- const spikeMarkers: MetricsExemplar[] =
- !errorOverlaysEnabled || errorTrackingDisabledReason
- ? []
- : errorSpikes.map((spike) => ({
- timeMs: dayjs(spike.detected_at).valueOf(),
- color: 'danger',
- tooltipLabel: `Error spike at ${dayjs(spike.detected_at).tz(timezone).format('D MMM HH:mm:ss')}: ${spike.issue_name ?? 'Untitled issue'}. Click to view the issue.`,
- onClick: () => {
- router.actions.push(urls.errorTrackingIssue(spike.issue_id, { timestamp: spike.detected_at }))
- },
- }))
- return [...traceMarkers, ...spikeMarkers]
- }, [
- traceExemplars,
- tracingDisabledReason,
- exemplarDotClicked,
- openTraceDialog,
- errorSpikes,
- errorOverlaysEnabled,
- errorTrackingDisabledReason,
- timezone,
- ])
// Refetch the chart whenever the effective query changes — the fingerprints are
// strings, so edits that don't change the request (a blank just-added row, a
@@ -174,103 +54,15 @@ export const MetricsViewer = (): JSX.Element => {
}
}, [anomalyFingerprint, dateFrom, dateTo, hasMetricName, timezone]) // eslint-disable-line react-hooks/exhaustive-deps
- const languagesEnabled = useFeatureFlag('METRICS_QUERY_LANGUAGES')
// The rail writes builder filter chips, which PromQL and SQL queries do not read.
const facetRailEnabled = useFeatureFlag('METRICS') && language === 'builder'
return (
- <MetricsFacetRailLayout enabled={facetRailEnabled}>
- <MetricsQueryControls
- dataAttrPrefix="metrics-viewer"
- onSwitchLanguage={
- languagesEnabled ? (current, to) => switchMetricsQueryLanguage(current, to, applyQuery) : undefined
- }
- onRerun={() => fetchQueryResults({})}
- resultIsGrouped={resultIsGrouped}
- heatmap={{ eligible: heatmapEligible }}
- toolbarExtras={
- <>
- {facetRailEnabled && <MetricsFacetRailToggle />}
- <LemonSwitch
- label="Auto-refresh"
- checked={liveRefresh}
- onChange={setLiveRefresh}
- tooltip={`Refreshes every ${LIVE_REFRESH_MS / 1000}s`}
- bordered
- data-attr="metrics-viewer-live-toggle"
- disabledReason={metricsViewerDisabledReason}
- />
- {/* Hidden (not disabled) without Error Tracking view access, so the
- toggle never references a product the user cannot see. */}
- {errorOverlaysEnabled && !errorTrackingDisabledReason && (
- <LemonSwitch
- label="Error spikes"
- checked={showErrorSpikes}
- onChange={toggleShowErrorSpikes}
- tooltip="Mark Error Tracking issue spikes on the chart (team-wide, PoC)"
- bordered
- data-attr="metrics-viewer-error-spikes-toggle"
- disabledReason={metricsViewerDisabledReason}
- />
- )}
- </>
- }
- displayExtras={
- <>
- <MetricsRelatedMenu />
- {anomalyBadge && <MetricsAnomalyPanel anomaly={anomalyBadge} />}
- <MetricsLogsSourceTag metricName={metricName} />
- </>
- }
- actions={
- <>
- <LemonButton
- size="small"
- type="secondary"
- onClick={() => saveAsInsight()}
- loading={savedInsightLoading}
- disabledReason={insightEditorDisabledReason ?? noQueryReason}
- >
- Save as insight
- </LemonButton>
- <LemonButton
- size="small"
- type="secondary"
- onClick={() => createAlert()}
- loading={savedInsightLoading}
- tooltip="Get notified when this metric crosses a threshold (uses insight alerts)"
- disabledReason={
- insightEditorDisabledReason ??
- noQueryReason ??
- (isHeatmap ? 'Alerts are not supported for the heatmap display' : undefined)
- }
- data-attr="metrics-viewer-create-alert"
- >
- Create alert
- </LemonButton>
- <LemonButton
- size="small"
- type="primary"
- onClick={() => addToDashboard()}
- loading={savedInsightLoading}
- disabledReason={insightEditorDisabledReason ?? noQueryReason}
- data-attr="metrics-viewer-add-to-dashboard"
- >
- Add to dashboard
- </LemonButton>
- <LemonButton
- size="small"
- type="secondary"
- onClick={openStarterDashboardModal}
- tooltip="Create a dashboard with one insight per metric, charted as one line per series"
- data-attr="metrics-viewer-starter-dashboard"
- disabledReason={insightEditorDisabledReason}
- >
- New service dashboard
- </LemonButton>
- </>
- }
- />
+ <div
+ className="@container/facet-rail-host flex flex-col gap-2 flex-1 min-h-0 overflow-y-auto"
+ data-attr="metrics-viewer"
+ >
+ <MetricsViewerQueryBar />
<MetricsStarterDashboardModal />
{savedInsight && (
<>
@@ -286,59 +78,23 @@ export const MetricsViewer = (): JSX.Element => {
<NewDashboardModal />
</>
)}
- <div className="flex flex-col xl:flex-row gap-3 items-stretch">
- <div className="flex-1 min-w-0">
- {seriesCapReached && (
- <LemonBanner type="info" className="mb-2" data-attr="metrics-series-cap-banner">
- Showing the {MAX_UNAGGREGATED_SERIES} most recently active series. Add a filter or an
- operation to narrow the chart.
- </LemonBanner>
- )}
- <div className="relative h-[360px] border rounded p-3">
- {!hasQuery ? (
- <div className="h-full flex items-center justify-center text-secondary text-sm">
- {language === 'builder'
- ? 'Pick a metric to see its time series.'
- : 'Run a query to see results.'}
- </div>
- ) : isHeatmap && histogramQueryNode ? (
- // The heatmap runs its own histogram query, so it mounts the histogram
- // node rather than consuming the time-series result the other panels share.
- // It comes before the error/loading branches: the shared time-series
- // request still runs for the samples panel, and its failure must not
- // mask an independently loaded histogram.
- <MetricsHistogramQueryNode query={histogramQueryNode} context={{}} />
- ) : queryError ? (
- <div className="h-full flex items-center justify-center">
- <LemonBanner type="error" className="w-full max-w-md">
- {queryError}
- </LemonBanner>
- </div>
- ) : hasResults ? (
- <MetricsPanel
- series={chartSeries}
- fallbackName={formula || metricName || (language === 'promql' ? queryText : 'metric')}
- display={metricsDisplay}
- exemplars={chartMarkers}
- query={metricsQueryNode ?? undefined}
- />
- ) : !queryLoading ? (
- <div className="h-full flex items-center justify-center text-secondary text-sm">
- No data for this metric in the selected range.
+ <div className="flex flex-col border rounded bg-surface-primary shrink-0">
+ <MetricsViewerChartHeader />
+ <MetricsViewerChart />
+ </div>
+ {(facetRailEnabled || hasMetricName) && (
+ <div className="flex flex-row gap-2 flex-1 min-h-96 @max-[48rem]/facet-rail-host:flex-col">
+ {facetRailEnabled && <MetricsFacetRail />}
+ <div className="flex flex-col gap-2 flex-1 min-w-0 min-h-0">
+ {facetRailEnabled && (
+ <div className="flex">
+ <MetricsFacetRailToggle />
</div>
- ) : null}
- {queryLoading && !isHeatmap && <SpinnerOverlay />}
+ )}
+ {hasMetricName && <MetricsSamplesPanel />}
</div>
- {hasResults && !isHeatmap && !queryError && (
- <MetricsPercentileResolutionHint series={queryResults} metricName={metricName} />
- )}
</div>
- {hasMetricName && (
- <div className="xl:w-[26rem] shrink-0 xl:max-h-[360px] flex flex-col">
- <MetricsSamplesPanel />
- </div>
- )}
- </div>
- </MetricsFacetRailLayout>
+ )}
+ </div>
)
}
diff --git a/products/metrics/frontend/components/MetricsViewerChart.tsx b/products/metrics/frontend/components/MetricsViewerChart.tsx
new file mode 100644
index 000000000000..f1ecc01ff0f5
--- /dev/null
+++ b/products/metrics/frontend/components/MetricsViewerChart.tsx
@@ -0,0 +1,162 @@
+import { useActions, useValues } from 'kea'
+import { router } from 'kea-router'
+import { useMemo } from 'react'
+
+import { LemonBanner, SpinnerOverlay } from '@posthog/lemon-ui'
+
+import { traceUrl } from 'lib/components/ViewTraceButton/traceUrl'
+import { dayjs } from 'lib/dayjs'
+import { useFeatureFlag } from 'lib/hooks/useFeatureFlag'
+import { getAccessControlDisabledReason } from 'lib/utils/accessControlUtils'
+import { teamLogic } from 'scenes/teamLogic'
+import { urls } from 'scenes/urls'
+
+import { AccessControlLevel, AccessControlResourceType } from '~/types'
+
+import { useOpenTraceDialog } from 'products/tracing/frontend/components/TraceDialog/useOpenTraceDialog'
+
+import { MetricsHistogramQueryNode } from '../nodes/MetricsHistogramQueryNode'
+import { MetricsPanel } from '../panels/MetricsPanel'
+import { type MetricsExemplar } from './MetricsExemplarMarkers'
+import { MetricsPercentileResolutionHint } from './MetricsPercentileResolutionHint'
+import { metricsSamplesLogic } from './metricsSamplesLogic'
+import { metricsUsageTrackingLogic } from './metricsUsageTrackingLogic'
+import { MAX_UNAGGREGATED_SERIES, metricsViewerLogic } from './metricsViewerLogic'
+
+/**
+ * Clickable dots along the bottom of the chart: traced emissions (the metric->trace pivot) and
+ * Error Tracking issue spikes (team-wide — spike events carry no service attribution). Each kind
+ * is skipped entirely when the user can't view its target product, so a dot never leads to a dead end.
+ */
+function useChartMarkers(): MetricsExemplar[] {
+ const { traceExemplars, errorSpikes } = useValues(metricsSamplesLogic)
+ const { timezone } = useValues(teamLogic)
+ const { exemplarDotClicked } = useActions(metricsUsageTrackingLogic)
+ const openTraceDialog = useOpenTraceDialog()
+ // Staff-only PoC gate, layered on top of the wider metrics alpha flag.
+ const errorOverlaysEnabled = useFeatureFlag('METRICS_ERROR_OVERLAYS')
+ const tracingDisabledReason = getAccessControlDisabledReason(
+ AccessControlResourceType.Tracing,
+ AccessControlLevel.Viewer
+ )
+ const errorTrackingDisabledReason = getAccessControlDisabledReason(
+ AccessControlResourceType.ErrorTracking,
+ AccessControlLevel.Viewer
+ )
+
+ // One memo, so the chart prop keeps a stable identity across renders.
+ return useMemo(() => {
+ const traceMarkers: MetricsExemplar[] = tracingDisabledReason
+ ? []
+ : traceExemplars.map((exemplar) => ({
+ timeMs: dayjs(exemplar.timestamp).valueOf(),
+ tooltipLabel: `Traced emission at ${dayjs(exemplar.timestamp).tz(timezone).format('D MMM HH:mm:ss')}. Click to view the trace.`,
+ onClick: (event) => {
+ exemplarDotClicked(!!exemplar.spanId)
+ const trace = {
+ traceId: exemplar.traceId,
+ spanId: exemplar.spanId || null,
+ ts: exemplar.timestamp,
+ }
+ if (!openTraceDialog(event, trace, { entryPoint: 'metric_exemplar' })) {
+ router.actions.push(traceUrl(trace))
+ }
+ },
+ }))
+ const spikeMarkers: MetricsExemplar[] =
+ !errorOverlaysEnabled || errorTrackingDisabledReason
+ ? []
+ : errorSpikes.map((spike) => ({
+ timeMs: dayjs(spike.detected_at).valueOf(),
+ color: 'danger',
+ tooltipLabel: `Error spike at ${dayjs(spike.detected_at).tz(timezone).format('D MMM HH:mm:ss')}: ${spike.issue_name ?? 'Untitled issue'}. Click to view the issue.`,
+ onClick: () => {
+ router.actions.push(urls.errorTrackingIssue(spike.issue_id, { timestamp: spike.detected_at }))
+ },
+ }))
+ return [...traceMarkers, ...spikeMarkers]
+ }, [
+ traceExemplars,
+ tracingDisabledReason,
+ exemplarDotClicked,
+ openTraceDialog,
+ errorSpikes,
+ errorOverlaysEnabled,
+ errorTrackingDisabledReason,
+ timezone,
+ ])
+}
+
+/** The chart card's body: the chart or heatmap, with its empty, error and loading states. */
+export function MetricsViewerChart(): JSX.Element {
+ const {
+ hasQuery,
+ language,
+ isHeatmap,
+ histogramQueryNode,
+ refreshCount,
+ queryError,
+ hasResults,
+ queryLoading,
+ chartSeries,
+ formula,
+ metricName,
+ queryText,
+ metricsDisplay,
+ metricsQueryNode,
+ seriesCapReached,
+ queryResults,
+ } = useValues(metricsViewerLogic)
+ const chartMarkers = useChartMarkers()
+
+ return (
+ <>
+ {seriesCapReached && (
+ <LemonBanner type="info" className="m-2 mb-0" data-attr="metrics-series-cap-banner">
+ Showing the {MAX_UNAGGREGATED_SERIES} most recently active series. Add a filter or an operation to
+ narrow the chart.
+ </LemonBanner>
+ )}
+ <div className="relative h-[360px] p-3">
+ {!hasQuery ? (
+ <div className="h-full flex items-center justify-center text-secondary text-sm">
+ {language === 'builder'
+ ? 'Pick a metric to see its time series.'
+ : 'Run a query to see results.'}
+ </div>
+ ) : isHeatmap && histogramQueryNode ? (
+ // The heatmap runs its own histogram query, so it mounts the histogram
+ // node rather than consuming the time-series result the other panels share.
+ // It comes before the error/loading branches: the shared time-series
+ // request still runs for the samples panel, and its failure must not
+ // mask an independently loaded histogram.
+ <MetricsHistogramQueryNode query={histogramQueryNode} context={{}} refreshCount={refreshCount} />
+ ) : queryError ? (
+ <div className="h-full flex items-center justify-center">
+ <LemonBanner type="error" className="w-full max-w-md">
+ {queryError}
+ </LemonBanner>
+ </div>
+ ) : hasResults ? (
+ <MetricsPanel
+ series={chartSeries}
+ fallbackName={formula || metricName || (language === 'promql' ? queryText : 'metric')}
+ display={metricsDisplay}
+ exemplars={chartMarkers}
+ query={metricsQueryNode ?? undefined}
+ />
+ ) : !queryLoading ? (
+ <div className="h-full flex items-center justify-center text-secondary text-sm">
+ No data for this metric in the selected range.
+ </div>
+ ) : null}
+ {queryLoading && !isHeatmap && <SpinnerOverlay />}
+ </div>
+ {hasResults && !isHeatmap && !queryError && (
+ <div className="px-3 pb-2">
+ <MetricsPercentileResolutionHint series={queryResults} metricName={metricName} />
+ </div>
+ )}
+ </>
+ )
+}
diff --git a/products/metrics/frontend/components/MetricsViewerChartHeader.tsx b/products/metrics/frontend/components/MetricsViewerChartHeader.tsx
new file mode 100644
index 000000000000..9befd8534d03
--- /dev/null
+++ b/products/metrics/frontend/components/MetricsViewerChartHeader.tsx
@@ -0,0 +1,67 @@
+import { useActions, useValues } from 'kea'
+
+import { LemonSwitch } from '@posthog/lemon-ui'
+
+import { useFeatureFlag } from 'lib/hooks/useFeatureFlag'
+import { getAccessControlDisabledReason } from 'lib/utils/accessControlUtils'
+
+import { AccessControlLevel, AccessControlResourceType } from '~/types'
+
+import { MetricsAnomalyPanel } from './MetricsAnomalyPanel'
+import { MetricsChartSettings } from './MetricsChartSettings'
+import { MetricsDisplayTypeSelect } from './MetricsDisplayTypeSelect'
+import { MetricsLogsSourceTag } from './MetricsLogsSourceTag'
+import { MetricsRelatedMenu } from './MetricsRelatedMenu'
+import { metricsSamplesLogic } from './metricsSamplesLogic'
+import { metricsViewerLogic } from './metricsViewerLogic'
+import { MetricsViewerSaveMenu } from './MetricsViewerSaveMenu'
+
+/** The chart card's header: how the result draws, overlays and links on the left, the Save menu on the right. */
+export function MetricsViewerChartHeader(): JSX.Element {
+ const { chartSeries, heatmapEligible, anomalyBadge, metricName, noQueryReason, isHeatmap } =
+ useValues(metricsViewerLogic)
+ const { showErrorSpikes } = useValues(metricsSamplesLogic)
+ const { toggleShowErrorSpikes } = useActions(metricsSamplesLogic)
+ // Staff-only PoC gate, layered on top of the wider metrics alpha flag.
+ const errorOverlaysEnabled = useFeatureFlag('METRICS_ERROR_OVERLAYS')
+ const disabledReason = getAccessControlDisabledReason(AccessControlResourceType.Metrics, AccessControlLevel.Viewer)
+ const errorTrackingDisabledReason = getAccessControlDisabledReason(
+ AccessControlResourceType.ErrorTracking,
+ AccessControlLevel.Viewer
+ )
+ // Gate on the result shape, not the clause edits: a formula result is ungrouped even
+ // when its input clauses group, and a clause without a metric name never runs.
+ const resultIsGrouped = chartSeries.some((s) => Object.keys(s.labels).length > 0)
+
+ return (
+ <div className="flex flex-wrap items-center justify-between gap-2 px-2 py-1.5 border-b">
+ <div className="flex flex-wrap items-center gap-2">
+ <MetricsDisplayTypeSelect
+ dataAttrPrefix="metrics-viewer"
+ resultIsGrouped={resultIsGrouped}
+ heatmap={{ eligible: heatmapEligible }}
+ disabledReason={disabledReason}
+ />
+ <MetricsChartSettings />
+ {/* Hidden (not disabled) without Error Tracking view access, so the
+ toggle never references a product the user cannot see. */}
+ {errorOverlaysEnabled && !errorTrackingDisabledReason && (
+ <LemonSwitch
+ label="Error spikes"
+ checked={showErrorSpikes}
+ onChange={toggleShowErrorSpikes}
+ tooltip="Mark Error Tracking issue spikes on the chart (team-wide, PoC)"
+ size="small"
+ bordered
+ data-attr="metrics-viewer-error-spikes-toggle"
+ disabledReason={disabledReason}
+ />
+ )}
+ <MetricsRelatedMenu />
+ {anomalyBadge && <MetricsAnomalyPanel anomaly={anomalyBadge} />}
+ <MetricsLogsSourceTag metricName={metricName} />
+ </div>
+ <MetricsViewerSaveMenu noQueryReason={noQueryReason} isHeatmap={isHeatmap} />
+ </div>
+ )
+}
diff --git a/products/metrics/frontend/components/MetricsViewerQueryBar.tsx b/products/metrics/frontend/components/MetricsViewerQueryBar.tsx
new file mode 100644
index 000000000000..253d4013f141
--- /dev/null
+++ b/products/metrics/frontend/components/MetricsViewerQueryBar.tsx
@@ -0,0 +1,76 @@
+import { useActions, useMountedLogic, useValues } from 'kea'
+
+import { LemonButton } from '@posthog/lemon-ui'
+
+import { useFeatureFlag } from 'lib/hooks/useFeatureFlag'
+import { getAccessControlDisabledReason } from 'lib/utils/accessControlUtils'
+
+import { type MetricsQueryLanguage } from '~/queries/schema/schema-general'
+import { AccessControlLevel, AccessControlResourceType } from '~/types'
+
+import { MetricsDateRangeFilter } from './MetricsDateRangeFilter'
+import { MetricsIntervalPicker } from './MetricsIntervalPicker'
+import { metricsQueryForLanguageSwitch, runMetricsQueryDraft } from './metricsQueryDraft'
+import { MetricsQueryLanguagePicker } from './MetricsQueryLanguagePicker'
+import { switchMetricsQueryLanguage } from './metricsQueryLanguageSwitch'
+import { MetricsQueryTextEditor } from './MetricsQueryTextEditor'
+import { MetricsRefreshButton } from './MetricsRefreshButton'
+import { MetricsSeriesBuilder } from './MetricsSeriesBuilder'
+import { metricsViewerLogic } from './metricsViewerLogic'
+
+/** The viewer's query: the language and time controls, then the series or the PromQL/SQL editor. */
+export function MetricsViewerQueryBar(): JSX.Element {
+ const logic = useMountedLogic(metricsViewerLogic)
+ const { language, interval, queryDraft, queryLoading, noQueryReason } = useValues(logic)
+ const { setInterval, fetchQueryResults, applyQuery } = useActions(logic)
+ const languagesEnabled = useFeatureFlag('METRICS_QUERY_LANGUAGES')
+ const disabledReason = getAccessControlDisabledReason(AccessControlResourceType.Metrics, AccessControlLevel.Viewer)
+
+ const runQueryText = (): void => runMetricsQueryDraft(logic, () => fetchQueryResults({}))
+ const switchLanguage = (to: MetricsQueryLanguage): void =>
+ switchMetricsQueryLanguage(metricsQueryForLanguageSwitch(logic), to, applyQuery)
+
+ return (
+ <>
+ <div className="flex flex-wrap items-center justify-between gap-2">
+ {languagesEnabled ? (
+ <MetricsQueryLanguagePicker
+ value={language}
+ onChange={switchLanguage}
+ disabledReason={disabledReason}
+ />
+ ) : (
+ <span />
+ )}
+ <div className="flex flex-wrap items-center gap-2">
+ <MetricsDateRangeFilter disabledReason={disabledReason} />
+ <MetricsIntervalPicker value={interval} onChange={setInterval} disabledReason={disabledReason} />
+ <MetricsRefreshButton disabledReason={disabledReason} noQueryReason={noQueryReason} />
+ </div>
+ </div>
+ {language === 'builder' ? (
+ <MetricsSeriesBuilder dataAttrPrefix="metrics-viewer" disabledReason={disabledReason} />
+ ) : (
+ <div className="flex items-start gap-2">
+ <div className="flex-1 min-w-0">
+ <MetricsQueryTextEditor
+ language={language}
+ disabledReason={disabledReason}
+ onRun={runQueryText}
+ />
+ </div>
+ <LemonButton
+ type="primary"
+ size="small"
+ onClick={runQueryText}
+ loading={queryLoading}
+ disabledReason={disabledReason ?? (queryDraft.trim() ? undefined : 'Write a query first')}
+ data-attr={`metrics-query-editor-run-${language}`}
+ >
+ Run
+ </LemonButton>
+ </div>
+ )}
+ </>
+ )
+}
diff --git a/products/metrics/frontend/components/MetricsViewerSaveMenu.tsx b/products/metrics/frontend/components/MetricsViewerSaveMenu.tsx
new file mode 100644
index 000000000000..3d57eb021984
--- /dev/null
+++ b/products/metrics/frontend/components/MetricsViewerSaveMenu.tsx
@@ -0,0 +1,76 @@
+import { useActions, useValues } from 'kea'
+
+import { IconChevronDown } from '@posthog/icons'
+import { LemonButton, LemonMenu } from '@posthog/lemon-ui'
+
+import { getMetricsInsightEditorDisabledReason } from '../metricsAccess'
+import { metricsStarterDashboardLogic } from './metricsStarterDashboardLogic'
+import { metricsViewerLogic } from './metricsViewerLogic'
+
+export function MetricsViewerSaveMenu({
+ noQueryReason,
+ isHeatmap,
+}: {
+ noQueryReason: string | undefined
+ /** Insight alerts only take a `MetricsQuery`, and the heatmap saves a histogram query. */
+ isHeatmap: boolean
+}): JSX.Element {
+ const { savedInsightLoading } = useValues(metricsViewerLogic)
+ const { saveAsInsight, addToDashboard, createAlert } = useActions(metricsViewerLogic)
+ const { openModal: openStarterDashboardModal } = useActions(metricsStarterDashboardLogic)
+ const insightEditorDisabledReason = getMetricsInsightEditorDisabledReason()
+
+ return (
+ <LemonMenu
+ placement="bottom-end"
+ items={[
+ {
+ items: [
+ {
+ label: 'Add to dashboard',
+ onClick: () => addToDashboard(),
+ disabledReason: noQueryReason,
+ 'data-attr': 'metrics-viewer-add-to-dashboard',
+ },
+ {
+ label: 'Save as insight',
+ onClick: () => saveAsInsight(),
+ disabledReason: noQueryReason,
+ 'data-attr': 'metrics-viewer-save-as-insight',
+ },
+ {
+ label: 'Create alert',
+ onClick: () => createAlert(),
+ tooltip: 'Get notified when this metric crosses a threshold (uses insight alerts)',
+ disabledReason:
+ noQueryReason ??
+ (isHeatmap ? 'Alerts are not supported for the heatmap display' : undefined),
+ 'data-attr': 'metrics-viewer-create-alert',
+ },
+ ],
+ },
+ {
+ items: [
+ {
+ label: 'New service dashboard',
+ onClick: openStarterDashboardModal,
+ tooltip: 'Create a dashboard with one insight per metric, charted as one line per series',
+ 'data-attr': 'metrics-viewer-starter-dashboard',
+ },
+ ],
+ },
+ ]}
+ >
+ <LemonButton
+ size="small"
+ type="primary"
+ sideIcon={<IconChevronDown />}
+ loading={savedInsightLoading}
+ disabledReason={insightEditorDisabledReason}
+ data-attr="metrics-viewer-save-menu"
+ >
+ Save
+ </LemonButton>
+ </LemonMenu>
+ )
+}
diff --git a/products/metrics/frontend/components/metricsQueryDraft.ts b/products/metrics/frontend/components/metricsQueryDraft.ts
new file mode 100644
index 000000000000..47902d60f9ed
--- /dev/null
+++ b/products/metrics/frontend/components/metricsQueryDraft.ts
@@ -0,0 +1,24 @@
+import type { BuiltLogic } from 'kea'
+
+import { type MetricsQuery, NodeKind } from '~/queries/schema/schema-general'
+
+import type { metricsViewerLogicType } from './metricsViewerLogic'
+
+/** Runs a changed PromQL or SQL draft through the query node, or runs the unchanged query again, as after a failure. */
+export function runMetricsQueryDraft(logic: BuiltLogic<metricsViewerLogicType>, rerun?: () => void): void {
+ if (logic.values.queryTextChanged) {
+ logic.actions.runQueryText()
+ } else {
+ rerun?.()
+ }
+}
+
+/** The query a language switch converts. Read at click time, so a draft the user has not run yet still converts. */
+export function metricsQueryForLanguageSwitch(
+ logic: BuiltLogic<metricsViewerLogicType>,
+ fallbackQuery?: MetricsQuery
+): MetricsQuery {
+ const { metricsQueryNode, queryDraft, language } = logic.values
+ const current = metricsQueryNode ?? fallbackQuery ?? { kind: NodeKind.MetricsQuery, clauses: [] }
+ return language === 'builder' ? current : { ...current, [language]: queryDraft.trim() }
+}
diff --git a/products/metrics/frontend/components/metricsSamplesLogic.test.ts b/products/metrics/frontend/components/metricsSamplesLogic.test.ts
index 29458a2f6e8c..bf2898c46237 100644
--- a/products/metrics/frontend/components/metricsSamplesLogic.test.ts
+++ b/products/metrics/frontend/components/metricsSamplesLogic.test.ts
@@ -108,7 +108,7 @@ describe('metricsSamplesLogic', () => {
const [, request] = mockSamplesCreate.mock.calls[0]
expect(request.query.metricName).toBe('demo_checkout_duration_ms')
expect(request.query.dateFrom).toMatch(/^\d{4}-\d{2}-\d{2}T/)
- expect(logic.values.samples).toEqual([SAMPLE])
+ expect(logic.values.samples).toEqual([{ ...SAMPLE, clauses: ['a'] }])
})
// Regression: firing the request with an empty metric name spams 400s on the
@@ -157,6 +157,50 @@ describe('metricsSamplesLogic', () => {
expect(mockSamplesCreate).toHaveBeenCalledTimes(2)
})
+ // Regression: with several series the panel listed only the focused clause's emissions,
+ // so the samples and the chart's exemplar dots did not match what the chart draws.
+ it('merges the emissions of every series, newest first', async () => {
+ const otherSample = {
+ ...SAMPLE,
+ metric_name: 'demo_checkout_errors_total',
+ timestamp: '2026-07-09T05:50:00+00:00',
+ }
+ mockSamplesCreate.mockImplementation(async (_, { query }) => ({
+ results: query.metricName === 'demo_checkout_errors_total' ? [otherSample] : [SAMPLE],
+ }))
+ metricsViewerLogic.actions.setMetricName('demo_checkout_duration_ms')
+ metricsViewerLogic.actions.addClause()
+ metricsViewerLogic.actions.setMetricName('demo_checkout_errors_total')
+ metricsViewerLogic.actions.duplicateClause(1)
+
+ logic.actions.setActiveTab('samples')
+ await expectLogic(logic).toDispatchActions(['loadSamplesSuccess'])
+
+ expect(mockSamplesCreate).toHaveBeenCalledTimes(2)
+ expect(logic.values.samples).toEqual([
+ { ...otherSample, clauses: ['b', 'c'] },
+ { ...SAMPLE, clauses: ['a'] },
+ ])
+ })
+
+ it('shows the series that loaded when another series fails', async () => {
+ mockSamplesCreate.mockImplementation(async (_, { query }) => {
+ if (query.metricName === 'demo_checkout_errors_total') {
+ throw new Error('timeout')
+ }
+ return { results: [SAMPLE] }
+ })
+ metricsViewerLogic.actions.setMetricName('demo_checkout_duration_ms')
+ metricsViewerLogic.actions.addClause()
+ metricsViewerLogic.actions.setMetricName('demo_checkout_errors_total')
+
+ logic.actions.setActiveTab('samples')
+ await expectLogic(logic).toDispatchActions(['loadSamplesSuccess'])
+
+ expect(logic.values.samples).toEqual([{ ...SAMPLE, clauses: ['a'] }])
+ expect(logic.values.failedSampleClauses).toEqual(['b'])
+ })
+
// Regression: the panel listing emissions the chart above it excludes, because
// the request went out with only the metric name and date range.
it('scopes the request to the viewer filter bar and the picked metric type', async () => {
@@ -229,6 +273,65 @@ describe('metricsSamplesLogic', () => {
// Regression: an always-on error-spikes fetch would spam Error Tracking on
// every chart redraw for every metrics viewer, whether or not the overlay is
// visible — the toggle must gate the request, not just the chart markers.
+ // Regression: every auto-refresh tick sent one samples request per series while nobody looked at them.
+ it('skips the samples reload on an unchanged chart query while the tab is hidden', async () => {
+ metricsViewerLogic.actions.setMetricName('demo_checkout_duration_ms')
+ metricsViewerLogic.actions.fetchQueryResultsSuccess([])
+ await expectLogic(logic).toDispatchActions(['loadSamplesSuccess'])
+ expect(mockSamplesCreate).toHaveBeenCalledTimes(1)
+
+ metricsViewerLogic.actions.fetchQueryResultsSuccess([])
+ await expectLogic(logic).delay(400)
+ expect(mockSamplesCreate).toHaveBeenCalledTimes(1)
+
+ logic.actions.setActiveTab('samples')
+ await expectLogic(logic).toDispatchActions(['loadSamplesSuccess'])
+ metricsViewerLogic.actions.fetchQueryResultsSuccess([])
+ await expectLogic(logic).toDispatchActions(['loadSamplesSuccess'])
+ expect(mockSamplesCreate).toHaveBeenCalledTimes(3)
+ })
+
+ // Regression: a slow request for the old metric stored the new metric's key, so the new chart never got samples.
+ it('loads samples for a metric picked while the previous request was in flight', async () => {
+ let release: () => void = () => undefined
+ mockSamplesCreate.mockImplementationOnce(
+ () => new Promise((resolve) => (release = () => resolve({ results: [SAMPLE] })))
+ )
+ metricsViewerLogic.actions.setMetricName('demo_checkout_duration_ms')
+ metricsViewerLogic.actions.fetchQueryResultsSuccess([])
+ await expectLogic(logic).delay(400)
+
+ metricsViewerLogic.actions.setMetricName('demo_checkout_requests_total')
+ release()
+ await expectLogic(logic).delay(10)
+ metricsViewerLogic.actions.fetchQueryResultsSuccess([])
+ await expectLogic(logic).delay(400)
+
+ expect(mockSamplesCreate.mock.calls.map(([, { query }]) => query.metricName)).toEqual([
+ 'demo_checkout_duration_ms',
+ 'demo_checkout_requests_total',
+ ])
+ })
+
+ // Regression: with the tab open, each auto-refresh restarted a slow batch, so it never finished.
+ it('lets a running samples batch finish when the chart refreshes', async () => {
+ let release: () => void = () => undefined
+ mockSamplesCreate.mockImplementationOnce(
+ () => new Promise((resolve) => (release = () => resolve({ results: [SAMPLE] })))
+ )
+ metricsViewerLogic.actions.setMetricName('demo_checkout_duration_ms')
+ logic.actions.setActiveTab('samples')
+ await expectLogic(logic).delay(400)
+
+ metricsViewerLogic.actions.fetchQueryResultsSuccess([])
+ await expectLogic(logic).delay(400)
+ release()
+ await expectLogic(logic).toDispatchActions(['loadSamplesSuccess'])
+
+ expect(mockSamplesCreate).toHaveBeenCalledTimes(1)
+ expect(logic.values.samples).toEqual([{ ...SAMPLE, clauses: ['a'] }])
+ })
+
it('does not fetch error spikes until the toggle is enabled', async () => {
metricsViewerLogic.actions.setMetricName('demo_checkout_duration_ms')
diff --git a/products/metrics/frontend/components/metricsSamplesLogic.tsx b/products/metrics/frontend/components/metricsSamplesLogic.tsx
index b854bbf5d940..bbfb4d691942 100644
--- a/products/metrics/frontend/components/metricsSamplesLogic.tsx
+++ b/products/metrics/frontend/components/metricsSamplesLogic.tsx
@@ -7,14 +7,10 @@ import { teamLogic } from 'scenes/teamLogic'
import { AccessControlLevel, AccessControlResourceType, UniversalFiltersGroup } from '~/types'
import { metricsErrorSpikesRetrieve, metricsSamplesCreate } from 'products/metrics/frontend/generated/api'
-import type {
- _MetricErrorSpikeApi,
- _MetricEventSampleApi,
- _MetricFilterApi,
- OtelMetricTypeEnumApi,
-} from 'products/metrics/frontend/generated/api.schemas'
+import type { _MetricErrorSpikeApi } from 'products/metrics/frontend/generated/api.schemas'
import { canViewMetrics } from 'products/metrics/frontend/metricsAccess'
+import { buildSampleRequests, type MetricsSampleRow, mergeSamples, settleSampleRequests } from './metricsSamplesMerge'
import {
type SeriesLabel,
distinctSeriesLabels,
@@ -22,7 +18,19 @@ import {
seriesColor,
seriesNamePrefixes,
} from './metricsSeries'
-import { type MetricsViewerSeries, metricsViewerLogic, resolveDate } from './metricsViewerLogic'
+import {
+ type MetricsViewerClause,
+ type MetricsViewerSeries,
+ metricsViewerLogic,
+ resolveDate,
+} from './metricsViewerLogic'
+
+// Unresolved dates, so an auto-refresh tick keeps the same key.
+const samplesRequestKey = (
+ namedClauses: MetricsViewerClause[],
+ dateFrom: string | null,
+ dateTo: string | null
+): string => JSON.stringify([buildSampleRequests(namedClauses), dateFrom, dateTo])
// The side panel next to the chart: per-series totals, or the raw emissions
// behind the chart with their trace linkage (the metric->trace pivot).
@@ -60,15 +68,15 @@ export interface metricsSamplesLogicValues {
dateFrom: string | null // metricsViewerLogic
dateTo: string | null // metricsViewerLogic
metricName: string // metricsViewerLogic
- queryFilters: _MetricFilterApi[] // metricsViewerLogic
+ namedClauses: MetricsViewerClause[] // metricsViewerLogic
queryResults: MetricsViewerSeries[] // metricsViewerLogic
- selectedMetricType: OtelMetricTypeEnumApi | null // metricsViewerLogic
currentTeamId: number | null // teamLogic
timezone: string // teamLogic
activeTab: MetricsPanelTab
errorSpikes: _MetricErrorSpikeApi[]
errorSpikesLoading: boolean
- samples: _MetricEventSampleApi[]
+ failedSampleClauses: string[]
+ samples: MetricsSampleRow[]
samplesLoading: boolean
seriesRows: MetricsSeriesRow[]
showErrorSpikes: boolean
@@ -77,12 +85,6 @@ export interface metricsSamplesLogicValues {
// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
export interface metricsSamplesLogicActions {
- addClause: () => {
- value: true
- } // metricsViewerLogic
- duplicateClause: (index: number) => {
- index: number
- } // metricsViewerLogic
fetchQueryResultsSuccess: (
queryResults: import('products/metrics/frontend/generated/api.schemas')._MetricSeriesApi[],
payload?: any
@@ -93,9 +95,6 @@ export interface metricsSamplesLogicActions {
removeClause: (index: number) => {
index: number
} // metricsViewerLogic
- setActiveClauseIndex: (index: number) => {
- index: number
- } // metricsViewerLogic
setDateFrom: (dateFrom: string | null) => {
dateFrom: string | null
} // metricsViewerLogic
@@ -108,8 +107,10 @@ export interface metricsSamplesLogicActions {
setMetricName: (metricName: string) => {
metricName: string
} // metricsViewerLogic
- setSelectedMetricType: (metricType: OtelMetricTypeEnumApi | null) => {
- metricType: OtelMetricTypeEnumApi | null
+ setSelectedMetricType: (
+ metricType: null | import('products/metrics/frontend/generated/api.schemas').OtelMetricTypeEnumApi
+ ) => {
+ metricType: null | import('products/metrics/frontend/generated/api.schemas').OtelMetricTypeEnumApi
} // metricsViewerLogic
loadErrorSpikes: (_: any) => any
loadErrorSpikesFailure: (
@@ -135,15 +136,18 @@ export interface metricsSamplesLogicActions {
errorObject?: any
}
loadSamplesSuccess: (
- samples: _MetricEventSampleApi[],
+ samples: MetricsSampleRow[],
payload?: any
) => {
- samples: _MetricEventSampleApi[]
+ samples: MetricsSampleRow[]
payload?: any
}
setActiveTab: (activeTab: MetricsPanelTab) => {
activeTab: MetricsPanelTab
}
+ setFailedSampleClauses: (failedSampleClauses: string[]) => {
+ failedSampleClauses: string[]
+ }
toggleShowErrorSpikes: () => {
value: true
}
@@ -156,7 +160,7 @@ export interface metricsSamplesLogicMeta {
queryResults: import('products/metrics/frontend/generated/api.schemas')._MetricSeriesApi[],
metricName: string
) => MetricsSeriesRow[]
- traceExemplars: (samples: _MetricEventSampleApi[]) => MetricsTraceExemplar[]
+ traceExemplars: (samples: MetricsSampleRow[]) => MetricsTraceExemplar[]
}
}
@@ -174,7 +178,7 @@ export const metricsSamplesLogic = kea<metricsSamplesLogicType>([
teamLogic,
['currentTeamId', 'timezone'],
metricsViewerLogic,
- ['metricName', 'dateFrom', 'dateTo', 'queryFilters', 'selectedMetricType', 'queryResults'],
+ ['metricName', 'namedClauses', 'dateFrom', 'dateTo', 'queryResults'],
],
actions: [
metricsViewerLogic,
@@ -184,10 +188,7 @@ export const metricsSamplesLogic = kea<metricsSamplesLogicType>([
'setDateTo',
'setFilterGroup',
'setSelectedMetricType',
- 'setActiveClauseIndex',
- 'addClause',
'removeClause',
- 'duplicateClause',
'fetchQueryResultsSuccess',
],
],
@@ -195,38 +196,56 @@ export const metricsSamplesLogic = kea<metricsSamplesLogicType>([
actions({
setActiveTab: (activeTab: MetricsPanelTab) => ({ activeTab }),
toggleShowErrorSpikes: true,
+ setFailedSampleClauses: (failedSampleClauses: string[]) => ({ failedSampleClauses }),
}),
reducers({
activeTab: ['aggregates' as MetricsPanelTab, { setActiveTab: (_, { activeTab }) => activeTab }],
showErrorSpikes: [false, { toggleShowErrorSpikes: (state) => !state }],
+ failedSampleClauses: [
+ [] as string[],
+ { setFailedSampleClauses: (_, { failedSampleClauses }) => failedSampleClauses },
+ ],
}),
- loaders(({ values }) => ({
+ loaders(({ values, actions, cache }) => ({
samples: [
- [] as _MetricEventSampleApi[],
+ [] as MetricsSampleRow[],
{
loadSamples: async (_, breakpoint) => {
if (!canViewMetrics()) {
return []
}
- const metricName = values.metricName.trim()
const dateFrom = resolveDate(values.dateFrom, values.timezone)
- if (!metricName || !dateFrom) {
+ if (!values.namedClauses.length || !dateFrom) {
+ cache.loadedSamplesKey = undefined
+ actions.setFailedSampleClauses([])
return []
}
- await breakpoint(300)
- const dateTo = resolveDate(values.dateTo, values.timezone) ?? undefined
- const response = await metricsSamplesCreate(String(values.currentTeamId), {
- query: {
- metricName,
- dateFrom,
- ...(dateTo ? { dateTo } : {}),
- ...(values.selectedMetricType ? { metricType: values.selectedMetricType } : {}),
- ...(values.queryFilters.length ? { filters: values.queryFilters } : {}),
- limit: SAMPLES_LIMIT,
- },
- })
- breakpoint()
- return response.results
+ const requestKey = samplesRequestKey(values.namedClauses, values.dateFrom, values.dateTo)
+ cache.runningSamplesKey = requestKey
+ try {
+ await breakpoint(300)
+ const dateTo = resolveDate(values.dateTo, values.timezone) ?? undefined
+ const requests = buildSampleRequests(values.namedClauses)
+ const responses = await Promise.allSettled(
+ requests.map(({ query }) =>
+ metricsSamplesCreate(String(values.currentTeamId), {
+ query: { ...query, dateFrom, ...(dateTo ? { dateTo } : {}), limit: SAMPLES_LIMIT },
+ })
+ )
+ )
+ breakpoint()
+ const { loaded, failedClauses, failure } = settleSampleRequests(requests, responses)
+ actions.setFailedSampleClauses(failedClauses)
+ if (!loaded.length) {
+ throw failure
+ }
+ cache.loadedSamplesKey = requestKey
+ return mergeSamples(loaded, SAMPLES_LIMIT)
+ } finally {
+ if (cache.runningSamplesKey === requestKey) {
+ cache.runningSamplesKey = undefined
+ }
+ }
},
},
],
@@ -289,7 +308,7 @@ export const metricsSamplesLogic = kea<metricsSamplesLogicType>([
// Exemplar dots for the chart: only emissions that carry trace context.
traceExemplars: [
(s) => [s.samples],
- (samples: _MetricEventSampleApi[]): MetricsTraceExemplar[] =>
+ (samples: MetricsSampleRow[]): MetricsTraceExemplar[] =>
samples
.filter((sample) => sample.trace_id)
.map((sample) => ({
@@ -300,26 +319,33 @@ export const metricsSamplesLogic = kea<metricsSamplesLogicType>([
})),
],
}),
- listeners(({ actions, values }) => {
+ listeners(({ actions, values, cache }) => {
+ // One gate for every trigger: a request that is already running, or already
+ // loaded while nobody looks at the table, is not started again.
+ const loadSamplesUnlessCurrent = (): void => {
+ const key = samplesRequestKey(values.namedClauses, values.dateFrom, values.dateTo)
+ const loadedAndHidden = values.activeTab !== 'samples' && key === cache.loadedSamplesKey
+ if (key !== cache.runningSamplesKey && !loadedAndHidden) {
+ actions.loadSamples({})
+ }
+ }
// The viewer's filters are the samples' filters: any change that redraws
// the chart refreshes the visible samples too, but only when they're shown.
const reloadWhenShown = (): void => {
if (values.activeTab === 'samples') {
- actions.loadSamples({})
+ loadSamplesUnlessCurrent()
}
}
return {
setActiveTab: ({ activeTab }) => {
if (activeTab === 'samples') {
- actions.loadSamples({})
+ loadSamplesUnlessCurrent()
}
},
- // The chart's exemplar overlay renders from these samples, so every chart
- // redraw refreshes them. Error spikes ride the same trigger, so both
- // overlays stay in sync with the chart's own window. Both dispatches are
- // unconditional — the loaders' own guards are the single gate.
+ // The chart's trace dots render from these samples, so a chart redraw refreshes them.
+ // Error spikes ride the same trigger, so both overlays follow the chart's window.
fetchQueryResultsSuccess: () => {
- actions.loadSamples({})
+ loadSamplesUnlessCurrent()
actions.loadErrorSpikes({})
},
toggleShowErrorSpikes: () => {
@@ -332,25 +358,8 @@ export const metricsSamplesLogic = kea<metricsSamplesLogicType>([
// The viewer pins the type in its own setMetricName listener, so without
// this a metric switch can load samples pinned to the previous type.
setSelectedMetricType: reloadWhenShown,
- // Samples (and the exemplar dots derived from them) describe the active
- // clause, and every clause-navigation action can move it — including the
- // ones that leave the chart query unchanged (a blank row added or removed),
- // so the chart-refetch fallback doesn't cover them. Refresh even while the
- // tab is hidden; the exemplar overlay renders from these samples.
- // (A late type backfill needs no trigger here: it always changes the chart
- // query, and fetchQueryResultsSuccess reloads samples after that refetch.)
- setActiveClauseIndex: () => {
- actions.loadSamples({})
- },
- addClause: () => {
- actions.loadSamples({})
- },
- removeClause: () => {
- actions.loadSamples({})
- },
- duplicateClause: () => {
- actions.loadSamples({})
- },
+ // Removing a clause without a metric leaves the chart query, and so its refetch, unchanged.
+ removeClause: loadSamplesUnlessCurrent,
}
}),
])
diff --git a/products/metrics/frontend/components/metricsSamplesMerge.test.ts b/products/metrics/frontend/components/metricsSamplesMerge.test.ts
new file mode 100644
index 000000000000..70c6bd96d241
--- /dev/null
+++ b/products/metrics/frontend/components/metricsSamplesMerge.test.ts
@@ -0,0 +1,72 @@
+import type { _MetricEventSampleApi } from 'products/metrics/frontend/generated/api.schemas'
+
+import { mergeSamples } from './metricsSamplesMerge'
+
+const sample = (metric: string, timestamp: string, attributes: Record<string, string> = {}): _MetricEventSampleApi => ({
+ timestamp,
+ metric_name: metric,
+ metric_type: 'sum',
+ value: 1,
+ count: 1,
+ unit: '',
+ aggregation_temporality: 'cumulative',
+ is_monotonic: true,
+ service_name: 'checkout',
+ trace_id: '',
+ span_id: '',
+ attributes,
+ resource_attributes: {},
+})
+
+const secondsAfter = (seconds: number): string => new Date(Date.UTC(2026, 6, 9, 5, 0, seconds)).toISOString()
+
+describe('mergeSamples', () => {
+ it('lists an emission that two overlapping series return once, tagged with both, and keeps other metric types apart', () => {
+ const prod = sample('requests', secondsAfter(10), { env: 'prod' })
+ const dev = sample('requests', secondsAfter(5), { env: 'dev' })
+ const prodGauge = { ...prod, metric_type: 'gauge' }
+
+ const rows = mergeSamples(
+ [
+ { clauses: ['a'], samples: [prod, dev] },
+ { clauses: ['b'], samples: [{ ...prod }] },
+ { clauses: ['c'], samples: [prodGauge] },
+ ],
+ 50
+ )
+
+ expect(rows.map((row) => [row.attributes.env, row.metric_type, row.clauses])).toEqual([
+ ['prod', 'sum', ['a', 'b']],
+ ['prod', 'gauge', ['c']],
+ ['dev', 'sum', ['a']],
+ ])
+ })
+
+ it('keeps a share of rows for a quiet series that a busy one would push out', () => {
+ const busy = Array.from({ length: 10 }, (_, i) => sample('busy', secondsAfter(100 + i)))
+ const quiet = [sample('quiet', secondsAfter(1)), sample('quiet', secondsAfter(2))]
+
+ const rows = mergeSamples(
+ [
+ { clauses: ['a'], samples: busy },
+ { clauses: ['b'], samples: quiet },
+ ],
+ 6
+ )
+
+ expect(rows.filter((row) => row.metric_name === 'quiet')).toHaveLength(2)
+ expect(rows).toHaveLength(6)
+ })
+
+ it('orders by instant, not by timestamp text', () => {
+ const rows = mergeSamples(
+ [
+ { clauses: ['a'], samples: [sample('m', '2026-07-09T07:00:00+02:00')] },
+ { clauses: ['b'], samples: [sample('n', '2026-07-09T05:30:00+00:00')] },
+ ],
+ 50
+ )
+
+ expect(rows.map((row) => row.metric_name)).toEqual(['n', 'm'])
+ })
+})
diff --git a/products/metrics/frontend/components/metricsSamplesMerge.ts b/products/metrics/frontend/components/metricsSamplesMerge.ts
new file mode 100644
index 000000000000..fd34fc5937b0
--- /dev/null
+++ b/products/metrics/frontend/components/metricsSamplesMerge.ts
@@ -0,0 +1,127 @@
+import type { _MetricEventSampleApi, _MetricSamplesBodyApi } from 'products/metrics/frontend/generated/api.schemas'
+
+import { type MetricsViewerClause, metricFiltersForGroup } from './metricsViewerLogic'
+
+/** A raw emission, with the aliases of the series whose query returned it. */
+export type MetricsSampleRow = _MetricEventSampleApi & { clauses: string[] }
+
+/** A samples query without its date range, and the series that share it. */
+export interface MetricsSampleRequest {
+ query: Omit<_MetricSamplesBodyApi, 'dateFrom' | 'dateTo' | 'limit'>
+ clauses: string[]
+}
+
+/** Series with the same metric, type and filters share one request. */
+export function buildSampleRequests(namedClauses: MetricsViewerClause[]): MetricsSampleRequest[] {
+ const requests = new Map<string, MetricsSampleRequest>()
+ for (const clause of namedClauses) {
+ const filters = metricFiltersForGroup(clause.filterGroup)
+ const query: MetricsSampleRequest['query'] = {
+ metricName: clause.metricName.trim(),
+ ...(clause.selectedMetricType ? { metricType: clause.selectedMetricType } : {}),
+ ...(filters.length ? { filters } : {}),
+ }
+ const key = JSON.stringify(query)
+ const existing = requests.get(key)
+ if (existing) {
+ existing.clauses.push(clause.name)
+ } else {
+ requests.set(key, { query, clauses: [clause.name] })
+ }
+ }
+ return [...requests.values()]
+}
+
+const sampleTime = (sample: _MetricEventSampleApi): number => Date.parse(sample.timestamp)
+
+// Overlapping series (one adds a filter to the other) return the same emission, so it is keyed by content.
+const sampleIdentity = (sample: _MetricEventSampleApi): string =>
+ JSON.stringify([
+ sample.metric_name,
+ sample.metric_type,
+ sample.unit,
+ sample.aggregation_temporality,
+ sample.is_monotonic,
+ sampleTime(sample),
+ sample.value,
+ sample.count,
+ sample.service_name,
+ sample.trace_id,
+ sample.span_id,
+ sample.attributes,
+ sample.resource_attributes,
+ ])
+
+/** At most `limit` rows, newest first. Each request gets an equal share first, so a busy series cannot push a quiet one out. */
+export function mergeSamples(
+ results: { clauses: string[]; samples: _MetricEventSampleApi[] }[],
+ limit: number
+): MetricsSampleRow[] {
+ const rows = new Map<string, MetricsSampleRow>()
+ const keysPerRequest = results.map(({ clauses, samples }) => {
+ // Repeats inside one response stay separate rows. Only the same occurrence across responses merges.
+ const occurrences = new Map<string, number>()
+ return [...samples]
+ .sort((left, right) => sampleTime(right) - sampleTime(left))
+ .map((sample) => {
+ const identity = sampleIdentity(sample)
+ const occurrence = occurrences.get(identity) ?? 0
+ occurrences.set(identity, occurrence + 1)
+ const key = `${identity}#${occurrence}`
+ const row = rows.get(key)
+ if (row) {
+ row.clauses = [...new Set([...row.clauses, ...clauses])]
+ } else {
+ rows.set(key, { ...sample, clauses: [...clauses] })
+ }
+ return key
+ })
+ })
+
+ const picked = new Set<string>()
+ const share = Math.ceil(limit / Math.max(results.length, 1))
+ for (const keys of keysPerRequest) {
+ let taken = 0
+ for (const key of keys) {
+ if (taken >= share || picked.size >= limit) {
+ break
+ }
+ if (!picked.has(key)) {
+ picked.add(key)
+ taken++
+ }
+ }
+ }
+ const newestFirst = [...rows.entries()].sort(([, left], [, right]) => sampleTime(right) - sampleTime(left))
+ for (const [key] of newestFirst) {
+ if (picked.size >= limit) {
+ break
+ }
+ picked.add(key)
+ }
+ return newestFirst.filter(([key]) => picked.has(key)).map(([, row]) => row)
+}
+
+/** Splits settled requests into the samples that loaded and the series whose request failed. */
+export function settleSampleRequests(
+ requests: MetricsSampleRequest[],
+ responses: PromiseSettledResult<{ results: _MetricEventSampleApi[] }>[]
+): {
+ loaded: { clauses: string[]; samples: _MetricEventSampleApi[] }[]
+ failedClauses: string[]
+ failure: unknown
+} {
+ const loaded: { clauses: string[]; samples: _MetricEventSampleApi[] }[] = []
+ const failedClauses: string[] = []
+ let failure: unknown = undefined
+ requests.forEach(({ clauses }, index) => {
+ const response = responses[index]
+ if (response.status === 'fulfilled') {
+ loaded.push({ clauses, samples: response.value.results })
+ } else {
+ failedClauses.push(...clauses)
+ failure = response.reason
+ }
+ })
+ return { loaded, failedClauses, failure }
+}
diff --git a/products/metrics/frontend/components/metricsUsageTrackingLogic.ts b/products/metrics/frontend/components/metricsUsageTrackingLogic.ts
index d1818fa912b9..d76f8e8b4f17 100644
--- a/products/metrics/frontend/components/metricsUsageTrackingLogic.ts
+++ b/products/metrics/frontend/components/metricsUsageTrackingLogic.ts
@@ -71,11 +71,11 @@ export interface metricsUsageTrackingLogicActions {
dashboardId: number
} // metricsDashboardImportLogic
loadSamplesSuccess: (
- samples: _MetricEventSampleApi[],
+ samples: import('./metricsSamplesMerge').MetricsSampleRow[],
payload?: any
) => {
payload?: any
- samples: _MetricEventSampleApi[]
+ samples: import('./metricsSamplesMerge').MetricsSampleRow[]
} // metricsSamplesLogic
samplesPanelTabChanged: (activeTab: MetricsPanelTab) => {
activeTab: MetricsPanelTab
diff --git a/products/metrics/frontend/components/metricsViewerLogic.tsx b/products/metrics/frontend/components/metricsViewerLogic.tsx
index 0ed965bc4893..fcc8acc749bc 100644
--- a/products/metrics/frontend/components/metricsViewerLogic.tsx
+++ b/products/metrics/frontend/components/metricsViewerLogic.tsx
@@ -568,6 +568,7 @@ export interface metricsViewerLogicValues {
histogramQueryNode: MetricsHistogramQuery | null
interval: string | null
isAddToDashboardModalOpen: boolean
+ isHeatmap: boolean
language: MetricsQueryLanguage
lastSavedQueryNode: MetricsHistogramQuery | MetricsQuery | null
liveRefresh: boolean
@@ -575,6 +576,7 @@ export interface metricsViewerLogicValues {
metricsDisplay: MetricsDisplaySettings | undefined
metricsQueryNode: MetricsQuery | null
namedClauses: MetricsViewerClause[]
+ noQueryReason: string | undefined
pendingAddToDashboard: boolean
pendingAlert: boolean
queryAbortController: AbortController | null
@@ -591,6 +593,7 @@ export interface metricsViewerLogicValues {
queryTextChanged: boolean
rangeFunction: MetricRangeFunction | null
reduce: MetricsReducer
+ refreshCount: number
savedInsight: InsightModel | null
savedInsightLoading: boolean
savedQueryNode: MetricsHistogramQuery | MetricsQuery | null
@@ -731,6 +734,9 @@ export interface metricsViewerLogicActions {
openAddToDashboardModal: () => {
value: true
}
+ refresh: () => {
+ value: true
+ }
removeClause: (index: number) => {
index: number
}
@@ -860,6 +866,7 @@ export interface metricsViewerLogicMeta {
namedClauses: (viewerClauses: MetricsViewerClause[]) => MetricsViewerClause[]
hasMetricName: (namedClauses: MetricsViewerClause[]) => boolean
hasQuery: (language: MetricsQueryLanguage, hasMetricName: boolean, queryText: string) => boolean
+ noQueryReason: (hasQuery: boolean, language: MetricsQueryLanguage) => string | undefined
queryPayload: (
namedClauses: MetricsViewerClause[],
formula: string,
@@ -890,6 +897,7 @@ export interface metricsViewerLogicMeta {
queryText: string
) => MetricsQuery | null
queryTextChanged: (queryDraft: string, queryText: string) => boolean
+ isHeatmap: (displayType: MetricsDisplayType, histogramQueryNode: MetricsHistogramQuery | null) => boolean
heatmapEligible: (
language: MetricsQueryLanguage,
namedClauses: MetricsViewerClause[],
@@ -970,6 +978,8 @@ export const metricsViewerLogic = kea<metricsViewerLogicType>([
setLiveRefresh: (liveRefresh: boolean) => ({ liveRefresh }),
// One auto-refresh cycle. The chart and the facet rail both reload on it.
liveRefreshTick: true,
+ // Reloads everything the chart area shows: the series, the anomaly badge and the heatmap.
+ refresh: true,
setGroupBySearch: (groupBySearch: string) => ({ groupBySearch }),
// Narrows the chart to one label value, from the anomaly panel's ranked movers.
addAttributeFilter: (key: string, value: string) => ({ key, value }),
@@ -1187,6 +1197,8 @@ export const metricsViewerLogic = kea<metricsViewerLogicType>([
{ setInterval: (_, { interval }) => interval },
],
liveRefresh: [false, { setLiveRefresh: (_, { liveRefresh }) => liveRefresh }],
+ // The heatmap loads through its own query node, which remounts when this changes.
+ refreshCount: [0, { refresh: (count) => count + 1 }],
// Free-text search backing the group-by attribute-key autocomplete.
groupBySearch: ['' as string, { setGroupBySearch: (_, { groupBySearch }) => groupBySearch }],
queryAbortController: [
@@ -1475,6 +1487,9 @@ export const metricsViewerLogic = kea<metricsViewerLogicType>([
}, LIVE_REFRESH_KEY)
},
liveRefreshTick: () => {
+ actions.refresh()
+ },
+ refresh: () => {
actions.fetchQueryResults({})
actions.fetchAnomaly({})
},
@@ -1696,6 +1711,11 @@ export const metricsViewerLogic = kea<metricsViewerLogicType>([
(language: MetricsQueryLanguage, hasMetricName: boolean, queryText: string): boolean =>
language === 'builder' ? hasMetricName : queryText.trim() !== '',
],
+ noQueryReason: [
+ (s) => [s.hasQuery, s.language],
+ (hasQuery: boolean, language: MetricsQueryLanguage): string | undefined =>
+ hasQuery ? undefined : language === 'builder' ? 'Pick a metric first' : 'Write a query first',
+ ],
// The chart request minus the date range (resolved at fetch time). The fetch
// loader sends this object verbatim, so the fingerprint below can't drift from
// the real payload. Null when nothing queries anything yet.
@@ -1833,6 +1853,12 @@ export const metricsViewerLogic = kea<metricsViewerLogicType>([
// The heatmap renders one distribution, so it needs exactly one non-formula builder clause
// on a distribution metric. The OTel type is latched at pick time (backfilled from the picker
// list), so this doesn't flicker as the live picker search results change.
+ // The heatmap draws a separate histogram query, so the time-series result does not feed it.
+ isHeatmap: [
+ (s) => [s.displayType, s.histogramQueryNode],
+ (displayType: MetricsDisplayType, histogramQueryNode: MetricsHistogramQuery | null): boolean =>
+ displayType === 'heatmap' && histogramQueryNode !== null,
+ ],
heatmapEligible: [
(s) => [s.language, s.namedClauses, s.formula],
(language: MetricsQueryLanguage, namedClauses: MetricsViewerClause[], formula: string): boolean =>
diff --git a/products/metrics/frontend/nodes/MetricsHistogramQueryNode.tsx b/products/metrics/frontend/nodes/MetricsHistogramQueryNode.tsx
index 371b64acd004..bd67f35a6196 100644
--- a/products/metrics/frontend/nodes/MetricsHistogramQueryNode.tsx
+++ b/products/metrics/frontend/nodes/MetricsHistogramQueryNode.tsx
@@ -1,5 +1,5 @@
-import { BuiltLogic, LogicWrapper, useValues } from 'kea'
-import { useState } from 'react'
+import { BuiltLogic, LogicWrapper, useActions, useValues } from 'kea'
+import { useEffect, useRef, useState } from 'react'
import { SpinnerOverlay } from '@posthog/lemon-ui'
@@ -7,7 +7,7 @@ import { useAttachedLogic } from 'lib/logic/scenes/useAttachedLogic'
import { cn } from 'lib/utils/css-classes'
import { InsightErrorState } from 'scenes/insights/EmptyStates'
-import { dataNodeLogic } from '~/queries/nodes/DataNode/dataNodeLogic'
+import { dataNodeLogic, type dataNodeLogicType } from '~/queries/nodes/DataNode/dataNodeLogic'
import { AnyResponseType, MetricsHistogramQuery, MetricsHistogramQueryResponse } from '~/queries/schema/schema-general'
import { QueryContext } from '~/queries/types'
@@ -15,6 +15,22 @@ import { HeatmapPanel } from '../panels/HeatmapPanel'
let uniqueNode = 0
+/** Reloads the heatmap, bypassing the cache, each time `refreshCount` changes after the first render. */
+function useReloadOnRefresh(logic: BuiltLogic<dataNodeLogicType>, refreshCount: number | undefined): void {
+ const { loadData } = useActions(logic)
+ const loadedRefreshCount = useRef(refreshCount)
+ useEffect(() => {
+ if (refreshCount === loadedRefreshCount.current) {
+ return
+ }
+ loadedRefreshCount.current = refreshCount
+ // A new load aborts the running one, so a slow heatmap would never finish under auto-refresh.
+ if (!logic.values.responseLoading) {
+ loadData('force_blocking')
+ }
+ }, [refreshCount, loadData, logic])
+}
+
/** Renders a `MetricsHistogramQuery` (a latency-over-time heatmap) wherever the generic `Query`
* component is used — saved insights, dashboard tiles, notebooks. */
export function MetricsHistogramQueryNode(props: {
@@ -24,6 +40,8 @@ export function MetricsHistogramQueryNode(props: {
attachTo?: LogicWrapper | BuiltLogic
/** Set by dashboard tiles and notebooks, which reduce the UI to the data. */
embedded?: boolean
+ /** Each change after the first render reloads the heatmap, unless a load is already running. */
+ refreshCount?: number
}): JSX.Element | null {
const { onData, loadPriority, dataNodeCollectionId } = props.context.insightProps ?? {}
const [key] = useState(() => `MetricsHistogramQueryNode.${uniqueNode++}`)
@@ -44,6 +62,7 @@ export function MetricsHistogramQueryNode(props: {
useAttachedLogic(logic, props.attachTo)
const { response, responseLoading, responseError } = useValues(logic)
+ useReloadOnRefresh(logic, props.refreshCount)
const histogram = response as MetricsHistogramQueryResponse | undefined
const unit = props.query.unit