The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.
TypeScript aialternativeauthdatabasedenoembeddingsexamplefirebasenextjsoauth2pgvectorpostgispostgrespostgresqlpostgrestrealtimesupabasevectorswebsockets
fix(logs): default unified logs to otel DEBUG-228 (#51089)
Jordi Enric7d04c430824d
diff --git a/apps/studio/data/logs/get-unified-logs.ts b/apps/studio/data/logs/get-unified-logs.tsindex fbcc0c4dc71..f9030b2b966 100644--- a/apps/studio/data/logs/get-unified-logs.ts+++ b/apps/studio/data/logs/get-unified-logs.ts@@ -1,9 +1,8 @@import { useMutation } from '@tanstack/react-query'-import { useFlag } from 'common'import { toast } from 'sonner'import { logsAllEndpointUrl, pickLogsQueryBuilder } from './logs-endpoint'-import { getUnifiedLogsISOStartEnd } from './unified-logs-infinite-query'+import { getUnifiedLogsISOStartEnd, useUnifiedLogsBackend } from './unified-logs-infinite-query'import { mapUnifiedLogRow, parseUnifiedLogsQueryRows } from './unified-logs.utils'import { getUnifiedLogsQuery } from '@/components/interfaces/UnifiedLogs/UnifiedLogs.queries'import { getUnifiedLogsQuery as getUnifiedLogsQueryBq } from '@/components/interfaces/UnifiedLogs/UnifiedLogs.queries.bq'@@ -58,7 +57,7 @@ export const useGetUnifiedLogsMutation = ({UseCustomMutationOptions<LogDrainCreateData, ResponseError, getUnifiedLogsVariables>,'mutationFn'> = {}) => {- const useOtel = useFlag('otelUnifiedLogs')+ const useOtel = useUnifiedLogsBackend()return useMutation<LogDrainCreateData, ResponseError, getUnifiedLogsVariables>({mutationFn: (vars) => retrieveUnifiedLogs({ ...vars, useOtel: vars.useOtel ?? useOtel }),async onSuccess(data, variables, context) {diff --git a/apps/studio/data/logs/unified-log-inspection-query.ts b/apps/studio/data/logs/unified-log-inspection-query.tsindex 216a173fab2..43894fbe7d1 100644--- a/apps/studio/data/logs/unified-log-inspection-query.ts+++ b/apps/studio/data/logs/unified-log-inspection-query.ts@@ -1,5 +1,4 @@import { useQuery } from '@tanstack/react-query'-import { useFlag } from 'common'import { executeAnalyticsSql } from './execute-analytics-sql'import { logsKeys } from './keys'@@ -12,6 +11,7 @@ import { analyticsLiteral as lit, safeSql, type SafeLogSqlFragment } from './safimport {getUnifiedLogsISOStartEnd,UNIFIED_LOGS_QUERY_OPTIONS,+ useUnifiedLogsBackend,} from './unified-logs-infinite-query'import {getAuthServiceFlowQuery,@@ -301,7 +301,7 @@ export const useUnifiedLogInspectionQuery = <TData = UnifiedLogInspectionData>(...options}: UseCustomQueryOptions<UnifiedLogInspectionData, UnifiedLogInspectionError, TData> = {}) => {- const useOtel = !!useFlag('otelUnifiedLogs')+ const useOtel = useUnifiedLogsBackend()return useQuery<UnifiedLogInspectionData, UnifiedLogInspectionError, TData>({queryKey: [...logsKeys.serviceFlow(projectRef, search, logId), { otel: useOtel }],queryFn: ({ signal }) =>diff --git a/apps/studio/data/logs/unified-logs-chart-query.ts b/apps/studio/data/logs/unified-logs-chart-query.tsindex 6a9315153d1..2af1561f304 100644--- a/apps/studio/data/logs/unified-logs-chart-query.ts+++ b/apps/studio/data/logs/unified-logs-chart-query.ts@@ -1,10 +1,13 @@import { keepPreviousData, useQuery } from '@tanstack/react-query'-import { useFlag } from 'common'import { executeAnalyticsSql } from './execute-analytics-sql'import { logsKeys } from './keys'import { logsAllEndpointUrl, pickLogsQueryBuilder } from './logs-endpoint'-import { UNIFIED_LOGS_QUERY_OPTIONS, UnifiedLogsVariables } from './unified-logs-infinite-query'+import {+ UNIFIED_LOGS_QUERY_OPTIONS,+ UnifiedLogsVariables,+ useUnifiedLogsBackend,+} from './unified-logs-infinite-query'import { parseLogsFilterUrlParams } from '@/components/interfaces/UnifiedLogs/UnifiedLogs.filters'import { getLogsChartQuery } from '@/components/interfaces/UnifiedLogs/UnifiedLogs.queries'import { getLogsChartQuery as getLogsChartQueryBq } from '@/components/interfaces/UnifiedLogs/UnifiedLogs.queries.bq'@@ -163,7 +166,7 @@ export const useUnifiedLogsChartQuery = <TData = UnifiedLogsChartData>(...options}: UseCustomQueryOptions<UnifiedLogsChartData, UnifiedLogsChartError, TData> = {}) => {- const useOtel = useFlag('otelUnifiedLogs')+ const useOtel = useUnifiedLogsBackend()return useQuery<UnifiedLogsChartData, UnifiedLogsChartError, TData>({queryKey: [...logsKeys.unifiedLogsChart(projectRef, search), { otel: useOtel }],queryFn: ({ signal }) => getUnifiedLogsChart({ projectRef, search, useOtel }, signal),diff --git a/apps/studio/data/logs/unified-logs-count-query.ts b/apps/studio/data/logs/unified-logs-count-query.tsindex 0a49dfbadd6..69fae9f7817 100644--- a/apps/studio/data/logs/unified-logs-count-query.ts+++ b/apps/studio/data/logs/unified-logs-count-query.ts@@ -1,5 +1,4 @@import { useQuery } from '@tanstack/react-query'-import { useFlag } from 'common'import { executeAnalyticsSql } from './execute-analytics-sql'import { logsKeys } from './keys'@@ -8,6 +7,7 @@ import {getUnifiedLogsISOStartEnd,UNIFIED_LOGS_QUERY_OPTIONS,UnifiedLogsVariables,+ useUnifiedLogsBackend,} from './unified-logs-infinite-query'import { getLogsCountQuery } from '@/components/interfaces/UnifiedLogs/UnifiedLogs.queries'import { getLogsCountQuery as getLogsCountQueryBq } from '@/components/interfaces/UnifiedLogs/UnifiedLogs.queries.bq'@@ -90,7 +90,7 @@ export const useUnifiedLogsCountQuery = <TData = UnifiedLogsCountData>(...options}: UseCustomQueryOptions<UnifiedLogsCountData, UnifiedLogsCountError, TData> = {}) => {- const useOtel = useFlag('otelUnifiedLogs')+ const useOtel = useUnifiedLogsBackend()return useQuery<UnifiedLogsCountData, UnifiedLogsCountError, TData>({queryKey: [...logsKeys.unifiedLogsCount(projectRef, search), { otel: useOtel }],queryFn: ({ signal }) => getUnifiedLogsCount({ projectRef, search, useOtel }, signal),diff --git a/apps/studio/data/logs/unified-logs-facet-count-query.ts b/apps/studio/data/logs/unified-logs-facet-count-query.tsindex ef26390917e..43dde999327 100644--- a/apps/studio/data/logs/unified-logs-facet-count-query.ts+++ b/apps/studio/data/logs/unified-logs-facet-count-query.ts@@ -1,5 +1,4 @@import { useQuery } from '@tanstack/react-query'-import { useFlag } from 'common'import { executeAnalyticsSql } from './execute-analytics-sql'import { logsKeys } from './keys'@@ -9,6 +8,7 @@ import {getUnifiedLogsISOStartEnd,UNIFIED_LOGS_QUERY_OPTIONS,UnifiedLogsVariables,+ useUnifiedLogsBackend,} from './unified-logs-infinite-query'import { getFacetCountQuery } from '@/components/interfaces/UnifiedLogs/UnifiedLogs.queries'import {@@ -65,7 +65,7 @@ export const useUnifiedLogsFacetCountQuery = <TData = UnifiedLogsFacetCountData>...options}: UseCustomQueryOptions<UnifiedLogsFacetCountData, UnifiedLogsFacetCountError, TData> = {}) => {- const useOtel = !!useFlag('otelUnifiedLogs')+ const useOtel = useUnifiedLogsBackend()return useQuery<UnifiedLogsFacetCountData, UnifiedLogsFacetCountError, TData>({queryKey: [...logsKeys.unifiedLogsFacetCount(projectRef, facet, facetSearch, search),diff --git a/apps/studio/data/logs/unified-logs-infinite-query.ts b/apps/studio/data/logs/unified-logs-infinite-query.tsindex cf564c9c81f..86f3c68b8cd 100644--- a/apps/studio/data/logs/unified-logs-infinite-query.ts+++ b/apps/studio/data/logs/unified-logs-infinite-query.ts@@ -1,5 +1,5 @@import { InfiniteData, keepPreviousData, useInfiniteQuery } from '@tanstack/react-query'-import { useFlag } from 'common'+import { useFeatureFlags } from 'common'import { executeAnalyticsSql } from './execute-analytics-sql'import { logsKeys } from './keys'@@ -29,6 +29,11 @@ export type UnifiedLogsData = anyexport type UnifiedLogsError = ResponseErrorexport type UnifiedLogsVariables = { projectRef?: string; search: QuerySearchParamsType }+export const useUnifiedLogsBackend = () => {+ const { otelUnifiedLogs = true } = useFeatureFlags().configcat+ return typeof otelUnifiedLogs === 'boolean' ? otelUnifiedLogs : true+}+export const getUnifiedLogsISOStartEnd = (search: QuerySearchParamsType,endHoursFromNow: number = 1@@ -152,12 +157,11 @@ export const useUnifiedLogsInfiniteQuery = <TData = UnifiedLogsData>(PageParam | null> = {}) => {- const useOtel = useFlag('otelUnifiedLogs')+ const useOtel = useUnifiedLogsBackend()return useInfiniteQuery({queryKey: [...logsKeys.unifiedLogsInfinite(projectRef, search), { otel: useOtel }],- queryFn: ({ signal, pageParam }) => {- return getUnifiedLogs({ projectRef, search, pageParam, useOtel }, signal)- },+ queryFn: ({ signal, pageParam }) =>+ getUnifiedLogs({ projectRef, search, pageParam, useOtel }, signal),enabled: enabled && typeof projectRef !== 'undefined',placeholderData: keepPreviousData,getPreviousPageParam: (firstPage) => {diff --git a/apps/studio/routes/__root.tsx b/apps/studio/routes/__root.tsxindex de414f0b2b0..a7abe08003a 100644--- a/apps/studio/routes/__root.tsx+++ b/apps/studio/routes/__root.tsx@@ -341,7 +341,7 @@ export const Route = createRootRouteWithContext<RouterContext>()({maintenanceMode: IS_MAINTENANCE_MODE,hash: location.hash,})- if (!match) return+ if (!match) return undefined// `to`/`search`/`hash`, never `href`: the router treats `href` as an// opaque (external) target, and preloading a Link whose beforeLoad// throws `redirect({ href })` recurses forever — the preload retry