The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.
TypeScript aialternativeauthdatabasedenoembeddingsexamplefirebasenextjsoauth2pgvectorpostgispostgrespostgresqlpostgrestrealtimesupabasevectorswebsockets
fix(logs): guard chart query against unparseable timestamp params (#47485)
Jordi Enricceff7b99bfbd
diff --git a/apps/studio/components/interfaces/Settings/Logs/Logs.utils.otel.test.ts b/apps/studio/components/interfaces/Settings/Logs/Logs.utils.otel.test.tsindex cddce409337..7063b98d684 100644--- a/apps/studio/components/interfaces/Settings/Logs/Logs.utils.otel.test.ts+++ b/apps/studio/components/interfaces/Settings/Logs/Logs.utils.otel.test.ts@@ -493,6 +493,14 @@ describe('genChartQueryOtel', () => {`)})+ it('does not throw and falls back to minute buckets for an unparseable time range', () => {+ const badParams = { iso_timestamp_start: 'not-a-date', iso_timestamp_end: 'also-bad' }+ expect(() => genChartQueryOtel(LogsTableName.EDGE, badParams, {})).not.toThrow()+ expect(fmt(genChartQueryOtel(LogsTableName.EDGE, badParams, {}))).toContain(+ 'toStartOfMinute (timestamp)'+ )+ })+it('defaults the chart bucket to minute when no time range is given', () => {expect(fmt(genChartQueryOtel(LogsTableName.EDGE, {}, {}))).toMatchInlineSnapshot(`"-- Logs Chart Query (otel) ['edge_logs']diff --git a/apps/studio/components/interfaces/Settings/Logs/Logs.utils.otel.ts b/apps/studio/components/interfaces/Settings/Logs/Logs.utils.otel.tsindex 9e999f6e455..b196246cdf5 100644--- a/apps/studio/components/interfaces/Settings/Logs/Logs.utils.otel.ts+++ b/apps/studio/components/interfaces/Settings/Logs/Logs.utils.otel.ts@@ -1,9 +1,8 @@-import dayjs from 'dayjs'import { z } from 'zod'import { LogsTableName, type SqlFilterEntry } from './Logs.constants'import type { Filters, LogData, LogsEndpointParams, Metadata, QueryType } from './Logs.types'-import { buildWhereClauses } from './Logs.utils'+import { buildWhereClauses, resolveLogTimestamp } from './Logs.utils'import { parseOtelTimestamp } from '@/data/logs/otel-inspection.utils'import {joinSqlFragments,@@ -280,8 +279,8 @@ SELECT count() AS count FROM logs ${genOtelWhere(table, filters)}`// Bucket by minute up to 12h, otherwise by hour (matches BigQuery).const otelChartTruncFn = (params: LogsEndpointParams): SafeLogSqlFragment => {- const ite = params.iso_timestamp_end ? dayjs(params.iso_timestamp_end) : dayjs()- const its = params.iso_timestamp_start ? dayjs(params.iso_timestamp_start) : dayjs()+ const ite = resolveLogTimestamp(params.iso_timestamp_end)+ const its = resolveLogTimestamp(params.iso_timestamp_start)const minuteDiff = ite.diff(its, 'minute')const hourDiff = ite.diff(its, 'hour')if (minuteDiff > 60 * 12) return safeSql`toStartOfHour`diff --git a/apps/studio/components/interfaces/Settings/Logs/Logs.utils.test.ts b/apps/studio/components/interfaces/Settings/Logs/Logs.utils.test.tsindex 76da4c9bd25..6091e922362 100644--- a/apps/studio/components/interfaces/Settings/Logs/Logs.utils.test.ts+++ b/apps/studio/components/interfaces/Settings/Logs/Logs.utils.test.ts@@ -5,10 +5,12 @@ import type { Filters, LogData } from './Logs.types'import {buildLogsPrompt,checkForLimitClause,+ ensureNoTimestampConflict,extractEdgeFunctionName,formatLogsAsCsv,formatLogsAsJson,formatLogsAsMarkdown,+ genChartQuery,genDefaultQuery,getAuthLogSeverity,parseMultigresEventMessage,@@ -329,4 +331,24 @@ describe('Logs.utils', () => {expect(checkForLimitClause('select event_message from edge_logs -- limit 10')).toBe(false)})})++ describe('genChartQuery', () => {+ // Regression: an unparseable iso_timestamp_start used to reach+ // startOffset.toISOString() as an Invalid Date and throw RangeError.+ test('falls back to minute buckets for an unparseable time range without throwing', () => {+ const params = { iso_timestamp_start: 'not-a-date', iso_timestamp_end: 'also-bad' }+ expect(() => genChartQuery(LogsTableName.AUTH, params as any, {})).not.toThrow()+ expect(genChartQuery(LogsTableName.AUTH, params as any, {})).toContain(+ 'timestamp_trunc(t.timestamp, minute)'+ )+ })+ })++ describe('ensureNoTimestampConflict', () => {+ test('does not throw for unparseable initial timestamps', () => {+ expect(() =>+ ensureNoTimestampConflict(['not-a-date', 'also-bad'], ['', '2024-01-01T00:00:00.000Z'])+ ).not.toThrow()+ })+ })})diff --git a/apps/studio/components/interfaces/Settings/Logs/Logs.utils.ts b/apps/studio/components/interfaces/Settings/Logs/Logs.utils.tsindex 75bc018d32f..68c318dca37 100644--- a/apps/studio/components/interfaces/Settings/Logs/Logs.utils.ts+++ b/apps/studio/components/interfaces/Settings/Logs/Logs.utils.ts@@ -365,13 +365,20 @@ export const genCountQuery = (table: LogsTableName, filters: Filters): SafeLogSqreturn safeSql`SELECT count(*) as count FROM ${LOG_TABLE_SQL[table]} ${joins} ${where}`}+// Falls back to now for missing or unparseable params so an Invalid Date can't+// reach .toISOString() downstream and throw RangeError (Sentry 7580074952).+export const resolveLogTimestamp = (value?: string): Dayjs => {+ const parsed = dayjs(value)+ return value && parsed.isValid() ? parsed : dayjs()+}+/** calculates how much the chart start datetime should be offset given the current datetime filter params */const calcChartStart = (params: Partial<LogsEndpointParams>): [Dayjs, 'minute' | 'hour' | 'day'] => {- const ite = params.iso_timestamp_end ? dayjs(params.iso_timestamp_end) : dayjs()+ const ite = resolveLogTimestamp(params.iso_timestamp_end)// todo @TzeYiing needs typing- const its: any = params.iso_timestamp_start ? dayjs(params.iso_timestamp_start) : dayjs()+ const its: any = resolveLogTimestamp(params.iso_timestamp_start)let trunc: 'minute' | 'hour' | 'day' = 'minute'let extendValue = 60 * 6@@ -449,14 +456,12 @@ export const ensureNoTimestampConflict = ([nextStart, nextEnd]: TsPair): TsPair => {if (initialStart && initialEnd && nextEnd && !nextStart) {- const resolvedDiff = dayjs(nextEnd).diff(dayjs(initialStart))- let start = dayjs(initialStart)-- if (resolvedDiff <= 0) {- // start ts is definitely before end ts- const currDiff = Math.abs(dayjs(initialEnd).diff(start, 'minute'))- // shift start ts backwards by the current ts difference- start = dayjs(nextEnd).subtract(currDiff, 'minute')+ const end = resolveLogTimestamp(nextEnd)+ let start = resolveLogTimestamp(initialStart)++ if (end.diff(start) <= 0) {+ const currDiff = Math.abs(resolveLogTimestamp(initialEnd).diff(start, 'minute'))+ start = end.subtract(currDiff, 'minute')}return [start.toISOString(), nextEnd]} else if (!nextEnd && nextStart) {