Skip to content

The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.

Joshen/fe 3661 show actual storage logs instead of api gateway logs (#47235)

Joshen Lim3cf5cc634bdf
diff --git a/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.queries.test.ts b/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.queries.test.ts
index 734961e7a09..ae523692644 100644
--- a/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.queries.test.ts
+++ b/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.queries.test.ts
@@ -35,9 +35,11 @@ describe('UnifiedLogs.queries (OTEL flat)', () => {
)
})
- it('routes the `storage` log type to edge_logs filtered by /storage/', () => {
+ it('routes the `storage` log type to storage_logs or edge_logs /storage/', () => {
const sql = getUnifiedLogsQuery(withFilters('log_type:eq:storage'))
- expect(sql).toContain(
+ const where = sql.split(/\bWHERE\b/)[1] ?? ''
+ expect(where).toContain(`source = 'storage_logs'`)
+ expect(where).toContain(
`source = 'edge_logs' AND log_attributes['request.path'] LIKE '%/storage/%'`
)
})
@@ -170,6 +172,15 @@ describe('UnifiedLogs.queries (OTEL flat)', () => {
const logTypeWhere = whereOfBranchContaining(sql, `'log_type'`)
expect(logTypeWhere).not.toContain(`LIKE '%/rest/%'`)
})
+
+ it('applies the connection-logs filter to every count scan so badges match the list', () => {
+ const sql = getLogsCountQuery({ ...baseSearch, hide_connection_logs: true } as any)
+ const scans = sql.split(/\bUNION ALL\b/)
+ expect(scans.length).toBeGreaterThan(1)
+ for (const scan of scans) {
+ expect(scan).toContain("event_message NOT LIKE 'connection received%'")
+ }
+ })
})
describe('getLogsChartQuery', () => {
diff --git a/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.queries.ts b/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.queries.ts
index 933cb626afa..d1fd27db286 100644
--- a/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.queries.ts
+++ b/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.queries.ts
@@ -55,8 +55,9 @@ const HTTP_STATUS_EXPR: SafeLogSqlFragment = safeSql`if(source = 'auth_logs', lo
* logs; the UI surfaces gateway HTTP traffic for those buckets.
*/
const LOG_TYPE_CONDITION: Record<string, SafeLogSqlFragment> = {
+ edge: safeSql`source = 'edge_logs' AND ${ATTR.path} NOT LIKE '%/rest/%' AND ${ATTR.path} NOT LIKE '%/storage/%'`,
postgrest: safeSql`source = 'postgrest_logs' OR (source = 'edge_logs' AND ${ATTR.path} LIKE '%/rest/%')`,
- storage: safeSql`source = 'edge_logs' AND ${ATTR.path} LIKE '%/storage/%'`,
+ storage: safeSql`source = 'storage_logs' OR (source = 'edge_logs' AND ${ATTR.path} LIKE '%/storage/%')`,
postgres: safeSql`source = 'postgres_logs'`,
'edge function': safeSql`source = 'function_edge_logs'`,
auth: safeSql`source = 'auth_logs'`,
@@ -66,10 +67,10 @@ const LOG_TYPE_CONDITION: Record<string, SafeLogSqlFragment> = {
}
// Derived `log_type` column for SELECT / GROUP BY / countIf use.
-// WHEN source = 'edge_logs' AND ${ATTR.path} LIKE '%/rest/%' THEN 'postgrest'
const LOG_TYPE_EXPR: SafeLogSqlFragment = safeSql`CASE
WHEN source = 'postgrest_logs' THEN 'postgrest'
WHEN source = 'edge_logs' AND ${ATTR.path} LIKE '%/rest/%' THEN 'postgrest'
+ WHEN source = 'storage_logs' THEN 'storage'
WHEN source = 'edge_logs' AND ${ATTR.path} LIKE '%/storage/%' THEN 'storage'
WHEN source = 'edge_logs' THEN 'edge'
WHEN source = 'postgres_logs' THEN 'postgres'
@@ -293,14 +294,17 @@ const buildBaseWhere = (
}
}
+ const connFilter = connectionLogsFilter(search)
+ if (connFilter) parts.push(connFilter)
+
return parts
}
/**
* Returns a WHERE condition that excludes Postgres connection lifecycle messages.
- * Applied only to the row query and chart query so sidebar facets remain unaffected
- * (the OTEL endpoint's UNION ALL count query fails silently when this condition is
- * included there, returning empty facet data).
+ * Shared by every query via `buildBaseWhere`, so the row list, chart and sidebar
+ * facet counts all hide connection logs together (otherwise the badges over-count
+ * by the connection rows the list hides).
*/
const connectionLogsFilter = (search: QuerySearchParamsType): SafeLogSqlFragment | null => {
if (!search.hide_connection_logs) return null
@@ -316,8 +320,6 @@ const connectionLogsFilter = (search: QuerySearchParamsType): SafeLogSqlFragment
*/
export const getUnifiedLogsQuery = (search: QuerySearchParamsType): SafeLogSqlFragment => {
const conditions = buildBaseWhere(search)
- const connFilter = connectionLogsFilter(search)
- if (connFilter) conditions.push(connFilter)
return safeSql`
SELECT ${rowProjection()}
FROM logs
@@ -443,8 +445,6 @@ export const getLogsChartQuery = (search: QuerySearchParamsType): SafeLogSqlFrag
const truncationLevel = calculateChartBucketing(search)
const truncFn = truncationFunction(truncationLevel)
const conditions = buildBaseWhere(search)
- const connFilter = connectionLogsFilter(search)
- if (connFilter) conditions.push(connFilter)
return safeSql`
SELECT