Skip to content

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

chore(telemetry): clean up frontend event catalog (#45964)

Pamela Chia0bed80b34044
diff --git a/apps/studio/components/grid/components/grid/Grid.tsx b/apps/studio/components/grid/components/grid/Grid.tsx
index f6df2b27017..50f38de5c2a 100644
--- a/apps/studio/components/grid/components/grid/Grid.tsx
+++ b/apps/studio/components/grid/components/grid/Grid.tsx
@@ -25,10 +25,9 @@ import { formatForeignKeys } from '@/components/interfaces/TableGridEditor/SideP
import { useForeignKeyConstraintsQuery } from '@/data/database/foreign-key-constraints-query'
import { ENTITY_TYPE } from '@/data/entity-types/entity-type-constants'
import { isTableLike } from '@/data/table-editor/table-editor-types'
-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'
-import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { useCsvFileDrop } from '@/hooks/ui/useCsvFileDrop'
+import { useTrack } from '@/lib/telemetry/track'
import { useTableEditorStateSnapshot } from '@/state/table-editor'
import { useTableEditorTableStateSnapshot } from '@/state/table-editor-table'
import { ResponseError } from '@/types'
@@ -69,7 +68,6 @@ export const Grid = memo(
const snap = useTableEditorTableStateSnapshot()
const { filters, clearFilters } = useTableFilter()
- const { data: org } = useSelectedOrganizationQuery()
const { data: project } = useSelectedProjectQuery()
const onRowsChange = useOnRowsChange(rows)
@@ -92,20 +90,12 @@ export const Grid = memo(
const isForeignTable = tableEntityType === ENTITY_TYPE.FOREIGN_TABLE
const isTableEmpty = (rows ?? []).length === 0
- const { mutate: sendEvent } = useSendEventMutation()
+ const track = useTrack()
const { isDraggedOver, onDragOver, onFileDrop } = useCsvFileDrop({
enabled: isTableEmpty && !isForeignTable,
onFileDropped: (file) => tableEditorSnap.onImportData(valtioRef(file)),
- onTelemetryEvent: (eventName) => {
- sendEvent({
- action: eventName,
- groups: {
- project: project?.ref ?? 'Unknown',
- organization: org?.slug ?? 'Unknown',
- },
- })
- },
+ onTelemetryEvent: (eventName) => track(eventName),
})
const { data } = useForeignKeyConstraintsQuery({
@@ -339,14 +329,7 @@ export const Grid = memo(
className="pointer-events-auto"
onClick={() => {
tableEditorSnap.onImportData()
- sendEvent({
- action: 'import_data_button_clicked',
- properties: { tableType: 'Existing Table' },
- groups: {
- project: project?.ref ?? 'Unknown',
- organization: org?.slug ?? 'Unknown',
- },
- })
+ track('import_data_button_clicked', { tableType: 'Existing Table' })
}}
>
Import data from CSV
diff --git a/apps/studio/components/interfaces/Integrations/CronJobs/DeleteCronJob.tsx b/apps/studio/components/interfaces/Integrations/CronJobs/DeleteCronJob.tsx
index c59bfbef728..ae9a700053f 100644
--- a/apps/studio/components/interfaces/Integrations/CronJobs/DeleteCronJob.tsx
+++ b/apps/studio/components/interfaces/Integrations/CronJobs/DeleteCronJob.tsx
@@ -3,17 +3,16 @@ import { useEffect } from 'react'
import { toast } from 'sonner'
import { ConfirmationModal } from 'ui-patterns/Dialogs/ConfirmationModal'
+import { parseCronJobCommand } from './CronJobs.utils'
import { useCronJobsData } from './CronJobsTab.useCronJobsData'
import { TextConfirmModal } from '@/components/ui/TextConfirmModalWrapper'
import { useDatabaseCronJobDeleteMutation } from '@/data/database-cron-jobs/database-cron-jobs-delete-mutation'
-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'
-import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { cleanPointerEventsNoneOnBody } from '@/lib/helpers'
+import { useTrack } from '@/lib/telemetry/track'
export const DeleteCronJob = () => {
const { data: project } = useSelectedProjectQuery()
- const { data: org } = useSelectedOrganizationQuery()
const [searchQuery] = useQueryState('search', parseAsString.withDefault(''))
const [cronJobIdForDeletion, setCronJobForDeletion] = useQueryState('delete', parseAsString)
@@ -25,17 +24,17 @@ export const DeleteCronJob = () => {
})
const cronJob = grid.rows.find((j) => j.jobid.toString() === cronJobIdForDeletion)
- const { mutate: sendEvent } = useSendEventMutation()
+ const track = useTrack()
const {
mutate: deleteDatabaseCronJob,
isPending,
isSuccess: isSuccessDelete,
} = useDatabaseCronJobDeleteMutation({
onSuccess: () => {
- sendEvent({
- action: 'cron_job_removed',
- groups: { project: project?.ref ?? 'Unknown', organization: org?.slug ?? 'Unknown' },
- })
+ if (cronJob && project) {
+ const { type } = parseCronJobCommand(cronJob.command, project.ref)
+ track('cron_job_removed', { type })
+ }
toast.success(`Successfully removed cron job`)
setCronJobForDeletion(null)
},
diff --git a/apps/studio/components/interfaces/LogDrains/LogDrains.tsx b/apps/studio/components/interfaces/LogDrains/LogDrains.tsx
index af68874c678..0c773fc5b50 100644
--- a/apps/studio/components/interfaces/LogDrains/LogDrains.tsx
+++ b/apps/studio/components/interfaces/LogDrains/LogDrains.tsx
@@ -210,7 +210,7 @@ export function LogDrains({
onConfirm={() => {
if (selectedLogDrain && ref) {
deleteLogDrain({ token: selectedLogDrain.token, projectRef: ref })
- track('log_drain_confirm_button_submitted', {
+ track('log_drain_removed', {
destination: selectedLogDrain.type,
})
}
diff --git a/apps/studio/components/interfaces/Organization/Documents/DPA.tsx b/apps/studio/components/interfaces/Organization/Documents/DPA.tsx
index a00b50aaab5..87a2b5b7ef6 100644
--- a/apps/studio/components/interfaces/Organization/Documents/DPA.tsx
+++ b/apps/studio/components/interfaces/Organization/Documents/DPA.tsx
@@ -10,9 +10,9 @@ import {
import { InlineLink } from '@/components/ui/InlineLink'
import { TextConfirmModal } from '@/components/ui/TextConfirmModalWrapper'
import { useDpaRequestMutation } from '@/data/documents/dpa-request-mutation'
-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'
import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
import { useProfile } from '@/lib/profile'
+import { useTrack } from '@/lib/telemetry/track'
export const DPA = () => {
const { profile } = useProfile()
@@ -21,7 +21,7 @@ export const DPA = () => {
const [isOpen, setIsOpen] = useState(false)
- const { mutate: sendEvent } = useSendEventMutation()
+ const track = useTrack()
const { mutate: requestDpa, isPending: isRequesting } = useDpaRequestMutation({
onSuccess: () => {
toast.success('DPA request sent successfully')
@@ -49,12 +49,7 @@ export const DPA = () => {
You can review a static PDF version of our latest DPA document{' '}
<InlineLink
href="https://supabase.com/downloads/docs/Supabase+DPA+260317.pdf"
- onClick={() =>
- sendEvent({
- action: 'dpa_pdf_opened',
- properties: { source: 'studio' },
- })
- }
+ onClick={() => track('dpa_pdf_opened', { source: 'studio' })}
>
here
</InlineLink>
@@ -67,9 +62,7 @@ export const DPA = () => {
<Button
onClick={() => {
setIsOpen(true)
- sendEvent({
- action: 'dpa_request_button_clicked',
- })
+ track('dpa_request_button_clicked')
}}
type="default"
>
diff --git a/apps/studio/components/interfaces/QueryPerformance/IndexAdvisor/EnableIndexAdvisorButton.tsx b/apps/studio/components/interfaces/QueryPerformance/IndexAdvisor/EnableIndexAdvisorButton.tsx
index b0740471179..98c4dcdd41d 100644
--- a/apps/studio/components/interfaces/QueryPerformance/IndexAdvisor/EnableIndexAdvisorButton.tsx
+++ b/apps/studio/components/interfaces/QueryPerformance/IndexAdvisor/EnableIndexAdvisorButton.tsx
@@ -28,7 +28,7 @@ export const EnableIndexAdvisorButton = () => {
type="primary"
onClick={() => {
setIsDialogOpen(true)
- track('index_advisor_banner_enable_button_clicked')
+ track('index_advisor_enable_button_clicked', { origin: 'banner' })
}}
>
Enable
@@ -112,7 +112,7 @@ export const EnableIndexAdvisorDialog = ({
onClick={(e) => {
e.preventDefault()
onEnableIndexAdvisor()
- track('index_advisor_dialog_enable_button_clicked')
+ track('index_advisor_enable_button_clicked', { origin: 'dialog' })
}}
disabled={isEnablingExtension}
>
diff --git a/apps/studio/components/layouts/Navigation/LayoutHeader/HeaderUpgradeButton.tsx b/apps/studio/components/layouts/Navigation/LayoutHeader/HeaderUpgradeButton.tsx
index f7f833d716d..e4de5957c25 100644
--- a/apps/studio/components/layouts/Navigation/LayoutHeader/HeaderUpgradeButton.tsx
+++ b/apps/studio/components/layouts/Navigation/LayoutHeader/HeaderUpgradeButton.tsx
@@ -4,7 +4,8 @@ import { useTrackExperimentExposure } from '@/hooks/misc/useTrackExperimentExpos
import { usePHFlag } from '@/hooks/ui/useFlag'
import { useTrack } from '@/lib/telemetry/track'
-const EXPERIMENT_ID = 'headerUpgradeCta'
+const EXPERIMENT_FLAG_KEY = 'headerUpgradeCta'
+const EXPERIMENT_EXPOSURE_NAME = 'header_upgrade_cta'
type HeaderUpgradeCtaVariant = 'control' | 'test'
interface HeaderUpgradeButtonProps {
@@ -14,15 +15,14 @@ interface HeaderUpgradeButtonProps {
export const HeaderUpgradeButton = ({ className }: HeaderUpgradeButtonProps) => {
const track = useTrack()
const { data: organization } = useSelectedOrganizationQuery()
- const flagValue = usePHFlag<HeaderUpgradeCtaVariant | false>(EXPERIMENT_ID)
+ const flagValue = usePHFlag<HeaderUpgradeCtaVariant | false>(EXPERIMENT_FLAG_KEY)
const isFreePlan = organization?.plan?.id === 'free'
const isInExperiment = flagValue === 'control' || flagValue === 'test'
const showButton = flagValue === 'test'
- // Track experiment exposure for all free-plan users in the experiment (both control and test)
const variant = isFreePlan && isInExperiment ? (flagValue as string) : undefined
- useTrackExperimentExposure(EXPERIMENT_ID, variant)
+ useTrackExperimentExposure(EXPERIMENT_EXPOSURE_NAME, variant)
if (!isFreePlan) return null
if (!showButton) return null
@@ -31,5 +31,7 @@ export const HeaderUpgradeButton = ({ className }: HeaderUpgradeButtonProps) =>
track('header_upgrade_cta_clicked')
}
- return <UpgradePlanButton source={EXPERIMENT_ID} className={className} onClick={handleClick} />
+ return (
+ <UpgradePlanButton source={EXPERIMENT_FLAG_KEY} className={className} onClick={handleClick} />
+ )
}
diff --git a/apps/studio/components/ui/AIAssistantPanel/AIAssistant.utils.ts b/apps/studio/components/ui/AIAssistantPanel/AIAssistant.utils.ts
index 63c27863253..84337a5d16c 100644
--- a/apps/studio/components/ui/AIAssistantPanel/AIAssistant.utils.ts
+++ b/apps/studio/components/ui/AIAssistantPanel/AIAssistant.utils.ts
@@ -13,8 +13,10 @@ import { tableKeys } from '@/data/tables/keys'
import { tryParseJson } from '@/lib/helpers'
import { ResponseError } from '@/types'
+export type MutationCategory = 'functions' | 'rls-policies'
+
// [Joshen] This is just very basic identification, but possible can extend perhaps
-export const identifyQueryType = (query: string) => {
+export const identifyQueryType = (query: string): MutationCategory | undefined => {
const formattedQuery = query.toLowerCase().replaceAll('\n', ' ')
if (
formattedQuery.includes('create function') ||
@@ -24,6 +26,7 @@ export const identifyQueryType = (query: string) => {
} else if (formattedQuery.includes('create policy') || formattedQuery.includes('alter policy')) {
return 'rls-policies'
}
+ return undefined
}
// Check for function calls that aren't in the safe list
diff --git a/apps/studio/components/ui/AIAssistantPanel/DisplayBlockRenderer.tsx b/apps/studio/components/ui/AIAssistantPanel/DisplayBlockRenderer.tsx
index 41a590b7fda..4bfca27f22a 100644
--- a/apps/studio/components/ui/AIAssistantPanel/DisplayBlockRenderer.tsx
+++ b/apps/studio/components/ui/AIAssistantPanel/DisplayBlockRenderer.tsx
@@ -14,11 +14,10 @@ import { entityTypeKeys } from '@/data/entity-types/keys'
import { lintKeys } from '@/data/lint/keys'
import { usePrimaryDatabase } from '@/data/read-replicas/replicas-query'
import { useExecuteSqlMutation } from '@/data/sql/execute-sql-mutation'
-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'
import { useChangedSync } from '@/hooks/misc/useChanged'
import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
-import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
import { useProfile } from '@/lib/profile'
+import { useTrack } from '@/lib/telemetry/track'
interface DisplayBlockRendererProps {
messageId: string
@@ -77,9 +76,8 @@ export const DisplayBlockRenderer = ({
const router = useRouter()
const { ref } = useParams()
const { profile } = useProfile()
- const { data: org } = useSelectedOrganizationQuery()
- const { mutate: sendEvent } = useSendEventMutation()
+ const track = useTrack()
const { can: canCreateSQLSnippet } = useAsyncCheckPermissions(
PermissionAction.CREATE,
'user_content',
@@ -141,16 +139,11 @@ export const DisplayBlockRenderer = ({
onQueryRun?.(queryType)
- sendEvent({
- action: 'assistant_suggestion_run_query_clicked',
- properties: {
- queryType,
- ...(queryType === 'mutation' ? { category: identifyQueryType(sqlQuery) ?? 'unknown' } : {}),
- },
- groups: {
- project: ref ?? 'Unknown',
- organization: org?.slug ?? 'Unknown',
- },
+ track('assistant_suggestion_run_query_clicked', {
+ queryType,
+ ...(queryType === 'mutation'
+ ? { mutationType: identifyQueryType(sqlQuery) ?? 'unknown' }
+ : {}),
})
}
diff --git a/apps/studio/hooks/misc/__tests__/useDataApiRevokeOnCreateDefault.test.ts b/apps/studio/hooks/misc/__tests__/useDataApiRevokeOnCreateDefault.test.ts
index c4e2ee97841..2836b2199e3 100644
--- a/apps/studio/hooks/misc/__tests__/useDataApiRevokeOnCreateDefault.test.ts
+++ b/apps/studio/hooks/misc/__tests__/useDataApiRevokeOnCreateDefault.test.ts
@@ -102,31 +102,49 @@ describe('useTrackDefaultPrivilegesExposure', () => {
vi.mocked(usePHFlag).mockReturnValue(true)
renderHook(() => useTrackDefaultPrivilegesExposure({ surface: 'main', dataApiEnabled: true }))
expect(track).toHaveBeenCalledTimes(1)
- expect(track).toHaveBeenCalledWith('project_creation_default_privileges_exposed', {
- surface: 'main',
- dataApiEnabled: true,
- dataApiRevokeOnCreateDefaultEnabled: true,
- })
+ expect(track).toHaveBeenCalledWith(
+ 'project_creation_default_privileges_exposed',
+ {
+ surface: 'main',
+ dataApiEnabled: true,
+ dataApiRevokeOnCreateDefaultEnabled: true,
+ },
+ undefined
+ )
})
it('fires once when the flag resolves to false on the main surface', () => {
vi.mocked(usePHFlag).mockReturnValue(false)
renderHook(() => useTrackDefaultPrivilegesExposure({ surface: 'main', dataApiEnabled: false }))
expect(track).toHaveBeenCalledTimes(1)
- expect(track).toHaveBeenCalledWith('project_creation_default_privileges_exposed', {
- surface: 'main',
- dataApiEnabled: false,
- dataApiRevokeOnCreateDefaultEnabled: false,
- })
+ expect(track).toHaveBeenCalledWith(
+ 'project_creation_default_privileges_exposed',
+ {
+ surface: 'main',
+ dataApiEnabled: false,
+ dataApiRevokeOnCreateDefaultEnabled: false,
+ },
+ undefined
+ )
})
it('omits dataApiEnabled on the vercel surface', () => {
vi.mocked(usePHFlag).mockReturnValue(true)
- renderHook(() => useTrackDefaultPrivilegesExposure({ surface: 'vercel' }))
- expect(track).toHaveBeenCalledWith('project_creation_default_privileges_exposed', {
- surface: 'vercel',
- dataApiRevokeOnCreateDefaultEnabled: true,
- })
+ renderHook(() => useTrackDefaultPrivilegesExposure({ surface: 'vercel', orgSlug: 'acme-org' }))
+ expect(track).toHaveBeenCalledWith(
+ 'project_creation_default_privileges_exposed',
+ {
+ surface: 'vercel',
+ dataApiRevokeOnCreateDefaultEnabled: true,
+ },
+ { organization: 'acme-org' }
+ )
+ })
+
+ it('skips emission on vercel surface when orgSlug is missing', () => {
+ vi.mocked(usePHFlag).mockReturnValue(true)
+ renderHook(() => useTrackDefaultPrivilegesExposure({ surface: 'vercel', orgSlug: undefined }))
+ expect(track).not.toHaveBeenCalled()
})
it('deduplicates across re-renders', () => {
@@ -149,7 +167,8 @@ describe('useTrackDefaultPrivilegesExposure', () => {
expect(track).toHaveBeenCalledTimes(1)
expect(track).toHaveBeenCalledWith(
'project_creation_default_privileges_exposed',
- expect.objectContaining({ dataApiRevokeOnCreateDefaultEnabled: false })
+ expect.objectContaining({ dataApiRevokeOnCreateDefaultEnabled: false }),
+ undefined
)
})
})
diff --git a/apps/studio/hooks/misc/useDataApiRevokeOnCreateDefault.ts b/apps/studio/hooks/misc/useDataApiRevokeOnCreateDefault.ts
index 5299d6cdac9..9bef1f1587b 100644
--- a/apps/studio/hooks/misc/useDataApiRevokeOnCreateDefault.ts
+++ b/apps/studio/hooks/misc/useDataApiRevokeOnCreateDefault.ts
@@ -26,7 +26,7 @@ export const useDataApiRevokeOnCreateDefaultEnabled = (): boolean => {
type DefaultPrivilegesExposureOptions =
| { surface: 'main'; dataApiEnabled: boolean }
- | { surface: 'vercel' }
+ | { surface: 'vercel'; orgSlug: string | undefined }
/**
* Fires `project_creation_default_privileges_exposed` once per mount after both
@@ -47,6 +47,7 @@ export const useTrackDefaultPrivilegesExposure = (options: DefaultPrivilegesExpo
const { surface } = options
const dataApiEnabled = options.surface === 'main' ? options.dataApiEnabled : null
+ const orgSlug = options.surface === 'vercel' ? options.orgSlug : undefined
// Mark ready once org_count appears on the SDK person. A /flags/ response
// received after our identify will have included org_count in the evaluation,
@@ -67,11 +68,16 @@ export const useTrackDefaultPrivilegesExposure = (options: DefaultPrivilegesExpo
if (hasTracked.current) return
if (flag === undefined) return
if (!orgCountReady) return
+ if (surface === 'vercel' && !orgSlug) return
hasTracked.current = true
- track('project_creation_default_privileges_exposed', {
- surface,
- ...(dataApiEnabled !== null && { dataApiEnabled }),
- dataApiRevokeOnCreateDefaultEnabled: flag,
- })
- }, [flag, orgCountReady, track, surface, dataApiEnabled])
+ track(
+ 'project_creation_default_privileges_exposed',
+ {
+ surface,
+ ...(dataApiEnabled !== null && { dataApiEnabled }),
+ dataApiRevokeOnCreateDefaultEnabled: flag,
+ },
+ surface === 'vercel' ? { organization: orgSlug } : undefined
+ )
+ }, [flag, orgCountReady, track, surface, dataApiEnabled, orgSlug])
}
diff --git a/apps/studio/hooks/ui/useCsvFileDrop.ts b/apps/studio/hooks/ui/useCsvFileDrop.ts
index 549be2126a7..779f2baca12 100644
--- a/apps/studio/hooks/ui/useCsvFileDrop.ts
+++ b/apps/studio/hooks/ui/useCsvFileDrop.ts
@@ -1,4 +1,4 @@
-import { type ImportDataFileDroppedEvent } from 'common/telemetry-constants'
+import { type ImportDataFileAddedEvent } from 'common/telemetry-constants'
import { useCallback, useState, type DragEvent } from 'react'
import { flagInvalidFileImport } from '@/components/interfaces/TableGridEditor/SidePanelEditor/SpreadsheetImport/SpreadsheetImport.utils'
@@ -6,7 +6,7 @@ import { flagInvalidFileImport } from '@/components/interfaces/TableGridEditor/S
interface UseCsvFileDropOptions {
enabled: boolean
onFileDropped: (file: File) => void
- onTelemetryEvent?: (eventName: ImportDataFileDroppedEvent['action']) => void
+ onTelemetryEvent?: (eventName: ImportDataFileAddedEvent['action']) => void
}
interface UseCsvFileDropReturn {
diff --git a/apps/studio/pages/integrations/vercel/[slug]/deploy-button/new-project.tsx b/apps/studio/pages/integrations/vercel/[slug]/deploy-button/new-project.tsx
index 37ab0a6306d..b2455ff683a 100644
--- a/apps/studio/pages/integrations/vercel/[slug]/deploy-button/new-project.tsx
+++ b/apps/studio/pages/integrations/vercel/[slug]/deploy-button/new-project.tsx
@@ -87,7 +87,9 @@ const CreateProject = () => {
!isDataApiRevokeOnCreateDefault
)
- useTrackDefaultPrivilegesExposure({ surface: 'vercel' })
+ const { slug, next, currentProjectId: foreignProjectId, externalId } = useParams()
+
+ useTrackDefaultPrivilegesExposure({ surface: 'vercel', orgSlug: slug })
async function checkPasswordStrength(value: string) {
const { message, strength } = await passwordStrength(value)
@@ -95,8 +97,6 @@ const CreateProject = () => {
setPasswordStrengthMessage(message)
}
- const { slug, next, currentProjectId: foreignProjectId, externalId } = useParams()
-
const { mutateAsync: createConnections } = useIntegrationVercelConnectionsCreateMutation()
const { data: organizationData } = useOrganizationsQuery()
diff --git a/apps/www/components/Pricing/PricingComparisonTable.tsx b/apps/www/components/Pricing/PricingComparisonTable.tsx
index ff6d7d425a7..cea927b0898 100644
--- a/apps/www/components/Pricing/PricingComparisonTable.tsx
+++ b/apps/www/components/Pricing/PricingComparisonTable.tsx
@@ -41,6 +41,7 @@ const MobileHeader = ({
hasExistingOrganizations?: boolean
}) => {
const sendTelemetryEvent = useSendTelemetryEvent()
+ const orgSlug = organizations?.[0]?.slug
const selectedPlan = plans.find((p) => p.name === plan)!
const isUpgradablePlan = selectedPlan.name === 'Pro' || selectedPlan.name === 'Team'
@@ -74,6 +75,7 @@ const MobileHeader = ({
section: 'comparison_table',
tableMode: 'mobile',
},
+ ...(orgSlug && { groups: { organization: orgSlug } }),
})
}
size="medium"
@@ -92,6 +94,7 @@ const MobileHeader = ({
section: 'comparison_table',
tableMode: 'mobile',
},
+ ...(orgSlug && { groups: { organization: orgSlug } }),
})
}
>
@@ -115,6 +118,7 @@ const PricingComparisonTable = ({
const [activeMobilePlan, setActiveMobilePlan] = useState('Free')
const sendTelemetryEvent = useSendTelemetryEvent()
+ const orgSlug = organizations?.[0]?.slug
return (
<div
@@ -428,6 +432,7 @@ const PricingComparisonTable = ({
section: 'comparison_table',
tableMode: 'desktop',
},
+ ...(orgSlug && { groups: { organization: orgSlug } }),
})
}
size="tiny"
@@ -451,6 +456,7 @@ const PricingComparisonTable = ({
section: 'comparison_table',
tableMode: 'desktop',
},
+ ...(orgSlug && { groups: { organization: orgSlug } }),
})
}
>
diff --git a/apps/www/components/Pricing/PricingPlans.tsx b/apps/www/components/Pricing/PricingPlans.tsx
index 55a8bd5b457..b387ce9ce65 100644
--- a/apps/www/components/Pricing/PricingPlans.tsx
+++ b/apps/www/components/Pricing/PricingPlans.tsx
@@ -16,6 +16,7 @@ interface PricingPlansProps {
const PricingPlans = ({ organizations, hasExistingOrganizations }: PricingPlansProps) => {
const sendTelemetryEvent = useSendTelemetryEvent()
+ const orgSlug = organizations?.[0]?.slug
return (
<div className="mx-auto lg:container lg:px-16 xl:px-12 flex flex-col">
@@ -36,6 +37,7 @@ const PricingPlans = ({ organizations, hasExistingOrganizations }: PricingPlansP
showUpgradeText: isUpgradablePlan && hasExistingOrganizations ? true : false,
section: 'main',
},
+ ...(orgSlug && { groups: { organization: orgSlug } }),
})
}
diff --git a/apps/www/pages/events/[slug].tsx b/apps/www/pages/events/[slug].tsx
index f3f42e7eaa6..1899052402e 100644
--- a/apps/www/pages/events/[slug].tsx
+++ b/apps/www/pages/events/[slug].tsx
@@ -306,7 +306,7 @@ const EventPage = ({ event }: InferGetStaticPropsType<typeof getStaticProps>) =>
target={event.main_cta?.target ? event.main_cta?.target : undefined}
onClick={() =>
sendTelemetryEvent({
- action: 'www_pricing_plan_cta_clicked',
+ action: 'www_event_page_cta_clicked',
properties: { eventTitle: event.title },
})
}
diff --git a/packages/common/telemetry-constants.ts b/packages/common/telemetry-constants.ts
index c2a2e865e27..99b078e83aa 100644
--- a/packages/common/telemetry-constants.ts
+++ b/packages/common/telemetry-constants.ts
@@ -20,7 +20,11 @@ export const TABLE_EVENT_ACTIONS = {
TableCreated: 'table_created',
TableDataAdded: 'table_data_added',
TableRLSEnabled: 'table_rls_enabled',
-} as const
+} as const satisfies {
+ TableCreated: TableCreatedEvent['action']
+ TableDataAdded: TableDataAddedEvent['action']
+ TableRLSEnabled: TableRLSEnabledEvent['action']
+}
export type TableEventAction = (typeof TABLE_EVENT_ACTIONS)[keyof typeof TABLE_EVENT_ACTIONS]
@@ -175,6 +179,10 @@ export interface CronJobUpdatedEvent {
*/
export interface CronJobRemovedEvent {
action: 'cron_job_removed'
+ properties: {
+ /** Cron job classification, parsed from the job's command at deletion time. */
+ type: 'sql_function' | 'sql_snippet' | 'edge_function' | 'http_request'
+ }
groups: TelemetryGroups
}
@@ -286,24 +294,6 @@ export interface TimezonePickerClickedEvent {
}
groups: TelemetryGroups
}
-/**
- * User was exposed to the project creation form (exposure event for RLS option experiment).
- *
- * @group Events
- * @source studio
- * @page new/{slug}
- */
-export interface ProjectCreationRlsOptionExperimentExposedEvent {
- action: 'project_creation_rls_option_experiment_exposed'
- properties: {
- /**
- * Experiment variant: 'control' (checkbox hidden) or 'test' (checkbox shown)
- */
- variant: 'control' | 'test'
- }
- groups: Omit<TelemetryGroups, 'project'>
-}
-
/**
* Top-of-funnel event for the dataApiRevokeOnCreateDefault rollout. Fires once per
* mount after the flag resolves so cohort attribution is clean — pair with
@@ -453,72 +443,6 @@ export interface TableApiAccessToggleClickedEvent {
groups: TelemetryGroups
}
-/**
- * On the InitialStep.tsx screen, where user can chose to prompt, start blank or migrate, at least 5 characters were typed
- * in the prompt textarea indicating an intention to use the prompt.
- *
- * @group Events
- * @source studio
- * @page new/v2/{slug}
- */
-export interface ProjectCreationInitialStepPromptIntendedEvent {
- action: 'project_creation_initial_step_prompt_intended'
- /**
- * Is this a new prompt (e.g. when following the start blank route where no prompt has been filled in the InitialStep). In other
- * words, was this not just an edit. In this case, it should always be true.
- */
- properties: {
- isNewPrompt: boolean
- }
-}
-
-/**
- * First step of project creation was submitted, where the user writes a prompt or select to start blank or to migrate.
- *
- * @group Events
- * @source studio
- * @page new/v2/{slug}
- */
-export interface ProjectCreationInitialStepSubmittedEvent {
- action: 'project_creation_initial_step_submitted'
- properties: {
- /**
- * Records what the user selected in the first step of project creation.
- */
- onboardingPath: 'use_prompt' | 'start_blank' | 'migrate'
- }
-}
-
-/**
- * After the InitialStep screen, at least 5 characters were typed in the prompt textarea indicating an intention to use the prompt.
- *
- * @group Events
- * @source studio
- * @page new/v2/{slug}
- */
-export interface ProjectCreationSecondStepPromptIntendedEvent {
- action: 'project_creation_second_step_prompt_intended'
- properties: {
- /**
- * Is this a new prompt (e.g. when following the start blank route where no prompt has been filled in the InitialStep). In other
- * words, was this not just an edit.
- */
- isNewPrompt: boolean
- }
-}
-
-/**
- * Second and final step of project creation was submitted. More precisely, right after the user clicks on "Create Project". To check,
- * if the project creation was successful, please refer to project_created event.
- *
- * @group Events
- * @source studio
- * @page new/v2/{slug}
- */
-export interface ProjectCreationSecondStepSubmittedEvent {
- action: 'project_creation_second_step_submitted'
-}
-
/**
* User clicked either "Listening to channel" or "Start listening" button after selecting a channel.
*
@@ -792,7 +716,13 @@ export interface AssistantSuggestionRunQueryClickedEvent {
* The type of suggestion that was run by the user. Mutate or Select query types only.
*/
queryType: string
- category?: string
+ /**
+ * For mutation queries only: the DDL subtype detected from the SQL.
+ * 'functions' for CREATE FUNCTION / CREATE OR REPLACE FUNCTION,
+ * 'rls-policies' for CREATE POLICY / ALTER POLICY,
+ * 'unknown' for any other mutation. Omitted for non-mutation queries.
+ */
+ mutationType?: 'functions' | 'rls-policies' | 'unknown'
}
groups: TelemetryGroups
}
@@ -956,6 +886,7 @@ export interface WwwPricingPlanCtaClickedEvent {
section: 'main' | 'comparison_table'
tableMode?: 'mobile' | 'desktop'
}
+ groups?: Partial<TelemetryGroups>
}
/**
@@ -966,7 +897,7 @@ export interface WwwPricingPlanCtaClickedEvent {
* @page /events/*
*/
export interface EventPageCtaClickedEvent {
- action: 'www_pricing_plan_cta_clicked'
+ action: 'www_event_page_cta_clicked'
properties: {
/**
* The title of the event clicked.
@@ -1098,23 +1029,6 @@ export interface RequestDemoButtonClickedEvent {
}
}
-/**
- * User clicked the "Register" button in the State of Startups 2025 newsletter form.
- *
- * @group Events
- * @source www
- */
-export interface RegisterStateOfStartups2025NewsletterClicked {
- action: 'register_for_state_of_startups_newsletter_clicked'
- properties: {
- /**
- * The source of the button click, e.g. homepage hero, cta banner, product page header.
- * If it states it came from the request demo form, it can come from different pages so refer to path name to determine.
- */
- buttonLocation: string
- }
-}
-
/**
* User clicked the sign-in button in various locations described in properties.
*
@@ -1192,13 +1106,13 @@ export interface ImportDataButtonClickedEvent {
}
/**
- * User dropped a file into the import data dropzone on an empty table.
+ * User added a file to the import data dropzone on an empty table.
*
* @group Events
* @source studio
* @page /dashboard/project/{ref}/editor
*/
-export interface ImportDataFileDroppedEvent {
+export interface ImportDataFileAddedEvent {
action: 'import_data_dropzone_file_added'
groups: TelemetryGroups
}
@@ -1305,26 +1219,17 @@ export interface MetricsAPIBannerDismissButtonClickedEvent {
}
/**
- * Index Advisor banner enable button clicked event.
- *
- * @group Events
- * @source studio
- * @page /observability/query-performance
- */
-export interface IndexAdvisorBannerEnableButtonClickedEvent {
- action: 'index_advisor_banner_enable_button_clicked'
- groups: TelemetryGroups
-}
-
-/**
- * Index Advisor dialog enable button clicked event.
+ * User clicked the enable button for Index Advisor, either from the banner or the confirmation dialog.
*
* @group Events
* @source studio
* @page /observability/query-performance
*/
-export interface IndexAdvisorDialogEnableButtonClickedEvent {
- action: 'index_advisor_dialog_enable_button_clicked'
+export interface IndexAdvisorEnableButtonClickedEvent {
+ action: 'index_advisor_enable_button_clicked'
+ properties: {
+ origin: 'banner' | 'dialog'
+ }
groups: TelemetryGroups
}
@@ -1978,24 +1883,6 @@ export interface HomeCustomReportBlockRemovedEvent {
groups: TelemetryGroups
}
-/**
- * User was exposed to the HomeV2 experiment (shown the new home page).
- *
- * @group Events
- * @source studio
- * @page /project/{ref}
- */
-export interface HomeNewExperimentExposedEvent {
- action: 'home_new_experiment_exposed'
- properties: {
- /**
- * The experiment variant shown to the user
- */
- variant: string
- }
- groups: TelemetryGroups
-}
-
/**
* Connect section was shown to the user on the project homepage.
*
@@ -2079,6 +1966,7 @@ export interface HomeSectionRowsMovedEvent {
*/
export interface DpaRequestButtonClickedEvent {
action: 'dpa_request_button_clicked'
+ groups: Omit<TelemetryGroups, 'project'>
}
/**
@@ -2229,68 +2117,6 @@ export interface RLSGeneratedPoliciesCreatedEvent {
groups: TelemetryGroups
}
-/**
- * Conversion event for the generate policies experiment.
- * Fires when a user in the experiment creates a new table via table editor.
- * This is separate from TableCreatedEvent to keep experiment tracking isolated.
- *
- * @group Events
- * @source studio
- * @page /dashboard/project/{ref}/editor
- */
-export interface TableCreateGeneratePoliciesExperimentConvertedEvent {
- action: 'table_create_generate_policies_experiment_converted'
- properties: {
- /**
- * Experiment identifier for tracking
- */
- experiment_id: 'tableCreateGeneratePolicies'
- /**
- * Experiment variant: 'control' (feature disabled) or 'variation' (feature enabled)
- */
- variant: 'control' | 'variation'
- /**
- * Whether RLS was enabled on the table
- */
- has_rls_enabled: boolean
- /**
- * Whether the table was created with any RLS policies (manual or generated)
- */
- has_rls_policies: boolean
- /**
- * Whether AI-generated policies were used (only possible in variation)
- */
- has_generated_policies: boolean
- }
- groups: TelemetryGroups
-}
-
-/**
- * User was exposed to the generate policies experiment (shown or not shown the Generate Policies button).
- *
- * @group Events
- * @source studio
- * @page /dashboard/project/{ref}/editor
- */
-export interface TableCreateGeneratePoliciesExperimentExposedEvent {
- action: 'table_create_generate_policies_experiment_exposed'
- properties: {
- /**
- * Experiment identifier for tracking
- */
- experiment_id: 'tableCreateGeneratePolicies'
- /**
- * Experiment variant: 'control' (feature disabled) or 'variation' (feature enabled)
- */
- variant: 'control' | 'variation'
- /**
- * Days since project creation (to segment by new user cohorts)
- */
- days_since_project_creation: number
- }
- groups: TelemetryGroups
-}
-
/**
* User opened API docs panel.
*
@@ -2611,17 +2437,17 @@ export interface LogDrainSaveButtonClickedEvent {
}
/**
- * User confirmed addition of log drain destination.
+ * User confirmed removal of a log drain destination in the delete-confirm modal.
*
* @group Events
* @source studio
- * @page /dashboard/project/{ref}/settings/log-drains (LogDrains)
+ * @page /dashboard/project/{ref}/settings/log-drains
*/
-export interface LogDrainConfirmButtonSubmittedEvent {
- action: 'log_drain_confirm_button_submitted'
+export interface LogDrainRemovedEvent {
+ action: 'log_drain_removed'
properties: {
/**
- * Type of the destination confirmed
+ * Type of the destination removed
*/
destination:
| 'postgres'
@@ -3263,7 +3089,12 @@ export interface ResourceExhaustionBannerAiAssistantClickedEvent {
export interface UnifiedLogsRowClickedEvent {
action: 'unified_logs_row_clicked'
properties: {
- logType: string
+ /**
+ * Service that produced the log row. Mirrors `LOG_TYPES` in UnifiedLogs.constants.tsx.
+ * Server values are validated against this set by zod (UnifiedLogs.schema.ts) before
+ * reaching the table; anything else is rejected upstream so the union here is exhaustive.
+ */
+ logType: 'postgres' | 'postgrest' | 'auth' | 'storage' | 'edge function'
}
groups: TelemetryGroups
}
@@ -3471,16 +3302,11 @@ export type TelemetryEvent =
| FeaturePreviewEnabledEvent
| FeaturePreviewDisabledEvent
| TimezonePickerClickedEvent
- | ProjectCreationRlsOptionExperimentExposedEvent
| ProjectCreationDefaultPrivilegesExposedEvent
| ProjectCreationGithubConnectClickedEvent
| ProjectCreationSimpleVersionSubmittedEvent
| ProjectCreationSimpleVersionConfirmModalOpenedEvent
| TableApiAccessToggleClickedEvent
- | ProjectCreationInitialStepPromptIntendedEvent
- | ProjectCreationInitialStepSubmittedEvent
- | ProjectCreationSecondStepPromptIntendedEvent
- | ProjectCreationSecondStepSubmittedEvent
| RealtimeInspectorListenChannelClickedEvent
| RealtimeInspectorBroadcastSentEvent
| RealtimeInspectorMessageClickedEvent
@@ -3519,12 +3345,11 @@ export type TelemetryEvent =
| StartProjectButtonClickedEvent
| SeeDocumentationButtonClickedEvent
| RequestDemoButtonClickedEvent
- | RegisterStateOfStartups2025NewsletterClicked
| SignInButtonClickedEvent
| HelpButtonClickedEvent
| ExampleProjectCardClickedEvent
| ImportDataButtonClickedEvent
- | ImportDataFileDroppedEvent
+ | ImportDataFileAddedEvent
| ImportDataAddedEvent
| SendFeedbackButtonClickedEvent
| SqlEditorQueryRunButtonClickedEvent
@@ -3538,9 +3363,8 @@ export type TelemetryEvent =
| ReportsDatabaseGrafanaBannerClickedEvent
| MetricsAPIBannerCtaButtonClickedEvent
| MetricsAPIBannerDismissButtonClickedEvent
- | IndexAdvisorBannerEnableButtonClickedEvent
+ | IndexAdvisorEnableButtonClickedEvent
| IndexAdvisorBannerDismissButtonClickedEvent
- | IndexAdvisorDialogEnableButtonClickedEvent
| IndexAdvisorTabClickedEvent
| IndexAdvisorCreateIndexesButtonClickedEvent
| EdgeFunctionDeployButtonClickedEvent
@@ -3571,7 +3395,6 @@ export type TelemetryEvent =
| BranchSelectorCreateClickedEvent
| BranchSelectorManageClickedEvent
| DpaPdfOpenedEvent
- | HomeNewExperimentExposedEvent
| HomeConnectSectionExposedEvent
| HomeConnectActionClickedEvent
| ConnectSheetOpenedEvent
@@ -3590,8 +3413,6 @@ export type TelemetryEvent =
| RLSGeneratePoliciesClickedEvent
| RLSGeneratedPolicyRemovedEvent
| RLSGeneratedPoliciesCreatedEvent
- | TableCreateGeneratePoliciesExperimentExposedEvent
- | TableCreateGeneratePoliciesExperimentConvertedEvent
| AuthUsersSearchSubmittedEvent
| CommandMenuOpenedEvent
| CommandMenuClosedEvent
@@ -3601,7 +3422,7 @@ export type TelemetryEvent =
| QueueOperationsSettingClickedEvent
| SidebarOpenedEvent
| LogDrainSaveButtonClickedEvent
- | LogDrainConfirmButtonSubmittedEvent
+ | LogDrainRemovedEvent
| AdvisorDetailOpenedEvent
| AdvisorAssistantButtonClickedEvent
| QueryPerformanceAIExplanationButtonClickedEvent