The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.
TypeScript aialternativeauthdatabasedenoembeddingsexamplefirebasenextjsoauth2pgvectorpostgispostgrespostgresqlpostgrestrealtimesupabasevectorswebsockets
refactor(studio): migrate telemetry to useTrack (#46140)
Pamela Chia47c084e51d23
diff --git a/apps/studio/components/interfaces/Account/Preferences/DashboardSettingsToggles.tsx b/apps/studio/components/interfaces/Account/Preferences/DashboardSettingsToggles.tsxindex 17df002eb0d..fac9e41f0ed 100644--- a/apps/studio/components/interfaces/Account/Preferences/DashboardSettingsToggles.tsx+++ b/apps/studio/components/interfaces/Account/Preferences/DashboardSettingsToggles.tsx@@ -6,8 +6,7 @@ import * as z from 'zod'import { DashboardToggle } from './DashboardToggle'import { useIsInlineEditorSetting, useIsQueueOperationsSetting } from './useDashboardSettings'-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'-import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'+import { useTrack } from '@/lib/telemetry/track'const DashboardSettingsSchema = z.object({inlineEditorEnabled: z.boolean(),@@ -18,9 +17,7 @@ export const DashboardSettingsToggles = () => {const { inlineEditorEnabled, setInlineEditorEnabled } = useIsInlineEditorSetting()const { isQueueOperationsEnabled, setIsQueueOperationsEnabled } = useIsQueueOperationsSetting()- const { data: org } = useSelectedOrganizationQuery()-- const { mutate: sendEvent } = useSendEventMutation()+ const track = useTrack()const form = useForm<z.infer<typeof DashboardSettingsSchema>>({resolver: zodResolver(DashboardSettingsSchema),@@ -34,11 +31,7 @@ export const DashboardSettingsToggles = () => {setInlineEditorEnabled(value)form.setValue('inlineEditorEnabled', value)- sendEvent({- action: 'inline_editor_setting_clicked',- properties: { enabled: value },- groups: { organization: org?.slug },- })+ track('inline_editor_setting_clicked', { enabled: value })toast(`${value ? 'Editing entities will now be via the SQL Editor' : 'Editing entities will now be via a guided UI panel'}`@@ -49,11 +42,7 @@ export const DashboardSettingsToggles = () => {setIsQueueOperationsEnabled(value)form.setValue('queueOperationsEnabled', value)- sendEvent({- action: 'queue_operations_setting_clicked',- properties: { enabled: value },- groups: { organization: org?.slug },- })+ track('queue_operations_setting_clicked', { enabled: value })toast(`${value ? 'Table edits in the Table Editor will now be queued' : 'Table edits in the Table Editor will now be saved immediately'}`diff --git a/apps/studio/components/interfaces/App/FeaturePreview/FeaturePreviewModal.tsx b/apps/studio/components/interfaces/App/FeaturePreview/FeaturePreviewModal.tsxindex fe7d8ae838f..857a10a90a4 100644--- a/apps/studio/components/interfaces/App/FeaturePreview/FeaturePreviewModal.tsx+++ b/apps/studio/components/interfaces/App/FeaturePreview/FeaturePreviewModal.tsx@@ -33,10 +33,9 @@ import { RLSTesterPreview } from './RLSTesterPreview'import { UnifiedLogsPreview } from './UnifiedLogsPreview'import { FeaturePreview, useFeaturePreviews } from './useFeaturePreviews'import { useBannerStack } from '@/components/ui/BannerStack/BannerStackProvider'-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'import { useLocalStorageQuery } from '@/hooks/misc/useLocalStorage'-import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'import { IS_PLATFORM } from '@/lib/constants'+import { useTrack } from '@/lib/telemetry/track'const FEATURE_PREVIEW_KEY_TO_CONTENT: {[key: string]: ReactNode@@ -60,9 +59,8 @@ export const FeaturePreviewModal = () => {selectFeaturePreview,toggleFeaturePreviewModal,} = useFeaturePreviewModal()- const { data: org } = useSelectedOrganizationQuery()const featurePreviewContext = useFeaturePreviewContext()- const { mutate: sendEvent } = useSendEventMutation()+ const track = useTrack()const { dismissBanner } = useBannerStack()const [, setIsDismissedRlsTesterBanner] = useLocalStorageQuery(@@ -89,10 +87,8 @@ export const FeaturePreviewModal = () => {}onUpdateFlag(selectedFeature.key, !isSelectedFeatureEnabled)- sendEvent({- action: isSelectedFeatureEnabled ? 'feature_preview_disabled' : 'feature_preview_enabled',- properties: { feature: selectedFeature.key },- groups: { project: ref ?? 'Unknown', organization: org?.slug ?? 'Unknown' },+ track(isSelectedFeatureEnabled ? 'feature_preview_disabled' : 'feature_preview_enabled', {+ feature: selectedFeature.key,})}diff --git a/apps/studio/components/interfaces/Auth/Users/UsersSearch.tsx b/apps/studio/components/interfaces/Auth/Users/UsersSearch.tsxindex fa9929cc50f..71b5be725b3 100644--- a/apps/studio/components/interfaces/Auth/Users/UsersSearch.tsx+++ b/apps/studio/components/interfaces/Auth/Users/UsersSearch.tsx@@ -23,8 +23,8 @@ import {SpecificFilterColumn,UUIDV4_LEFT_PREFIX_REGEX,} from './Users.constants'-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'import { onSearchInputEscape } from '@/lib/keyboard'+import { useTrack } from '@/lib/telemetry/track'const getSearchPlaceholder = (column: SpecificFilterColumn): string => {switch (column) {@@ -48,19 +48,11 @@ interface UsersSearchProps {setSearch: Dispatch<SetStateAction<string>>improvedSearchEnabled?: booleantelemetryProps: Omit<AuthUsersSearchSubmittedEvent['properties'], 'trigger'>- telemetryGroups: AuthUsersSearchSubmittedEvent['groups']onSelectFilterColumn: (value: SpecificFilterColumn) => void}export const UsersSearch = forwardRef<HTMLInputElement, UsersSearchProps>(function UsersSearch(- {- search,- setSearch,- improvedSearchEnabled = false,- telemetryProps,- telemetryGroups,- onSelectFilterColumn,- },+ { search, setSearch, improvedSearchEnabled = false, telemetryProps, onSelectFilterColumn },ref) {const [, setSelectedId] = useQueryState(@@ -79,7 +71,7 @@ export const UsersSearch = forwardRef<HTMLInputElement, UsersSearchProps>(functi]).withDefault('email'))- const { mutate: sendEvent } = useSendEventMutation()+ const track = useTrack()const searchInvalid =!search ||@@ -95,14 +87,10 @@ export const UsersSearch = forwardRef<HTMLInputElement, UsersSearchProps>(functiconst s = search.trim().toLocaleLowerCase()setFilterKeywords(s)setSelectedId(null)- sendEvent({- action: 'auth_users_search_submitted',- properties: {- trigger: 'search_input',- ...telemetryProps,- keywords: s,- },- groups: telemetryGroups,+ track('auth_users_search_submitted', {+ trigger: 'search_input',+ ...telemetryProps,+ keywords: s,})}diff --git a/apps/studio/components/interfaces/Auth/Users/UsersV2.tsx b/apps/studio/components/interfaces/Auth/Users/UsersV2.tsxindex c096280c9d8..79d0fb4cf16 100644--- a/apps/studio/components/interfaces/Auth/Users/UsersV2.tsx+++ b/apps/studio/components/interfaces/Auth/Users/UsersV2.tsx@@ -69,13 +69,12 @@ import { useUserDeleteMutation } from '@/data/auth/user-delete-mutation'import { useUserIndexStatusesQuery } from '@/data/auth/user-search-indexes-query'import { useUsersCountQuery } from '@/data/auth/users-count-query'import { User, useUsersInfiniteQuery } from '@/data/auth/users-infinite-query'-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'import { useIsFeatureEnabled } from '@/hooks/misc/useIsFeatureEnabled'import { useLocalStorageQuery } from '@/hooks/misc/useLocalStorage'-import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'import { PROJECT_STATUS } from '@/lib/constants/infrastructure'import { cleanPointerEventsNoneOnBody, isAtBottom } from '@/lib/helpers'+import { useTrack } from '@/lib/telemetry/track'import { useRoleImpersonationStateSnapshot } from '@/state/role-impersonation-state'const SORT_BY_VALUE_COUNT_THRESHOLD = 10_000@@ -98,13 +97,12 @@ export const UsersV2 = () => {isPending: isPendingProject,isError: isProjectError,} = useSelectedProjectQuery()- const { data: selectedOrg } = useSelectedOrganizationQuery()const roleImpersonationState = useRoleImpersonationStateSnapshot()const gridRef = useRef<DataGridHandle>(null)const searchInputRef = useRef<HTMLInputElement>(null)const xScroll = useRef<number>(0)- const { mutate: sendEvent } = useSendEventMutation()+ const track = useTrack()const {authenticationShowProviderFilter: showProviderFilter,@@ -345,10 +343,6 @@ export const UsersV2 = () => {keywords: filterKeywords,filter_column: specificFilterColumn === 'freeform' ? undefined : specificFilterColumn,}- const telemetryGroups = {- project: projectRef ?? 'Unknown',- organization: selectedOrg?.slug ?? 'Unknown',- }const updateStorageFilter = (value: SpecificFilterColumn) => {setLocalStorageFilter(value)@@ -457,13 +451,9 @@ export const UsersV2 = () => {const handleRefresh = () => {refetch()- sendEvent({- action: 'auth_users_search_submitted',- properties: {- trigger: 'refresh_button',- ...telemetryProps,- },- groups: telemetryGroups,+ track('auth_users_search_submitted', {+ trigger: 'refresh_button',+ ...telemetryProps,})}@@ -607,7 +597,6 @@ export const UsersV2 = () => {setSearch={setSearch}improvedSearchEnabled={improvedSearchEnabled}telemetryProps={telemetryProps}- telemetryGroups={telemetryGroups}onSelectFilterColumn={(value) => {if (value === 'freeform') {if (isCountWithinThresholdForSortBy) {@@ -627,14 +616,10 @@ export const UsersV2 = () => {value={filterUserType}onValueChange={(val) => {setFilterUserType(val as Filter)- sendEvent({- action: 'auth_users_search_submitted',- properties: {- trigger: 'user_type_filter',- ...telemetryProps,- user_type: val,- },- groups: telemetryGroups,+ track('auth_users_search_submitted', {+ trigger: 'user_type_filter',+ ...telemetryProps,+ user_type: val,})}}>@@ -680,14 +665,10 @@ export const UsersV2 = () => {className="w-52"onSaveFilters={(providers) => {setSelectedProviders(providers)- sendEvent({- action: 'auth_users_search_submitted',- properties: {- trigger: 'provider_filter',- ...telemetryProps,- providers,- },- groups: telemetryGroups,+ track('auth_users_search_submitted', {+ trigger: 'provider_filter',+ ...telemetryProps,+ providers,})}}/>@@ -751,15 +732,11 @@ export const UsersV2 = () => {setSortByValue={(value) => {const [sortColumn, sortOrder] = value.split(':')updateSortByValue(value)- sendEvent({- action: 'auth_users_search_submitted',- properties: {- trigger: 'sort_change',- ...telemetryProps,- sort_column: sortColumn,- sort_order: sortOrder,- },- groups: telemetryGroups,+ track('auth_users_search_submitted', {+ trigger: 'sort_change',+ ...telemetryProps,+ sort_column: sortColumn,+ sort_order: sortOrder,})}}showSortByEmail={showSortByEmail}diff --git a/apps/studio/components/interfaces/BranchManagement/CreateBranchModal.tsx b/apps/studio/components/interfaces/BranchManagement/CreateBranchModal.tsxindex b3aef7b4c24..08b8ff0cd83 100644--- a/apps/studio/components/interfaces/BranchManagement/CreateBranchModal.tsx+++ b/apps/studio/components/interfaces/BranchManagement/CreateBranchModal.tsx@@ -54,12 +54,12 @@ import { useGitHubConnectionsQuery } from '@/data/integrations/github-connectionimport { projectKeys } from '@/data/projects/keys'import { DesiredInstanceSize, instanceSizeSpecs } from '@/data/projects/new-project.constants'import { useProjectAddonsQuery } from '@/data/subscriptions/project-addons-query'-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'import { useCheckEntitlements } from '@/hooks/misc/useCheckEntitlements'import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'import { BASE_PATH, IS_PLATFORM } from '@/lib/constants'+import { useTrack } from '@/lib/telemetry/track'import { useAppStateSnapshot } from '@/state/app-state'export const CreateBranchModal = () => {@@ -156,7 +156,7 @@ export const CreateBranchModal = () => {const branchComputeSize = estimateComputeSize(projectDiskAttributes.size_gb, computeSize)const estimatedDiskCost = estimateDiskCost(branchDiskAttributes)- const { mutate: sendEvent } = useSendEventMutation()+ const track = useTrack()const { mutate: checkGithubBranchValidity, isPending: isCheckingGHBranchValidity } =useCheckGithubBranchValidity({@@ -169,16 +169,9 @@ export const CreateBranchModal = () => {if (projectRef) {await queryClient.invalidateQueries({ queryKey: projectKeys.detail(projectRef) })}- sendEvent({- action: 'branch_create_button_clicked',- properties: {- branchType: data.persistent ? 'persistent' : 'preview',- gitlessBranching: !data.git_branch,- },- groups: {- project: ref ?? 'Unknown',- organization: selectedOrg?.slug ?? 'Unknown',- },+ track('branch_create_button_clicked', {+ branchType: data.persistent ? 'persistent' : 'preview',+ gitlessBranching: !data.git_branch,})setShowCreateBranchModal(false)diff --git a/apps/studio/components/interfaces/BranchManagement/OutOfDateNotice.tsx b/apps/studio/components/interfaces/BranchManagement/OutOfDateNotice.tsxindex 96ece2b1611..39fadd963f0 100644--- a/apps/studio/components/interfaces/BranchManagement/OutOfDateNotice.tsx+++ b/apps/studio/components/interfaces/BranchManagement/OutOfDateNotice.tsx@@ -14,9 +14,8 @@ import {} from 'ui'import { Admonition } from 'ui-patterns'-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'-import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'+import { useTrack } from '@/lib/telemetry/track'interface OutOfDateNoticeProps {isBranchOutOfDateMigrations: boolean@@ -43,9 +42,8 @@ export const OutOfDateNotice = ({}: OutOfDateNoticeProps) => {const [isDialogOpen, setIsDialogOpen] = useState(false)const hasOutdatedMigrations = isBranchOutOfDateMigrations && missingMigrationsCount > 0- const { data: selectedOrg } = useSelectedOrganizationQuery()const { data: project } = useSelectedProjectQuery()- const { mutate: sendEvent } = useSendEventMutation()+ const track = useTrack()const isBranch = project?.parent_project_ref !== undefinedconst parentProjectRef = isBranch ? project?.parent_project_ref : project?.ref@@ -70,18 +68,14 @@ export const OutOfDateNotice = ({setIsDialogOpen(false)}- // Track branch update- sendEvent({- action: 'branch_updated',- properties: {+ track(+ 'branch_updated',+ {modifiedEdgeFunctions: hasEdgeFunctionModifications,source: 'out_of_date_notice',},- groups: {- project: parentProjectRef ?? 'Unknown',- organization: selectedOrg?.slug ?? 'Unknown',- },- })+ { project: parentProjectRef }+ )onPush()}diff --git a/apps/studio/components/interfaces/BranchManagement/ReviewWithAI.tsx b/apps/studio/components/interfaces/BranchManagement/ReviewWithAI.tsxindex 3e5fcf3c9dd..035151f8d65 100644--- a/apps/studio/components/interfaces/BranchManagement/ReviewWithAI.tsx+++ b/apps/studio/components/interfaces/BranchManagement/ReviewWithAI.tsx@@ -5,9 +5,8 @@ import { ButtonTooltip } from '@/components/ui/ButtonTooltip'import { Branch } from '@/data/branches/branches-query'import { useProjectDetailQuery } from '@/data/projects/project-detail-query'import { useTablesQuery } from '@/data/tables/tables-query'-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'-import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'import { tablesToSQL } from '@/lib/helpers'+import { useTrack } from '@/lib/telemetry/track'import { useAiAssistantStateSnapshot } from '@/state/ai-assistant-state'import { useSidebarManagerSnapshot } from '@/state/sidebar-manager-state'@@ -28,11 +27,12 @@ export const ReviewWithAI = ({}: ReviewWithAIProps) => {const aiSnap = useAiAssistantStateSnapshot()const { openSidebar } = useSidebarManagerSnapshot()- const { data: selectedOrg } = useSelectedOrganizationQuery()- const { mutate: sendEvent } = useSendEventMutation()+ const track = useTrack()// Get parent project for production schema- const { data: parentProject } = useProjectDetailQuery({ ref: parentProjectRef })+ const { data: parentProject } = useProjectDetailQuery({+ ref: parentProjectRef,+ })// Fetch production schema tablesconst { data: productionTables } = useTablesQuery(@@ -48,13 +48,8 @@ export const ReviewWithAI = ({const handleReviewWithAssistant = () => {if (!currentBranch || !mainBranch) return- // Track review with assistant button pressed- sendEvent({- action: 'branch_review_with_assistant_clicked',- groups: {- project: parentProjectRef ?? 'Unknown',- organization: selectedOrg?.slug ?? 'Unknown',- },+ track('branch_review_with_assistant_clicked', undefined, {+ project: parentProjectRef,})// Prepare diff content for the assistant@@ -83,7 +78,11 @@ export const ReviewWithAI = ({aiSnap.newChat({name: `Review merge: ${currentBranch.name} → ${mainBranch.name}`,sqlSnippets: sqlSnippets.length > 0 ? sqlSnippets : undefined,- initialInput: `I want to run the attached database changes on my production database branch as part of a branch merge from "${currentBranch.name}" into "${mainBranch.name || 'main'}". I've included the current production database schema as extra context. Please analyze the proposed schema changes and provide concise feedback on their impact on the production schema including any migration concerns and potential conflicts.`,+ initialInput: `I want to run the attached database changes on my production database branch as part of a branch merge from "${+ currentBranch.name+ }" into "${+ mainBranch.name || 'main'+ }". I've included the current production database schema as extra context. Please analyze the proposed schema changes and provide concise feedback on their impact on the production schema including any migration concerns and potential conflicts.`,suggestions: {title: `I can help you review the database schema changes from "${currentBranch.name}" to "${mainBranch.name}", here are some specific areas I can focus on:`,prompts: [diff --git a/apps/studio/components/interfaces/Branching/MergeRequest.tsx b/apps/studio/components/interfaces/Branching/MergeRequest.tsxindex 2381bf8cd56..24651273ab7 100644--- a/apps/studio/components/interfaces/Branching/MergeRequest.tsx+++ b/apps/studio/components/interfaces/Branching/MergeRequest.tsx@@ -22,10 +22,9 @@ import { useBranchUpdateMutation } from '@/data/branches/branch-update-mutation'import { useBranchesQuery } from '@/data/branches/branches-query'import { useProjectGitHubConnectionQuery } from '@/data/integrations/github-connections-query'import { useProjectDetailQuery } from '@/data/projects/project-detail-query'-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'import { useBranchMergeDiff } from '@/hooks/branches/useBranchMergeDiff'-import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'+import { useTrack } from '@/lib/telemetry/track'export const MergeTitle = () => {const { ref } = useParams()@@ -122,9 +121,8 @@ export const MergeActions = ({const router = useRouter()const { ref } = useParams()const { data: project } = useSelectedProjectQuery()- const { data: selectedOrg } = useSelectedOrganizationQuery()+ const track = useTrack()- const { mutate: sendEvent } = useSendEventMutation()const { mutate: updateBranch, isPending: isUpdating } = useBranchUpdateMutation({onError: (error) => {toast.error(`Failed to update branch: ${error.message}`)@@ -132,8 +130,12 @@ export const MergeActions = ({})const parentProjectRef = project?.parent_project_ref- const { data: parentProject } = useProjectDetailQuery({ ref: parentProjectRef })- const { data: ghConnection } = useProjectGitHubConnectionQuery({ ref: parentProjectRef })+ const { data: parentProject } = useProjectDetailQuery({+ ref: parentProjectRef,+ })+ const { data: ghConnection } = useProjectGitHubConnectionQuery({+ ref: parentProjectRef,+ })const { data: branches } = useBranchesQuery({ projectRef: parentProjectRef },@@ -227,12 +229,8 @@ export const MergeActions = ({onSuccess: () => {toast.success('Successfully closed merge request')router.push(`/project/${project?.ref}/branches?tab=prs`)- sendEvent({- action: 'branch_close_merge_request_button_clicked',- groups: {- project: parentProjectRef ?? 'Unknown',- organization: selectedOrg?.slug ?? 'Unknown',- },+ track('branch_close_merge_request_button_clicked', undefined, {+ project: parentProjectRef,})},}diff --git a/apps/studio/components/interfaces/Connect/DatabaseConnectionString.tsx b/apps/studio/components/interfaces/Connect/DatabaseConnectionString.tsxindex 0855765f0d3..f208432b021 100644--- a/apps/studio/components/interfaces/Connect/DatabaseConnectionString.tsx+++ b/apps/studio/components/interfaces/Connect/DatabaseConnectionString.tsx@@ -40,11 +40,10 @@ import { usePgbouncerConfigQuery } from '@/data/database/pgbouncer-config-query'import { useSupavisorConfigurationQuery } from '@/data/database/supavisor-configuration-query'import { useReadReplicasQuery } from '@/data/read-replicas/replicas-query'import { useProjectAddonsQuery } from '@/data/subscriptions/project-addons-query'-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'import { useCheckEntitlements } from '@/hooks/misc/useCheckEntitlements'-import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'import { DOCS_URL, IS_PLATFORM } from '@/lib/constants'import { pluckObjectFields } from '@/lib/helpers'+import { useTrack } from '@/lib/telemetry/track'import { useDatabaseSelectorStateSnapshot } from '@/state/database-selector'const StepLabel = ({@@ -66,7 +65,6 @@ const StepLabel = ({*/export const DatabaseConnectionString = () => {const { ref: projectRef } = useParams()- const { data: org } = useSelectedOrganizationQuery()const state = useDatabaseSelectorStateSnapshot()const {hasAccess: hasDedicatedPooler,@@ -195,7 +193,7 @@ export const DatabaseConnectionString = () => {const { data: addons } = useProjectAddonsQuery({ projectRef })const { ipv4: ipv4Addon } = getAddons(addons?.selected_addons ?? [])- const { mutate: sendEvent } = useSendEventMutation()+ const track = useTrack()const DB_FIELDS = ['db_host', 'db_name', 'db_port', 'db_user', 'inserted_at']const emptyState = { db_user: '', db_host: '', db_port: '', db_name: '' }@@ -208,15 +206,11 @@ export const DatabaseConnectionString = () => {const connectionInfo = DATABASE_CONNECTION_TYPES.find((type) => type.id === connectionTypeId)const connectionType = connectionInfo?.label ?? 'Unknown'const lang = connectionInfo?.lang ?? 'Unknown'- sendEvent({- action: 'connection_string_copied',- properties: {- connectionType,- lang,- connectionMethod: connectionStringMethod,- connectionTab: 'Connection String',- },- groups: { project: projectRef ?? 'Unknown', organization: org?.slug ?? 'Unknown' },+ track('connection_string_copied', {+ connectionType,+ lang,+ connectionMethod: connectionStringMethod,+ connectionTab: 'Connection String',})}diff --git a/apps/studio/components/interfaces/Docs/CodeSnippet.tsx b/apps/studio/components/interfaces/Docs/CodeSnippet.tsxindex cef13723182..8e885f497ed 100644--- a/apps/studio/components/interfaces/Docs/CodeSnippet.tsx+++ b/apps/studio/components/interfaces/Docs/CodeSnippet.tsx@@ -1,8 +1,6 @@-import { useParams } from 'common'import { SimpleCodeBlock } from 'ui-patterns/SimpleCodeBlock'-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'-import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'+import { useTrack } from '@/lib/telemetry/track'interface CodeSnippetProps {selectedLang: 'bash' | 'js'@@ -14,21 +12,12 @@ interface CodeSnippetProps {}const CodeSnippet = ({ selectedLang, snippet }: CodeSnippetProps) => {- const { ref: projectRef } = useParams()- const { data: org } = useSelectedOrganizationQuery()- const { mutate: sendEvent } = useSendEventMutation()+ const track = useTrack()const handleCopy = () => {- sendEvent({- action: 'api_docs_code_copy_button_clicked',- properties: {- title: snippet.title,- selectedLanguage: selectedLang,- },- groups: {- project: projectRef ?? 'Unknown',- organization: org?.slug ?? 'Unknown',- },+ track('api_docs_code_copy_button_clicked', {+ title: snippet.title,+ selectedLanguage: selectedLang,})}diff --git a/apps/studio/components/interfaces/EdgeFunctions/DeployEdgeFunctionButton.tsx b/apps/studio/components/interfaces/EdgeFunctions/DeployEdgeFunctionButton.tsxindex 396c9633902..cc5b4495b32 100644--- a/apps/studio/components/interfaces/EdgeFunctions/DeployEdgeFunctionButton.tsx+++ b/apps/studio/components/interfaces/EdgeFunctions/DeployEdgeFunctionButton.tsx@@ -12,21 +12,17 @@ import {import { SIDEBAR_KEYS } from '@/components/layouts/ProjectLayout/LayoutSidebar/LayoutSidebarProvider'import { ButtonTooltip } from '@/components/ui/ButtonTooltip'-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'-import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'import { useIsProjectActive } from '@/hooks/misc/useSelectedProject'+import { useTrack } from '@/lib/telemetry/track'import { useAiAssistantStateSnapshot } from '@/state/ai-assistant-state'import { useSidebarManagerSnapshot } from '@/state/sidebar-manager-state'export const DeployEdgeFunctionButton = () => {const router = useRouter()const { ref } = useParams()- const { data: org } = useSelectedOrganizationQuery()-const snap = useAiAssistantStateSnapshot()const { openSidebar } = useSidebarManagerSnapshot()-- const { mutate: sendEvent } = useSendEventMutation()+ const track = useTrack()const [, setCreateMethod] = useQueryState('create', parseAsString)const isProjectActive = useIsProjectActive()@@ -54,11 +50,7 @@ export const DeployEdgeFunctionButton = () => {<DropdownMenuItemonSelect={() => {router.push(`/project/${ref}/functions/new`)- sendEvent({- action: 'edge_function_via_editor_button_clicked',- properties: { origin: 'secondary_action' },- groups: { project: ref ?? 'Unknown', organization: org?.slug ?? 'Unknown' },- })+ track('edge_function_via_editor_button_clicked', { origin: 'secondary_action' })}}className="gap-4">@@ -72,11 +64,7 @@ export const DeployEdgeFunctionButton = () => {className="gap-4"onSelect={() => {setCreateMethod('cli')- sendEvent({- action: 'edge_function_via_cli_button_clicked',- properties: { origin: 'secondary_action' },- groups: { project: ref ?? 'Unknown', organization: org?.slug ?? 'Unknown' },- })+ track('edge_function_via_cli_button_clicked', { origin: 'secondary_action' })}}><Terminal className="shrink-0" size={16} strokeWidth={1.5} />@@ -112,11 +100,7 @@ export const DeployEdgeFunctionButton = () => {],},})- sendEvent({- action: 'edge_function_ai_assistant_button_clicked',- properties: { origin: 'secondary_action' },- groups: { project: ref ?? 'Unknown', organization: org?.slug ?? 'Unknown' },- })+ track('edge_function_ai_assistant_button_clicked', { origin: 'secondary_action' })}}><AiIconAnimation className="shrink-0" size={16} />diff --git a/apps/studio/components/interfaces/Functions/EdgeFunctionDetails/EdgeFunctionTesterSheet.tsx b/apps/studio/components/interfaces/Functions/EdgeFunctionDetails/EdgeFunctionTesterSheet.tsxindex 7f91e044fa9..af30abc98aa 100644--- a/apps/studio/components/interfaces/Functions/EdgeFunctionDetails/EdgeFunctionTesterSheet.tsx+++ b/apps/studio/components/interfaces/Functions/EdgeFunctionDetails/EdgeFunctionTesterSheet.tsx@@ -44,12 +44,11 @@ import { useSessionAccessTokenQuery } from '@/data/auth/session-access-token-queimport { useProjectPostgrestConfigQuery } from '@/data/config/project-postgrest-config-query'import { useProjectSettingsV2Query } from '@/data/config/project-settings-v2-query'import { useEdgeFunctionTestMutation } from '@/data/edge-functions/edge-function-test-mutation'-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'-import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'import { IS_PLATFORM } from '@/lib/constants'import { prettifyJSON } from '@/lib/helpers'import { getRoleImpersonationJWT } from '@/lib/role-impersonation'+import { useTrack } from '@/lib/telemetry/track'import {RoleImpersonationStateContextProvider,useGetImpersonatedRoleState,@@ -96,7 +95,6 @@ export const EdgeFunctionTesterSheet = (props: EdgeFunctionTesterSheetProps) =>}const EdgeFunctionTesterSheetContent = ({ visible, onClose }: EdgeFunctionTesterSheetProps) => {- const { data: org } = useSelectedOrganizationQuery()const { ref: projectRef, functionSlug } = useParams()const getImpersonatedRoleState = useGetImpersonatedRoleState()@@ -110,7 +108,7 @@ const EdgeFunctionTesterSheetContent = ({ visible, onClose }: EdgeFunctionTesterconst { data: accessToken } = useSessionAccessTokenQuery({ enabled: IS_PLATFORM })const { serviceKey } = getKeys(apiKeys)- const { mutate: sendEvent } = useSendEventMutation()+ const track = useTrack()const { mutate: testEdgeFunction, isPending } = useEdgeFunctionTestMutation({onSuccess: (res) => setResponse(res),onError: (err) => {@@ -479,16 +477,7 @@ const EdgeFunctionTesterSheetContent = ({ visible, onClose }: EdgeFunctionTesterloading={isPending}disabled={isPending}onClick={() =>- sendEvent({- action: 'edge_function_test_send_button_clicked',- properties: {- httpMethod: method,- },- groups: {- project: projectRef ?? 'Unknown',- organization: org?.slug ?? 'Unknown',- },- })+ track('edge_function_test_send_button_clicked', { httpMethod: method })}>Send Requestdiff --git a/apps/studio/components/interfaces/Functions/FunctionsEmptyState.tsx b/apps/studio/components/interfaces/Functions/FunctionsEmptyState.tsxindex 7ddb7ce733c..3725e6e8982 100644--- a/apps/studio/components/interfaces/Functions/FunctionsEmptyState.tsx+++ b/apps/studio/components/interfaces/Functions/FunctionsEmptyState.tsx@@ -29,10 +29,9 @@ import { ScaffoldSectionTitle } from '@/components/layouts/Scaffold'import { DocsButton } from '@/components/ui/DocsButton'import { ResourceItem } from '@/components/ui/Resource/ResourceItem'import { ResourceList } from '@/components/ui/Resource/ResourceList'-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'import { useIsFeatureEnabled } from '@/hooks/misc/useIsFeatureEnabled'-import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'import { DOCS_URL } from '@/lib/constants'+import { useTrack } from '@/lib/telemetry/track'import { useAiAssistantStateSnapshot } from '@/state/ai-assistant-state'import { useSidebarManagerSnapshot } from '@/state/sidebar-manager-state'@@ -42,8 +41,7 @@ export const FunctionsEmptyState = () => {const aiSnap = useAiAssistantStateSnapshot()const { openSidebar } = useSidebarManagerSnapshot()- const { mutate: sendEvent } = useSendEventMutation()- const { data: org } = useSelectedOrganizationQuery()+ const track = useTrack()const [, setCreateMethod] = useQueryState('create', parseAsString)const showStripeExample = useIsFeatureEnabled('edge_functions:show_stripe_example')@@ -76,11 +74,7 @@ export const FunctionsEmptyState = () => {type="default"onClick={() => {router.push(`/project/${ref}/functions/new`)- sendEvent({- action: 'edge_function_via_editor_button_clicked',- properties: { origin: 'no_functions_block' },- groups: { project: ref ?? 'Unknown', organization: org?.slug ?? 'Unknown' },- })+ track('edge_function_via_editor_button_clicked', { origin: 'no_functions_block' })}}>Open Editor@@ -124,11 +118,7 @@ export const FunctionsEmptyState = () => {],},})- sendEvent({- action: 'edge_function_ai_assistant_button_clicked',- properties: { origin: 'no_functions_block' },- groups: { project: ref ?? 'Unknown', organization: org?.slug ?? 'Unknown' },- })+ track('edge_function_ai_assistant_button_clicked', { origin: 'no_functions_block' })}}>Open Assistant@@ -150,11 +140,7 @@ export const FunctionsEmptyState = () => {type="default"onClick={() => {setCreateMethod('cli')- sendEvent({- action: 'edge_function_via_cli_button_clicked',- properties: { origin: 'no_functions_block' },- groups: { project: ref ?? 'Unknown', organization: org?.slug ?? 'Unknown' },- })+ track('edge_function_via_cli_button_clicked', { origin: 'no_functions_block' })}}>View CLI Instructions@@ -171,10 +157,9 @@ export const FunctionsEmptyState = () => {key={template.name}media={<Code strokeWidth={1.5} size={16} className="translate-y-[-9px]" />}onClick={() => {- sendEvent({- action: 'edge_function_template_clicked',- properties: { templateName: template.name, origin: 'functions_page' },- groups: { project: ref ?? 'Unknown', organization: org?.slug ?? 'Unknown' },+ track('edge_function_template_clicked', {+ templateName: template.name,+ origin: 'functions_page',})}}>diff --git a/apps/studio/components/interfaces/Home/ExampleProject.tsx b/apps/studio/components/interfaces/Home/ExampleProject.tsxindex f86e1b70365..38b07dd40d1 100644--- a/apps/studio/components/interfaces/Home/ExampleProject.tsx+++ b/apps/studio/components/interfaces/Home/ExampleProject.tsx@@ -1,12 +1,10 @@-import { useParams } from 'common'import { ChevronRight } from 'lucide-react'import { useTheme } from 'next-themes'import Link from 'next/link'import { cn } from 'ui'-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'-import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'import { BASE_PATH } from '@/lib/constants'+import { useTrack } from '@/lib/telemetry/track'interface ExampleProjectProps {title: string@@ -24,10 +22,7 @@ export const ExampleProject = ({iconUrl,}: ExampleProjectProps) => {const { resolvedTheme } = useTheme()- const { ref: projectRef } = useParams()- const { data: org } = useSelectedOrganizationQuery()-- const { mutate: sendEvent } = useSendEventMutation()+ const track = useTrack()const iconImgSrc = iconUrl? iconUrl: !!framework@@ -45,13 +40,7 @@ export const ExampleProject = ({href={url}target="_blank"rel="noreferrer"- onClick={() =>- sendEvent({- action: 'example_project_card_clicked',- properties: { cardTitle: title },- groups: { project: projectRef ?? 'Unknown', organization: org?.slug ?? 'Unknown' },- })- }+ onClick={() => track('example_project_card_clicked', { cardTitle: title })}><divclassName={cn(diff --git a/apps/studio/components/interfaces/Integrations/CronJobs/CreateCronJobSheet/CreateCronJobSheet.tsx b/apps/studio/components/interfaces/Integrations/CronJobs/CreateCronJobSheet/CreateCronJobSheet.tsxindex ce90aa4a5d7..fd91482fb4c 100644--- a/apps/studio/components/interfaces/Integrations/CronJobs/CreateCronJobSheet/CreateCronJobSheet.tsx+++ b/apps/studio/components/interfaces/Integrations/CronJobs/CreateCronJobSheet/CreateCronJobSheet.tsx@@ -47,12 +47,11 @@ import { getDatabaseCronJob } from '@/data/database-cron-jobs/database-cron-job-import { useDatabaseCronJobCreateMutation } from '@/data/database-cron-jobs/database-cron-jobs-create-mutation'import { CronJob } from '@/data/database-cron-jobs/database-cron-jobs-infinite-query'import { useDatabaseExtensionsQuery } from '@/data/database-extensions/database-extensions-query'-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'-import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'import { useConfirmOnClose } from '@/hooks/ui/useConfirmOnClose'import { isGreaterThanOrEqual } from '@/lib/semver'+import { useTrack } from '@/lib/telemetry/track'interface CreateCronJobSheetProps {open: boolean@@ -89,7 +88,7 @@ const buildCommand = (values: CronJobType) => {export const CreateCronJobSheet = ({ open, selectedCronJob, onClose }: CreateCronJobSheetProps) => {const { childId } = useParams()const { data: project } = useSelectedProjectQuery()- const { data: org } = useSelectedOrganizationQuery()+ const track = useTrack()const [searchQuery] = useQueryState('search', parseAsString.withDefault(''))const [isLoadingGetCronJob, setIsLoadingGetCronJob] = useState(false)@@ -109,7 +108,6 @@ export const CreateCronJobSheet = ({ open, selectedCronJob, onClose }: CreateCro? isGreaterThanOrEqual(pgCronExtension.installed_version, '1.5'): false- const { mutate: sendEvent } = useSendEventMutation()const { mutate: upsertCronJob, isPending: isUpserting } = useDatabaseCronJobCreateMutation()const isLoading = isLoadingGetCronJob || isUpserting@@ -213,29 +211,9 @@ export const CreateCronJobSheet = ({ open, selectedCronJob, onClose }: CreateCro}if (isEditing) {- sendEvent({- action: 'cron_job_updated',- properties: {- type: values.type,- schedule: schedule,- },- groups: {- project: project?.ref ?? 'Unknown',- organization: org?.slug ?? 'Unknown',- },- })+ track('cron_job_updated', { type: values.type, schedule: schedule })} else {- sendEvent({- action: 'cron_job_created',- properties: {- type: values.type,- schedule: schedule,- },- groups: {- project: project?.ref ?? 'Unknown',- organization: org?.slug ?? 'Unknown',- },- })+ track('cron_job_created', { type: values.type, schedule: schedule })}onClose()diff --git a/apps/studio/components/interfaces/Integrations/CronJobs/CronJobsTab.tsx b/apps/studio/components/interfaces/Integrations/CronJobs/CronJobsTab.tsxindex caed9140dc4..56715951ee2 100644--- a/apps/studio/components/interfaces/Integrations/CronJobs/CronJobsTab.tsx+++ b/apps/studio/components/interfaces/Integrations/CronJobs/CronJobsTab.tsx@@ -14,12 +14,11 @@ import { useCronJobsData } from './CronJobsTab.useCronJobsData'import { DeleteCronJob } from './DeleteCronJob'import { CreateCronJobSheet } from '@/components/interfaces/Integrations/CronJobs/CreateCronJobSheet/CreateCronJobSheet'import { CronJob } from '@/data/database-cron-jobs/database-cron-jobs-infinite-query'-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'import { useInfiniteScroll } from '@/hooks/misc/useInfiniteScroll'-import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'import { cleanPointerEventsNoneOnBody } from '@/lib/helpers'import { createNavigationHandler } from '@/lib/navigation'+import { useTrack } from '@/lib/telemetry/track'import { SHORTCUT_IDS } from '@/state/shortcuts/registry'import { useShortcut } from '@/state/shortcuts/useShortcut'@@ -29,7 +28,7 @@ export const CronjobsTab = () => {const router = useRouter()const { ref } = useParams()const { data: project } = useSelectedProjectQuery()- const { data: org } = useSelectedOrganizationQuery()+ const track = useTrack()const [searchQuery, setSearchQuery] = useQueryState('search', parseAsString.withDefault(''))@@ -60,27 +59,19 @@ export const CronjobsTab = () => {const [, setCronJobForDeletion] = useQueryState('delete', parseAsString)- const { mutate: sendEvent } = useSendEventMutation()-const columns = useMemo(() =>formatCronJobColumns({onSelectEdit: (job: CronJob) => {- sendEvent({- action: 'cron_job_update_clicked',- groups: { project: ref ?? 'Unknown', organization: org?.slug ?? 'Unknown' },- })+ track('cron_job_update_clicked')setCronJobForEditing(job.jobid.toString())},onSelectDelete: (job: CronJob) => {- sendEvent({- action: 'cron_job_delete_clicked',- groups: { project: ref ?? 'Unknown', organization: org?.slug ?? 'Unknown' },- })+ track('cron_job_delete_clicked')setCronJobForDeletion(job.jobid.toString())},}),- [org?.slug, ref, sendEvent, setCronJobForEditing, setCronJobForDeletion]+ [track, setCronJobForEditing, setCronJobForDeletion])const handleScroll = useInfiniteScroll({@@ -91,10 +82,7 @@ export const CronjobsTab = () => {})const onOpenCreateJobSheet = () => {- sendEvent({- action: 'cron_job_create_clicked',- groups: { project: project?.ref ?? 'Unknown', organization: org?.slug ?? 'Unknown' },- })+ track('cron_job_create_clicked')setCreateCronJobSheetShown(true)}@@ -118,10 +106,7 @@ export const CronjobsTab = () => {jobname || `Job #${jobid}`)}`- sendEvent({- action: 'cron_job_history_clicked',- groups: { project: ref ?? 'Unknown', organization: org?.slug ?? 'Unknown' },- })+ track('cron_job_history_clicked')createNavigationHandler(url, router)(event)}diff --git a/apps/studio/components/interfaces/Integrations/Wrappers/CreateIcebergWrapperSheet.tsx b/apps/studio/components/interfaces/Integrations/Wrappers/CreateIcebergWrapperSheet.tsxindex 2e10cf991c2..ec24d7cf754 100644--- a/apps/studio/components/interfaces/Integrations/Wrappers/CreateIcebergWrapperSheet.tsx+++ b/apps/studio/components/interfaces/Integrations/Wrappers/CreateIcebergWrapperSheet.tsx@@ -28,9 +28,8 @@ import {import { useSchemaCreateMutation } from '@/data/database/schema-create-mutation'import { useSchemasQuery } from '@/data/database/schemas-query'import { useFDWCreateMutation } from '@/data/fdw/fdw-create-mutation'-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'-import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'+import { useTrack } from '@/lib/telemetry/track'const FORM_ID = 'create-wrapper-form'@@ -125,8 +124,7 @@ export const CreateIcebergWrapperSheet = ({onCloseWithConfirmation,}: CreateWrapperSheetProps) => {const { data: project } = useSelectedProjectQuery()- const { data: org } = useSelectedOrganizationQuery()- const { mutate: sendEvent } = useSendEventMutation()+ const track = useTrack()const { mutateAsync: createFDW, isPending: isCreatingWrapper } = useFDWCreateMutation({onSuccess: () => {@@ -212,16 +210,7 @@ export const CreateIcebergWrapperSheet = ({targetSchema: values.target_schema,})- sendEvent({- action: 'foreign_data_wrapper_created',- properties: {- wrapperType: wrapperMeta.label,- },- groups: {- project: project?.ref ?? 'Unknown',- organization: org?.slug ?? 'Unknown',- },- })+ track('foreign_data_wrapper_created', { wrapperType: wrapperMeta.label })} catch (error) {console.error(error)// The error will be handled by the mutation onError callback (toast.error)diff --git a/apps/studio/components/interfaces/Integrations/Wrappers/CreateWrapperSheet.tsx b/apps/studio/components/interfaces/Integrations/Wrappers/CreateWrapperSheet.tsxindex 26362ec67d6..a2baee892c1 100644--- a/apps/studio/components/interfaces/Integrations/Wrappers/CreateWrapperSheet.tsx+++ b/apps/studio/components/interfaces/Integrations/Wrappers/CreateWrapperSheet.tsx@@ -34,9 +34,8 @@ import { useDatabaseExtensionsQuery } from '@/data/database-extensions/database-import { useSchemaCreateMutation } from '@/data/database/schema-create-mutation'import { invalidateSchemasQuery, useSchemasQuery } from '@/data/database/schemas-query'import { useFDWCreateMutation } from '@/data/fdw/fdw-create-mutation'-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'-import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'+import { useTrack } from '@/lib/telemetry/track'const FORM_ID = 'create-wrapper-form'@@ -56,8 +55,7 @@ export const CreateWrapperSheet = ({const queryClient = useQueryClient()const { data: project } = useSelectedProjectQuery()- const { data: org } = useSelectedOrganizationQuery()- const { mutate: sendEvent } = useSendEventMutation()+ const track = useTrack()const [selectedTableToEdit, setSelectedTableToEdit] = useState<FormattedWrapperTable | undefined@@ -184,16 +182,7 @@ export const CreateWrapperSheet = ({targetSchema: wrapperValues.target_schema,})- sendEvent({- action: 'foreign_data_wrapper_created',- properties: {- wrapperType: wrapperMeta.label,- },- groups: {- project: project?.ref ?? 'Unknown',- organization: org?.slug ?? 'Unknown',- },- })+ track('foreign_data_wrapper_created', { wrapperType: wrapperMeta.label })} catch (error) {console.error(error)// The error will be handled by the mutation onError callback (toast.error)diff --git a/apps/studio/components/interfaces/Organization/BillingSettings/Subscription/EnterpriseCard.tsx b/apps/studio/components/interfaces/Organization/BillingSettings/Subscription/EnterpriseCard.tsxindex 0b843e78399..8c4ec21b5f1 100644--- a/apps/studio/components/interfaces/Organization/BillingSettings/Subscription/EnterpriseCard.tsx+++ b/apps/studio/components/interfaces/Organization/BillingSettings/Subscription/EnterpriseCard.tsx@@ -2,8 +2,8 @@ import { Check } from 'lucide-react'import { PricingInformation } from 'shared-data'import { Button, cn } from 'ui'-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'+import { useTrack } from '@/lib/telemetry/track'export interface EnterpriseCardProps {plan: PricingInformation@@ -12,12 +12,11 @@ export interface EnterpriseCardProps {export const EnterpriseCard = ({ plan, isCurrentPlan }: EnterpriseCardProps) => {const { data: selectedOrganization } = useSelectedOrganizationQuery()- const orgSlug = selectedOrganization?.slugconst features = plan.featuresconst currentPlan = selectedOrganization?.plan.name- const { mutate: sendEvent } = useSendEventMutation()+ const track = useTrack()return (<div@@ -49,10 +48,9 @@ export const EnterpriseCard = ({ plan, isCurrentPlan }: EnterpriseCardProps) =>type="default"size="tiny"onClick={() =>- sendEvent({- action: 'studio_pricing_plan_cta_clicked',- properties: { selectedPlan: 'Enterprise', currentPlan },- groups: { organization: orgSlug ?? 'Unknown' },+ track('studio_pricing_plan_cta_clicked', {+ selectedPlan: 'Enterprise',+ currentPlan,})}>@@ -86,10 +84,9 @@ export const EnterpriseCard = ({ plan, isCurrentPlan }: EnterpriseCardProps) =>type="default"size="tiny"onClick={() =>- sendEvent({- action: 'studio_pricing_plan_cta_clicked',- properties: { selectedPlan: 'Enterprise', currentPlan },- groups: { organization: orgSlug ?? 'Unknown' },+ track('studio_pricing_plan_cta_clicked', {+ selectedPlan: 'Enterprise',+ currentPlan,})}>diff --git a/apps/studio/components/interfaces/Organization/BillingSettings/Subscription/PlanUpdateSidePanel.test.tsx b/apps/studio/components/interfaces/Organization/BillingSettings/Subscription/PlanUpdateSidePanel.test.tsxindex 8fbdb8fad04..ba78c21dbc8 100644--- a/apps/studio/components/interfaces/Organization/BillingSettings/Subscription/PlanUpdateSidePanel.test.tsx+++ b/apps/studio/components/interfaces/Organization/BillingSettings/Subscription/PlanUpdateSidePanel.test.tsx@@ -36,8 +36,8 @@ vi.mock('@/hooks/misc/useSelectedOrganization', () => ({useSelectedOrganizationQuery: () => ({ data: mockSelectedOrganization() }),}))-vi.mock('@/data/telemetry/send-event-mutation', () => ({- useSendEventMutation: () => ({ mutate: vi.fn() }),+vi.mock('@/lib/telemetry/track', () => ({+ useTrack: () => vi.fn(),}))vi.mock('@/hooks/misc/useCheckPermissions', () => ({diff --git a/apps/studio/components/interfaces/Organization/BillingSettings/Subscription/PlanUpdateSidePanel.tsx b/apps/studio/components/interfaces/Organization/BillingSettings/Subscription/PlanUpdateSidePanel.tsxindex a7785b64ed4..6ec8fdf5e1f 100644--- a/apps/studio/components/interfaces/Organization/BillingSettings/Subscription/PlanUpdateSidePanel.tsx+++ b/apps/studio/components/interfaces/Organization/BillingSettings/Subscription/PlanUpdateSidePanel.tsx@@ -30,11 +30,12 @@ import { useOrgProjectsInfiniteQuery } from '@/data/projects/org-projects-infiniimport { useOrgPlansQuery } from '@/data/subscriptions/org-plans-query'import { useOrgSubscriptionQuery } from '@/data/subscriptions/org-subscription-query'import type { OrgPlan } from '@/data/subscriptions/types'-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'+import { useStaticEffectEvent } from '@/hooks/useStaticEffectEvent'import { MANAGED_BY } from '@/lib/constants/infrastructure'import { formatCurrency } from '@/lib/helpers'+import { useTrack } from '@/lib/telemetry/track'import { useOrgSettingsPageStateSnapshot } from '@/state/organization-settings'import { Organization } from '@/types/base'@@ -68,7 +69,7 @@ export const PlanUpdateSidePanel = () => {)const isStripeManagedOrganization =selectedOrganization?.managed_by === MANAGED_BY.STRIPE_PROJECTS- const { mutate: sendEvent } = useSendEventMutation()+ const track = useTrack()const originalPlanRef = useRef<string>(undefined)@@ -150,6 +151,12 @@ export const PlanUpdateSidePanel = () => {// this data from the organization queryorgProjects.filter((it) => it.status !== 'INACTIVE' && it.status !== 'GOING_DOWN').length > 0+ const onPanelOpened = useStaticEffectEvent(+ (properties: StudioPricingSidePanelOpenedEvent['properties']) => {+ track('studio_pricing_side_panel_opened', properties)+ }+ )+useEffect(() => {if (visible) {setSelectedTier(undefined)@@ -165,11 +172,7 @@ export const PlanUpdateSidePanel = () => {if (source) {properties.origin = source}- sendEvent({- action: 'studio_pricing_side_panel_opened',- properties,- groups: { organization: slug ?? 'Unknown' },- })+ onPanelOpened(properties)}// eslint-disable-next-line react-hooks/exhaustive-deps}, [visible])@@ -325,13 +328,9 @@ export const PlanUpdateSidePanel = () => {}onClick={() => {setSelectedTier(plan.id as 'tier_free' | 'tier_pro' | 'tier_team')- sendEvent({- action: 'studio_pricing_plan_cta_clicked',- properties: {- selectedPlan: plan.name,- currentPlan: subscription?.plan?.name,- },- groups: { organization: slug ?? 'Unknown' },+ track('studio_pricing_plan_cta_clicked', {+ selectedPlan: plan.name,+ currentPlan: subscription?.plan?.name,})}}tooltip={{diff --git a/apps/studio/components/interfaces/Organization/Documents/HIPAA.tsx b/apps/studio/components/interfaces/Organization/Documents/HIPAA.tsxindex ef9b4783c12..dca191564d4 100644--- a/apps/studio/components/interfaces/Organization/Documents/HIPAA.tsx+++ b/apps/studio/components/interfaces/Organization/Documents/HIPAA.tsx@@ -6,12 +6,10 @@ import {ScaffoldSectionContent,ScaffoldSectionDetail,} from '@/components/layouts/Scaffold'-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'-import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'+import { useTrack } from '@/lib/telemetry/track'export const HIPAA = () => {- const { data: organization } = useSelectedOrganizationQuery()- const { mutate: sendEvent } = useSendEventMutation()+ const track = useTrack()return (<ScaffoldSection className="py-12">@@ -39,12 +37,7 @@ export const HIPAA = () => {href="https://forms.supabase.com/hipaa2"target="_blank"rel="noreferrer noopener"- onClick={() =>- sendEvent({- action: 'hipaa_request_button_clicked',- groups: { organization: organization?.slug ?? 'Unknown' },- })- }+ onClick={() => track('hipaa_request_button_clicked')}>Request HIPAA</a>diff --git a/apps/studio/components/interfaces/Organization/Documents/ISO27001.tsx b/apps/studio/components/interfaces/Organization/Documents/ISO27001.tsxindex f2c7a0051d5..0460ae91cf5 100644--- a/apps/studio/components/interfaces/Organization/Documents/ISO27001.tsx+++ b/apps/studio/components/interfaces/Organization/Documents/ISO27001.tsx@@ -14,16 +14,16 @@ import {import NoPermission from '@/components/ui/NoPermission'import { UpgradePlanButton } from '@/components/ui/UpgradePlanButton'import { getDocument } from '@/data/documents/document-query'-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'import { useCheckEntitlements } from '@/hooks/misc/useCheckEntitlements'import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'+import { useTrack } from '@/lib/telemetry/track'export const ISO27001 = () => {const { data: organization } = useSelectedOrganizationQuery()const slug = organization?.slug- const { mutate: sendEvent } = useSendEventMutation()+ const track = useTrack()const { can: canReadSubscriptions, isLoading: isLoadingPermissions } = useAsyncCheckPermissions(PermissionAction.BILLING_READ,'stripe.subscriptions'@@ -48,11 +48,7 @@ export const ISO27001 = () => {const handleDownloadClick = () => {if (!slug) return- sendEvent({- action: 'document_view_button_clicked',- properties: { documentName: 'ISO27001' },- groups: { organization: slug },- })+ track('document_view_button_clicked', { documentName: 'ISO27001' })setIsOpen(true)}diff --git a/apps/studio/components/interfaces/Organization/Documents/SOC2.tsx b/apps/studio/components/interfaces/Organization/Documents/SOC2.tsxindex e02f6b31420..6b7d48642d7 100644--- a/apps/studio/components/interfaces/Organization/Documents/SOC2.tsx+++ b/apps/studio/components/interfaces/Organization/Documents/SOC2.tsx@@ -14,16 +14,16 @@ import {import NoPermission from '@/components/ui/NoPermission'import { UpgradePlanButton } from '@/components/ui/UpgradePlanButton'import { getDocument } from '@/data/documents/document-query'-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'import { useCheckEntitlements } from '@/hooks/misc/useCheckEntitlements'import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'+import { useTrack } from '@/lib/telemetry/track'export const SOC2 = () => {const { data: organization } = useSelectedOrganizationQuery()const slug = organization?.slug- const { mutate: sendEvent } = useSendEventMutation()+ const track = useTrack()const { can: canReadSubscriptions, isLoading: isLoadingPermissions } = useAsyncCheckPermissions(PermissionAction.BILLING_READ,'stripe.subscriptions'@@ -47,11 +47,7 @@ export const SOC2 = () => {const handleDownloadClick = () => {if (!slug) return- sendEvent({- action: 'document_view_button_clicked',- properties: { documentName: 'SOC2' },- groups: { organization: slug },- })+ track('document_view_button_clicked', { documentName: 'SOC2' })setIsOpen(true)}diff --git a/apps/studio/components/interfaces/Organization/Documents/SecurityQuestionnaire.tsx b/apps/studio/components/interfaces/Organization/Documents/SecurityQuestionnaire.tsxindex 8e6084c066f..456a8420c9b 100644--- a/apps/studio/components/interfaces/Organization/Documents/SecurityQuestionnaire.tsx+++ b/apps/studio/components/interfaces/Organization/Documents/SecurityQuestionnaire.tsx@@ -12,16 +12,16 @@ import {} from '@/components/layouts/Scaffold'import NoPermission from '@/components/ui/NoPermission'import { getDocument } from '@/data/documents/document-query'-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'import { useCheckEntitlements } from '@/hooks/misc/useCheckEntitlements'import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'+import { useTrack } from '@/lib/telemetry/track'export const SecurityQuestionnaire = () => {const { data: organization } = useSelectedOrganizationQuery()const slug = organization?.slug- const { mutate: sendEvent } = useSendEventMutation()+ const track = useTrack()const { can: canReadSubscriptions, isLoading: isLoadingPermissions } = useAsyncCheckPermissions(PermissionAction.BILLING_READ,'stripe.subscriptions'@@ -45,11 +45,7 @@ export const SecurityQuestionnaire = () => {const handleDownloadClick = () => {if (!slug) return- sendEvent({- action: 'document_view_button_clicked',- properties: { documentName: 'Standard Security Questionnaire' },- groups: { organization: slug },- })+ track('document_view_button_clicked', { documentName: 'Standard Security Questionnaire' })fetchQuestionnaire(slug)}diff --git a/apps/studio/components/interfaces/Organization/Documents/TIA.tsx b/apps/studio/components/interfaces/Organization/Documents/TIA.tsxindex 9664cc42246..1e4feece1c4 100644--- a/apps/studio/components/interfaces/Organization/Documents/TIA.tsx+++ b/apps/studio/components/interfaces/Organization/Documents/TIA.tsx@@ -6,12 +6,10 @@ import {ScaffoldSectionContent,ScaffoldSectionDetail,} from '@/components/layouts/Scaffold'-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'-import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'+import { useTrack } from '@/lib/telemetry/track'export const TIA = () => {- const { data: organization } = useSelectedOrganizationQuery()- const { mutate: sendEvent } = useSendEventMutation()+ const track = useTrack()return (<ScaffoldSection className="py-12">@@ -32,13 +30,7 @@ export const TIA = () => {target="_blank"rel="noreferrer noopener"download={true}- onClick={() =>- sendEvent({- action: 'document_view_button_clicked',- properties: { documentName: 'TIA' },- groups: { organization: organization?.slug ?? 'Unknown' },- })- }+ onClick={() => track('document_view_button_clicked', { documentName: 'TIA' })}>Download TIA</a>diff --git a/apps/studio/components/interfaces/Organization/SecuritySettings.tsx b/apps/studio/components/interfaces/Organization/SecuritySettings.tsxindex bbb0abfc354..1e72cd5b5fb 100644--- a/apps/studio/components/interfaces/Organization/SecuritySettings.tsx+++ b/apps/studio/components/interfaces/Organization/SecuritySettings.tsx@@ -29,10 +29,10 @@ import { UpgradeToPro } from '@/components/ui/UpgradeToPro'import { useOrganizationMembersQuery } from '@/data/organizations/organization-members-query'import { useOrganizationMfaToggleMutation } from '@/data/organizations/organization-mfa-mutation'import { useOrganizationMfaQuery } from '@/data/organizations/organization-mfa-query'-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'import { useCheckEntitlements } from '@/hooks/misc/useCheckEntitlements'import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'import { useProfile } from '@/lib/profile'+import { useTrack } from '@/lib/telemetry/track'const schema = z.object({enforceMfa: z.boolean(),@@ -51,7 +51,7 @@ export const SecuritySettings = () => {PermissionAction.UPDATE,'organizations')- const { mutate: sendEvent } = useSendEventMutation()+ const track = useTrack()const { hasAccess: hasAccessToEnforceMfa, isLoading: isLoadingEntitlement } =useCheckEntitlements('security.enforce_mfa')@@ -71,15 +71,7 @@ export const SecuritySettings = () => {},onSuccess: (data) => {toast.success('Successfully updated organization MFA settings')- sendEvent({- action: 'organization_mfa_enforcement_updated',- properties: {- mfaEnforced: data.enforced,- },- groups: {- organization: slug ?? 'Unknown',- },- })+ track('organization_mfa_enforcement_updated', { mfaEnforced: data.enforced })},})diff --git a/apps/studio/components/interfaces/ProjectAPIDocs/Content/Introduction.tsx b/apps/studio/components/interfaces/ProjectAPIDocs/Content/Introduction.tsxindex 7bc591f7bf5..4594cee9971 100644--- a/apps/studio/components/interfaces/ProjectAPIDocs/Content/Introduction.tsx+++ b/apps/studio/components/interfaces/ProjectAPIDocs/Content/Introduction.tsx@@ -11,17 +11,15 @@ import { DOCS_CONTENT } from '../ProjectAPIDocs.constants'import type { ContentProps } from './Content.types'import { getKeys, useAPIKeysQuery } from '@/data/api-keys/api-keys-query'import { useProjectSettingsV2Query } from '@/data/config/project-settings-v2-query'-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'-import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'+import { useTrack } from '@/lib/telemetry/track'export const Introduction = ({ showKeys, language, apikey, endpoint }: ContentProps) => {const { ref } = useParams()const { can: canReadAPIKeys } = useAsyncCheckPermissions(PermissionAction.SECRETS_READ, '*')const { data: apiKeys } = useAPIKeysQuery({ projectRef: ref }, { enabled: canReadAPIKeys })useProjectSettingsV2Query({ projectRef: ref })- const { data: org } = useSelectedOrganizationQuery()- const { mutate: sendEvent } = useSendEventMutation()+ const track = useTrack()const [copied, setCopied] = useState<'anon' | 'service'>()@@ -67,16 +65,9 @@ export const Introduction = ({ showKeys, language, apikey, endpoint }: ContentPronClick={() => {setCopied('anon')copyToClipboard(anonApiKey ?? 'SUPABASE_CLIENT_ANON_KEY')- sendEvent({- action: 'api_docs_code_copy_button_clicked',- properties: {- title: 'Client API key',- selectedLanguage: language,- },- groups: {- project: ref ?? 'Unknown',- organization: org?.slug ?? 'Unknown',- },+ track('api_docs_code_copy_button_clicked', {+ title: 'Client API key',+ selectedLanguage: language,})}}>@@ -115,16 +106,9 @@ export const Introduction = ({ showKeys, language, apikey, endpoint }: ContentPronClick={() => {setCopied('service')copyToClipboard(serviceApiKey)- sendEvent({- action: 'api_docs_code_copy_button_clicked',- properties: {- title: 'Service key',- selectedLanguage: language,- },- groups: {- project: ref ?? 'Unknown',- organization: org?.slug ?? 'Unknown',- },+ track('api_docs_code_copy_button_clicked', {+ title: 'Service key',+ selectedLanguage: language,})}}>diff --git a/apps/studio/components/interfaces/ProjectAPIDocs/ContentSnippet.tsx b/apps/studio/components/interfaces/ProjectAPIDocs/ContentSnippet.tsxindex 0b3bfbe003d..bb215531118 100644--- a/apps/studio/components/interfaces/ProjectAPIDocs/ContentSnippet.tsx+++ b/apps/studio/components/interfaces/ProjectAPIDocs/ContentSnippet.tsx@@ -3,8 +3,7 @@ import { PropsWithChildren } from 'react'import { SimpleCodeBlock } from 'ui-patterns/SimpleCodeBlock'import { Markdown } from '../Markdown'-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'-import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'+import { useTrack } from '@/lib/telemetry/track'interface ContentSnippetProps {apikey?: string@@ -28,8 +27,7 @@ const ContentSnippet = ({children,}: PropsWithChildren<ContentSnippetProps>) => {const { ref: projectRef } = useParams()- const { data: org } = useSelectedOrganizationQuery()- const { mutate: sendEvent } = useSendEventMutation()+ const track = useTrack()const codeSnippet = snippet[selectedLanguage]?.(apikey, endpoint).replaceAll('[ref]',@@ -37,17 +35,7 @@ const ContentSnippet = ({)const handleCopy = () => {- sendEvent({- action: 'api_docs_code_copy_button_clicked',- properties: {- title: snippet.title,- selectedLanguage,- },- groups: {- project: projectRef ?? 'Unknown',- organization: org?.slug ?? 'Unknown',- },- })+ track('api_docs_code_copy_button_clicked', { title: snippet.title, selectedLanguage })}return (diff --git a/apps/studio/components/interfaces/ProjectAPIDocs/ResourceContent.tsx b/apps/studio/components/interfaces/ProjectAPIDocs/ResourceContent.tsxindex d32acccc8c2..2948d364a64 100644--- a/apps/studio/components/interfaces/ProjectAPIDocs/ResourceContent.tsx+++ b/apps/studio/components/interfaces/ProjectAPIDocs/ResourceContent.tsx@@ -3,8 +3,7 @@ import { SimpleCodeBlock } from 'ui-patterns/SimpleCodeBlock'import { Markdown } from '../Markdown'import { DocsButton } from '@/components/ui/DocsButton'-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'-import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'+import { useTrack } from '@/lib/telemetry/track'interface ResourceContentProps {selectedLanguage: 'js' | 'bash'@@ -19,21 +18,10 @@ interface ResourceContentProps {const ResourceContent = ({ selectedLanguage, snippet, codeSnippets }: ResourceContentProps) => {const { ref: projectRef } = useParams()- const { data: org } = useSelectedOrganizationQuery()- const { mutate: sendEvent } = useSendEventMutation()+ const track = useTrack()const handleCopy = (title: string) => {- sendEvent({- action: 'api_docs_code_copy_button_clicked',- properties: {- title,- selectedLanguage,- },- groups: {- project: projectRef ?? 'Unknown',- organization: org?.slug ?? 'Unknown',- },- })+ track('api_docs_code_copy_button_clicked', { title, selectedLanguage })}return (diff --git a/apps/studio/components/interfaces/ProjectHome/ProjectUsageSection.tsx b/apps/studio/components/interfaces/ProjectHome/ProjectUsageSection.tsxindex 334e9bb4846..54c02299725 100644--- a/apps/studio/components/interfaces/ProjectHome/ProjectUsageSection.tsx+++ b/apps/studio/components/interfaces/ProjectHome/ProjectUsageSection.tsx@@ -11,11 +11,11 @@ import NoDataPlaceholder from '@/components/ui/Charts/NoDataPlaceholder'import { ChartIntervalDropdown } from '@/components/ui/Logs/ChartIntervalDropdown'import { CHART_INTERVALS } from '@/components/ui/Logs/logs.utils'import { UsageApiCounts, useProjectLogStatsQuery } from '@/data/analytics/project-log-stats-query'-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'import { useFillTimeseriesSorted } from '@/hooks/analytics/useFillTimeseriesSorted'import { useCheckEntitlements } from '@/hooks/misc/useCheckEntitlements'import { useIsFeatureEnabled } from '@/hooks/misc/useIsFeatureEnabled'import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'+import { useTrack } from '@/lib/telemetry/track'type LogsBarChartDatum = {timestamp: string@@ -47,7 +47,7 @@ export const ProjectUsageSection = () => {const router = useRouter()const { ref: projectRef } = useParams()const { data: organization } = useSelectedOrganizationQuery()- const { mutate: sendEvent } = useSendEventMutation()+ const track = useTrack()const { projectAuthAll: authEnabled, projectStorageAll: storageEnabled } = useIsFeatureEnabled(['project_auth:all','project_storage:all',@@ -183,19 +183,10 @@ export const ProjectUsageSection = () => {router.push(`/project/${projectRef}${logRoute}?${queryParams.toString()}`)- if (projectRef && organization?.slug) {- sendEvent({- action: 'home_project_usage_chart_clicked',- properties: {- service_type: serviceKey,- bar_timestamp: datum.timestamp,- },- groups: {- project: projectRef,- organization: organization.slug,- },- })- }+ track('home_project_usage_chart_clicked', {+ service_type: serviceKey,+ bar_timestamp: datum.timestamp,+ })}const enabledServices = services.filter((s) => s.enabled)@@ -227,19 +218,10 @@ export const ProjectUsageSection = () => {<Linkhref={s.href}onClick={() => {- if (projectRef && organization?.slug) {- sendEvent({- action: 'home_project_usage_service_clicked',- properties: {- service_type: s.key,- total_requests: s.total || 0,- },- groups: {- project: projectRef,- organization: organization.slug,- },- })- }+ track('home_project_usage_service_clicked', {+ service_type: s.key,+ total_requests: s.total || 0,+ })}}>{s.title}diff --git a/apps/studio/components/interfaces/Realtime/Inspector/ChooseChannelPopover.tsx b/apps/studio/components/interfaces/Realtime/Inspector/ChooseChannelPopover.tsxindex 706fd5513c2..fb852f8d2ca 100644--- a/apps/studio/components/interfaces/Realtime/Inspector/ChooseChannelPopover.tsx+++ b/apps/studio/components/interfaces/Realtime/Inspector/ChooseChannelPopover.tsx@@ -1,5 +1,5 @@import { zodResolver } from '@hookform/resolvers/zod'-import { IS_PLATFORM, useParams } from 'common'+import { IS_PLATFORM } from 'common'import { ChevronDown } from 'lucide-react'import { Dispatch, SetStateAction, useState } from 'react'import { useForm } from 'react-hook-form'@@ -26,9 +26,8 @@ import { RealtimeConfig } from './useRealtimeMessages'import { DocsButton } from '@/components/ui/DocsButton'import { ShortcutTooltip } from '@/components/ui/ShortcutTooltip'import { getTemporaryAPIKey } from '@/data/api-keys/temp-api-keys-query'-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'-import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'import { DOCS_URL } from '@/lib/constants'+import { useTrack } from '@/lib/telemetry/track'import { SHORTCUT_IDS } from '@/state/shortcuts/registry'type ControlledOpenProps =@@ -59,9 +58,7 @@ export const ChooseChannelPopover = ({setInternalOpen(v)}}- const { ref } = useParams()- const { data: org } = useSelectedOrganizationQuery()- const { mutate: sendEvent } = useSendEventMutation()+ const track = useTrack()const form = useForm<z.infer<typeof FormSchema>>({mode: 'onBlur',@@ -80,13 +77,7 @@ export const ChooseChannelPopover = ({const onSubmit = async () => {setOpen(false)- sendEvent({- action: 'realtime_inspector_listen_channel_clicked',- groups: {- project: ref ?? 'Unknown',- organization: org?.slug ?? 'Unknown',- },- })+ track('realtime_inspector_listen_channel_clicked')let token = config.tokendiff --git a/apps/studio/components/interfaces/Realtime/Inspector/Header.tsx b/apps/studio/components/interfaces/Realtime/Inspector/Header.tsxindex 1a2c7dc759a..9b58e2a9bd2 100644--- a/apps/studio/components/interfaces/Realtime/Inspector/Header.tsx+++ b/apps/studio/components/interfaces/Realtime/Inspector/Header.tsx@@ -1,5 +1,5 @@import { PermissionAction } from '@supabase/shared-types/out/constants'-import { IS_PLATFORM, useParams } from 'common'+import { IS_PLATFORM } from 'common'import { PlayCircle, StopCircle } from 'lucide-react'import { Dispatch, SetStateAction, useCallback } from 'react'import { Button } from 'ui'@@ -11,9 +11,8 @@ import { RealtimeConfig } from './useRealtimeMessages'import { ButtonTooltip } from '@/components/ui/ButtonTooltip'import { ShortcutTooltip } from '@/components/ui/ShortcutTooltip'import { getTemporaryAPIKey } from '@/data/api-keys/temp-api-keys-query'-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'-import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'+import { useTrack } from '@/lib/telemetry/track'import { SHORTCUT_IDS } from '@/state/shortcuts/registry'import { useShortcut } from '@/state/shortcuts/useShortcut'@@ -34,9 +33,7 @@ export const Header = ({filterPopoverOpen,onFilterPopoverChange,}: HeaderProps) => {- const { mutate: sendEvent } = useSendEventMutation()- const { ref } = useParams()- const { data: org } = useSelectedOrganizationQuery()+ const track = useTrack()const { can: canReadAPIKeys } = useAsyncCheckPermissions(PermissionAction.READ,@@ -57,15 +54,9 @@ export const Header = ({}if (willStartListening) {- sendEvent({- action: 'realtime_inspector_listen_channel_clicked',- groups: {- project: ref ?? 'Unknown',- organization: org?.slug ?? 'Unknown',- },- })+ track('realtime_inspector_listen_channel_clicked')}- }, [config, onChangeConfig, sendEvent, ref, org])+ }, [config, onChangeConfig, track])useShortcut(SHORTCUT_IDS.INSPECTOR_TOGGLE_LISTENING, handleToggleListening, {enabled: canToggleListening,diff --git a/apps/studio/components/interfaces/Realtime/Inspector/MessageSelection.tsx b/apps/studio/components/interfaces/Realtime/Inspector/MessageSelection.tsxindex 2d8c6ae1fe3..e8758d443bb 100644--- a/apps/studio/components/interfaces/Realtime/Inspector/MessageSelection.tsx+++ b/apps/studio/components/interfaces/Realtime/Inspector/MessageSelection.tsx@@ -1,4 +1,3 @@-import { useParams } from 'common'import { X } from 'lucide-react'import { useMemo } from 'react'import { toast } from 'sonner'@@ -8,8 +7,7 @@ import type { LogData } from './Messages.types'import { SelectedRealtimeMessagePanel } from './SelectedRealtimeMessagePanel'import CopyButton from '@/components/ui/CopyButton'import { ShortcutTooltip } from '@/components/ui/ShortcutTooltip'-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'-import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'+import { useTrack } from '@/lib/telemetry/track'import { SHORTCUT_IDS } from '@/state/shortcuts/registry'import { useShortcut } from '@/state/shortcuts/useShortcut'@@ -23,9 +21,7 @@ const MessageSelection = ({ log, onClose }: MessageSelectionProps) => {return JSON.stringify(log, null, 2)}, [log])- const { ref } = useParams()- const { data: org } = useSelectedOrganizationQuery()- const { mutate: sendEvent } = useSendEventMutation()+ const track = useTrack()const handleCopy = () => {if (!log) return@@ -45,10 +41,7 @@ const MessageSelection = ({ log, onClose }: MessageSelectionProps) => {type="default"title="Copy log to clipboard"onClick={() => {- sendEvent({- action: 'realtime_inspector_copy_message_clicked',- groups: { project: ref ?? 'Unknown', organization: org?.slug ?? 'Unknown' },- })+ track('realtime_inspector_copy_message_clicked')}}/>)diff --git a/apps/studio/components/interfaces/Realtime/Inspector/MessagesTable.tsx b/apps/studio/components/interfaces/Realtime/Inspector/MessagesTable.tsxindex 8a2e2240a48..35376f9e297 100644--- a/apps/studio/components/interfaces/Realtime/Inspector/MessagesTable.tsx+++ b/apps/studio/components/interfaces/Realtime/Inspector/MessagesTable.tsx@@ -16,10 +16,9 @@ import { DocsButton } from '@/components/ui/DocsButton'import NoPermission from '@/components/ui/NoPermission'import ShimmerLine from '@/components/ui/ShimmerLine'import { ShortcutTooltip } from '@/components/ui/ShortcutTooltip'-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'-import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'import { DOCS_URL } from '@/lib/constants'+import { useTrack } from '@/lib/telemetry/track'import { SHORTCUT_IDS } from '@/state/shortcuts/registry'export const isErrorLog = (l: LogData) => {@@ -142,9 +141,7 @@ const MessagesTable = ({const [focusedLog, setFocusedLog] = useState<LogData | null>(null)const stringData = JSON.stringify(data)- const { ref } = useParams()- const { data: org } = useSelectedOrganizationQuery()- const { mutate: sendEvent } = useSendEventMutation()+ const track = useTrack()useEffect(() => {if (!data) return@@ -219,13 +216,7 @@ const MessagesTable = ({isRowSelected={false}selectedCellIdx={undefined}onClick={() => {- sendEvent({- action: 'realtime_inspector_message_clicked',- groups: {- project: ref ?? 'Unknown',- organization: org?.slug ?? 'Unknown',- },- })+ track('realtime_inspector_message_clicked')setFocusedLog(row)}}/>diff --git a/apps/studio/components/interfaces/Realtime/Inspector/RealtimeFilterPopover/index.tsx b/apps/studio/components/interfaces/Realtime/Inspector/RealtimeFilterPopover/index.tsxindex 53a44db2638..a6f8a94565d 100644--- a/apps/studio/components/interfaces/Realtime/Inspector/RealtimeFilterPopover/index.tsx+++ b/apps/studio/components/interfaces/Realtime/Inspector/RealtimeFilterPopover/index.tsx@@ -23,10 +23,9 @@ import { FilterTable } from './FilterTable'import { InlineLink } from '@/components/ui/InlineLink'import { ShortcutTooltip } from '@/components/ui/ShortcutTooltip'import { useDatabasePublicationsQuery } from '@/data/database-publications/database-publications-query'-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'-import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'import { DOCS_URL } from '@/lib/constants'+import { useTrack } from '@/lib/telemetry/track'import { SHORTCUT_IDS } from '@/state/shortcuts/registry'type ControlledOpenProps =@@ -60,8 +59,7 @@ export const RealtimeFilterPopover = ({const { ref } = useParams()const { data: project } = useSelectedProjectQuery()- const { data: org } = useSelectedOrganizationQuery()- const { mutate: sendEvent } = useSendEventMutation()+ const track = useTrack()const { data: publications } = useDatabasePublicationsQuery({projectRef: project?.ref,@@ -269,10 +267,7 @@ export const RealtimeFilterPopover = ({visible={applyConfigOpen}onCancel={() => setApplyConfigOpen(false)}onConfirm={() => {- sendEvent({- action: 'realtime_inspector_filters_applied',- groups: { project: ref ?? 'Unknown', organization: org?.slug ?? 'Unknown' },- })+ track('realtime_inspector_filters_applied')onChangeConfig(tempConfig)setApplyConfigOpen(false)setOpen(false)diff --git a/apps/studio/components/interfaces/Realtime/Inspector/RealtimeTokensPopover.tsx b/apps/studio/components/interfaces/Realtime/Inspector/RealtimeTokensPopover.tsxindex 22a58b114fe..bd13be6236d 100644--- a/apps/studio/components/interfaces/Realtime/Inspector/RealtimeTokensPopover.tsx+++ b/apps/studio/components/interfaces/Realtime/Inspector/RealtimeTokensPopover.tsx@@ -1,5 +1,4 @@import { PermissionAction } from '@supabase/shared-types/out/constants'-import { useParams } from 'common'import { Dispatch, SetStateAction, useEffect, useRef } from 'react'import { toast } from 'sonner'@@ -8,11 +7,11 @@ import { RoleImpersonationPopover } from '@/components/interfaces/RoleImpersonatimport { getKeys, useAPIKeysQuery } from '@/data/api-keys/api-keys-query'import { getTemporaryAPIKey } from '@/data/api-keys/temp-api-keys-query'import { useProjectPostgrestConfigQuery } from '@/data/config/project-postgrest-config-query'-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'-import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'+import { useStaticEffectEvent } from '@/hooks/useStaticEffectEvent'import { IS_PLATFORM } from '@/lib/constants'import { getRoleImpersonationJWT } from '@/lib/role-impersonation'+import { useTrack } from '@/lib/telemetry/track'import { useRoleImpersonationStateSnapshot } from '@/state/role-impersonation-state'interface RealtimeTokensPopoverProps {@@ -21,8 +20,6 @@ interface RealtimeTokensPopoverProps {}export const RealtimeTokensPopover = ({ config, onChangeConfig }: RealtimeTokensPopoverProps) => {- const { ref } = useParams()- const { data: org } = useSelectedOrganizationQuery()const snap = useRoleImpersonationStateSnapshot()const { can: canReadAPIKeys } = useAsyncCheckPermissions(PermissionAction.SECRETS_READ, '*')@@ -42,17 +39,17 @@ export const RealtimeTokensPopover = ({ config, onChangeConfig }: RealtimeTokensconst jwtSecret = postgrestConfig?.jwt_secret- const { mutate: sendEvent } = useSendEventMutation()+ const track = useTrack()+ const onRoleUpdated = useStaticEffectEvent(() => {+ track('realtime_inspector_database_role_updated')+ })// only send a telemetry event if the user changes the role. Don't send an event during initial render.const isMounted = useRef(false)useEffect(() => {if (isMounted.current) {- sendEvent({- action: 'realtime_inspector_database_role_updated',- groups: { project: ref ?? 'Unknown', organization: org?.slug ?? 'Unknown' },- })+ onRoleUpdated()}isMounted.current = true// eslint-disable-next-line react-hooks/exhaustive-depsdiff --git a/apps/studio/components/interfaces/Realtime/Inspector/index.tsx b/apps/studio/components/interfaces/Realtime/Inspector/index.tsxindex 85260981ac2..dc4c56c937f 100644--- a/apps/studio/components/interfaces/Realtime/Inspector/index.tsx+++ b/apps/studio/components/interfaces/Realtime/Inspector/index.tsx@@ -8,16 +8,14 @@ import { SendMessageModal } from './SendMessageModal'import { useRealtimeInspectorShortcuts } from './useRealtimeInspectorShortcuts'import { RealtimeConfig, useRealtimeMessages } from './useRealtimeMessages'import { useDatabasePublicationsQuery } from '@/data/database-publications/database-publications-query'-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'-import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'+import { useTrack } from '@/lib/telemetry/track'/*** Acts as a container component for the entire log display*/export const RealtimeInspector = () => {const { ref } = useParams()- const { data: org } = useSelectedOrganizationQuery()const { data: project } = useSelectedProjectQuery()// Check if realtime publications are available@@ -51,7 +49,7 @@ export const RealtimeInspector = () => {enableBroadcast: true,})- const { mutate: sendEvent } = useSendEventMutation()+ const track = useTrack()const { logData, sendMessage } = useRealtimeMessages(realtimeConfig, setRealtimeConfig)const hasChannel = realtimeConfig.channelName.length > 0@@ -116,10 +114,7 @@ export const RealtimeInspector = () => {visible={sendMessageShown}onSelectCancel={() => setSendMessageShown(false)}onSelectConfirm={(v) => {- sendEvent({- action: 'realtime_inspector_broadcast_sent',- groups: { project: ref ?? 'Unknown', organization: org?.slug ?? 'Unknown' },- })+ track('realtime_inspector_broadcast_sent')sendMessage(v.message, v.payload, () => setSendMessageShown(false))}}/>diff --git a/apps/studio/components/interfaces/Reports/GridResize.tsx b/apps/studio/components/interfaces/Reports/GridResize.tsxindex bd5be9a51bf..9e10769ae08 100644--- a/apps/studio/components/interfaces/Reports/GridResize.tsx+++ b/apps/studio/components/interfaces/Reports/GridResize.tsx@@ -16,10 +16,9 @@ import {UpsertContentPayload,useContentUpsertMutation,} from '@/data/content/content-upsert-mutation'-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'-import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'import { useProfile } from '@/lib/profile'+import { useTrack } from '@/lib/telemetry/track'import type { Dashboards } from '@/types'const ReactGridLayout = WidthProvider(RGL)@@ -56,9 +55,8 @@ export const GridResize = ({const { ref } = useParams()const { profile } = useProfile()const { data: project } = useSelectedProjectQuery()- const { data: selectedOrg } = useSelectedOrganizationQuery()- const { mutate: sendEvent } = useSendEventMutation()+ const track = useTrack()const { mutate: upsertContent } = useContentUpsertMutation()const onUpdateLayout = (layout: RGL.Layout[]) => {@@ -135,10 +133,7 @@ export const GridResize = ({},})- sendEvent({- action: 'custom_report_assistant_sql_block_added',- groups: { project: ref ?? 'Unknown', organization: selectedOrg?.slug ?? 'Unknown' },- })+ track('custom_report_assistant_sql_block_added')}if (!editableReport) return nulldiff --git a/apps/studio/components/interfaces/Reports/MetricOptions.tsx b/apps/studio/components/interfaces/Reports/MetricOptions.tsxindex 99196feaf52..2b94973b772 100644--- a/apps/studio/components/interfaces/Reports/MetricOptions.tsx+++ b/apps/studio/components/interfaces/Reports/MetricOptions.tsx@@ -21,11 +21,10 @@ import { BURSTABLE_IO_METRIC_KEYS, DEPRECATED_REPORTS } from './Reports.constantimport { hasBurstableIO } from '@/components/interfaces/DiskManagement/DiskManagement.utils'import { SIDEBAR_KEYS } from '@/components/layouts/ProjectLayout/LayoutSidebar/LayoutSidebarProvider'import { useContentQuery } from '@/data/content/content-query'-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'import { useIsFeatureEnabled } from '@/hooks/misc/useIsFeatureEnabled'-import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'import { Metric, METRIC_CATEGORIES, METRICS } from '@/lib/constants/metrics'+import { useTrack } from '@/lib/telemetry/track'import { editorPanelState } from '@/state/editor-panel-state'import { useSidebarManagerSnapshot } from '@/state/sidebar-manager-state'import type { Dashboards } from '@/types'@@ -43,7 +42,6 @@ interface MetricOptionsProps {export const MetricOptions = ({ config, handleChartSelection }: MetricOptionsProps) => {const { ref: projectRef } = useParams()- const { data: selectedOrganization } = useSelectedOrganizationQuery()const { data: project } = useSelectedProjectQuery()const { openSidebar } = useSidebarManagerSnapshot()const [search, setSearch] = useState('')@@ -61,7 +59,7 @@ export const MetricOptions = ({ config, handleChartSelection }: MetricOptionsProreturn true})- const { mutate: sendEvent } = useSendEventMutation()+ const track = useTrack()const debouncedSearch = useDebounce(search, 300)const {@@ -159,13 +157,7 @@ export const MetricOptions = ({ config, handleChartSelection }: MetricOptionsPro},isAddingChart: true,})- sendEvent({- action: 'custom_report_add_sql_block_clicked',- groups: {- project: projectRef ?? 'Unknown',- organization: selectedOrganization?.slug ?? 'Unknown',- },- })+ track('custom_report_add_sql_block_clicked')}}}>diff --git a/apps/studio/components/interfaces/Reports/Reports.tsx b/apps/studio/components/interfaces/Reports/Reports.tsxindex 7d327914d34..ea05dc5a7fe 100644--- a/apps/studio/components/interfaces/Reports/Reports.tsx+++ b/apps/studio/components/interfaces/Reports/Reports.tsx@@ -25,13 +25,12 @@ import {UpsertContentPayload,useContentUpsertMutation,} from '@/data/content/content-upsert-mutation'-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'-import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'import { Metric, TIME_PERIODS_REPORTS } from '@/lib/constants/metrics'import { uuidv4 } from '@/lib/helpers'import { useProfile } from '@/lib/profile'+import { useTrack } from '@/lib/telemetry/track'import { useDatabaseSelectorStateSnapshot } from '@/state/database-selector'import type { Dashboards } from '@/types'@@ -42,7 +41,6 @@ const Reports = () => {const { id: reportId, ref } = useParams()const { profile } = useProfile()const { data: project } = useSelectedProjectQuery()- const { data: selectedOrg } = useSelectedOrganizationQuery()const queryClient = useQueryClient()const state = useDatabaseSelectorStateSnapshot()@@ -70,7 +68,7 @@ const Reports = () => {if (vars.payload.type === 'report') toast.error(`Failed to update report: ${error.message}`)},})- const { mutate: sendEvent } = useSendEventMutation()+ const track = useTrack()const currentReport = userContents?.content.find((report) => report.id === reportId)const currentReportContent = currentReport?.content as Dashboards.Content@@ -343,10 +341,7 @@ const Reports = () => {},})- sendEvent({- action: 'custom_report_assistant_sql_block_added',- groups: { project: ref ?? 'Unknown', organization: selectedOrg?.slug ?? 'Unknown' },- })+ track('custom_report_assistant_sql_block_added')}useEffect(() => {diff --git a/apps/studio/components/interfaces/SQLEditor/SQLEditor.tsx b/apps/studio/components/interfaces/SQLEditor/SQLEditor.tsxindex 26d18d5b2ce..c30287d30f9 100644--- a/apps/studio/components/interfaces/SQLEditor/SQLEditor.tsx+++ b/apps/studio/components/interfaces/SQLEditor/SQLEditor.tsx@@ -72,7 +72,6 @@ import { constructHeaders, isValidConnString } from '@/data/fetchers'import { lintKeys } from '@/data/lint/keys'import { useReadReplicasQuery } from '@/data/read-replicas/replicas-query'import { useExecuteSqlMutation } from '@/data/sql/execute-sql-mutation'-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'import { isError } from '@/data/utils/error-check'import { useOrgAiOptInLevel } from '@/hooks/misc/useOrgOptedIntoAi'import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'@@ -83,6 +82,7 @@ import { formatSql } from '@/lib/formatSql'import { detectOS } from '@/lib/helpers'import { useProfile } from '@/lib/profile'import { wrapWithRoleImpersonation } from '@/lib/role-impersonation'+import { useTrack } from '@/lib/telemetry/track'import { useAiAssistantStateSnapshot } from '@/state/ai-assistant-state'import { useDatabaseSelectorStateSnapshot } from '@/state/database-selector'import {@@ -217,7 +217,7 @@ export const SQLEditor = () => {/* React query mutations */const { mutateAsync: generateSqlTitle } = useSqlTitleGenerateMutation()- const { mutate: sendEvent } = useSendEventMutation()+ const track = useTrack()const { mutate: execute, isPending: isExecuting } = useExecuteSqlMutation({onSuccess(data, vars) {if (id) {@@ -431,10 +431,7 @@ export const SQLEditor = () => {},})- sendEvent({- action: 'sql_editor_query_run_button_clicked',- groups: { project: ref ?? 'Unknown', organization: org?.slug ?? 'Unknown' },- })+ track('sql_editor_query_run_button_clicked')},// eslint-disable-next-line react-hooks/exhaustive-deps[@@ -451,6 +448,7 @@ export const SQLEditor = () => {databases,eventTriggers,limit,+ track,])@@ -638,11 +636,7 @@ export const SQLEditor = () => {])}- sendEvent({- action: 'assistant_sql_diff_handler_evaluated',- properties: { handlerAccepted: true },- groups: { project: ref ?? 'Unknown', organization: org?.slug ?? 'Unknown' },- })+ track('assistant_sql_diff_handler_evaluated', { handlerAccepted: true })setSelectedDiffType(DiffType.Modification)resetPrompt()@@ -651,17 +645,13 @@ export const SQLEditor = () => {setIsAcceptDiffLoading(false)}// eslint-disable-next-line react-hooks/exhaustive-deps- }, [sourceSqlDiff, selectedDiffType, handleNewQuery, generateSqlTitle, router, id, snapV2])+ }, [sourceSqlDiff, selectedDiffType, handleNewQuery, generateSqlTitle, router, id, snapV2, track])const discardAiHandler = useCallback(() => {- sendEvent({- action: 'assistant_sql_diff_handler_evaluated',- properties: { handlerAccepted: false },- groups: { project: ref ?? 'Unknown', organization: org?.slug ?? 'Unknown' },- })+ track('assistant_sql_diff_handler_evaluated', { handlerAccepted: false })resetPrompt()closeDiff()- }, [closeDiff, resetPrompt, sendEvent])+ }, [closeDiff, resetPrompt, track])const [isCompletionLoading, setIsCompletionLoading] = useState<boolean>(false)diff --git a/apps/studio/components/interfaces/SQLEditor/SQLTemplates/SQLExamples.tsx b/apps/studio/components/interfaces/SQLEditor/SQLTemplates/SQLExamples.tsxindex 0852f1575b9..c9ec290ad1b 100644--- a/apps/studio/components/interfaces/SQLEditor/SQLTemplates/SQLExamples.tsx+++ b/apps/studio/components/interfaces/SQLEditor/SQLTemplates/SQLExamples.tsx@@ -8,11 +8,10 @@ import { cn, SQL_ICON } from 'ui'import { createSqlSnippetSkeletonV2 } from '../SQLEditor.utils'import { SQL_TEMPLATES } from '@/components/interfaces/SQLEditor/SQLEditor.queries'import { ActionCard } from '@/components/layouts/Tabs/ActionCard'-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'-import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'import { useProfile } from '@/lib/profile'+import { useTrack } from '@/lib/telemetry/track'import { useSqlEditorV2StateSnapshot } from '@/state/sql-editor-v2'const SQLExamples = () => {@@ -20,10 +19,10 @@ const SQLExamples = () => {const { ref } = useParams()const { profile } = useProfile()const { data: project } = useSelectedProjectQuery()- const { data: org } = useSelectedOrganizationQuery()const [, quickStart] = partition(SQL_TEMPLATES, { type: 'template' })const snapV2 = useSqlEditorV2StateSnapshot()+ const track = useTrack()const { can: canCreateSQLSnippet } = useAsyncCheckPermissions(PermissionAction.CREATE,@@ -34,8 +33,6 @@ const SQLExamples = () => {})- const { mutate: sendEvent } = useSendEventMutation()-const handleNewQuery = async (sql: string, name: string) => {if (!ref) return console.error('Project ref is required')if (!project) return console.error('Project is required')@@ -79,11 +76,7 @@ const SQLExamples = () => {// sql={x.sql}onClick={() => {handleNewQuery(x.sql, x.title)- sendEvent({- action: 'sql_editor_quickstart_clicked',- properties: { quickstartName: x.title },- groups: { project: ref ?? 'Unknown', organization: org?.slug ?? 'Unknown' },- })+ track('sql_editor_quickstart_clicked', { quickstartName: x.title })}}/>))}diff --git a/apps/studio/components/interfaces/SQLEditor/SQLTemplates/SQLTemplates.tsx b/apps/studio/components/interfaces/SQLEditor/SQLTemplates/SQLTemplates.tsxindex 364c3841211..07f3d132460 100644--- a/apps/studio/components/interfaces/SQLEditor/SQLTemplates/SQLTemplates.tsx+++ b/apps/studio/components/interfaces/SQLEditor/SQLTemplates/SQLTemplates.tsx@@ -8,11 +8,10 @@ import { cn, SQL_ICON } from 'ui'import { createSqlSnippetSkeletonV2 } from '../SQLEditor.utils'import { SQL_TEMPLATES } from '@/components/interfaces/SQLEditor/SQLEditor.queries'import { ActionCard } from '@/components/layouts/Tabs/ActionCard'-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'-import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'import { useProfile } from '@/lib/profile'+import { useTrack } from '@/lib/telemetry/track'import { useSqlEditorV2StateSnapshot } from '@/state/sql-editor-v2'const SQLTemplates = () => {@@ -20,10 +19,10 @@ const SQLTemplates = () => {const { ref } = useParams()const { profile } = useProfile()const { data: project } = useSelectedProjectQuery()- const { data: org } = useSelectedOrganizationQuery()const [sql] = partition(SQL_TEMPLATES, { type: 'template' })const snapV2 = useSqlEditorV2StateSnapshot()+ const track = useTrack()const { can: canCreateSQLSnippet } = useAsyncCheckPermissions(PermissionAction.CREATE,@@ -34,8 +33,6 @@ const SQLTemplates = () => {})- const { mutate: sendEvent } = useSendEventMutation()-const handleNewQuery = async (sql: string, name: string) => {if (!ref) return console.error('Project ref is required')if (!project) return console.error('Project is required')@@ -78,11 +75,7 @@ const SQLTemplates = () => {icon={<SQL_ICON className={cn('fill-foreground', 'w-4 h-4')} strokeWidth={1.5} />}onClick={() => {handleNewQuery(x.sql, x.title)- sendEvent({- action: 'sql_editor_template_clicked',- properties: { templateName: x.title },- groups: { project: ref ?? 'Unknown', organization: org?.slug ?? 'Unknown' },- })+ track('sql_editor_template_clicked', { templateName: x.title })}}/>))}diff --git a/apps/studio/components/interfaces/SQLEditor/UtilityPanel/UtilityPanel.tsx b/apps/studio/components/interfaces/SQLEditor/UtilityPanel/UtilityPanel.tsxindex 395603c3c7d..2f164cc9142 100644--- a/apps/studio/components/interfaces/SQLEditor/UtilityPanel/UtilityPanel.tsx+++ b/apps/studio/components/interfaces/SQLEditor/UtilityPanel/UtilityPanel.tsx@@ -9,8 +9,7 @@ import { UtilityTabResults } from './UtilityTabResults'import { DownloadResultsButton } from '@/components/ui/DownloadResultsButton'import { useContentUpsertMutation } from '@/data/content/content-upsert-mutation'import { Snippet } from '@/data/content/sql-folders-query'-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'-import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'+import { useTrack } from '@/lib/telemetry/track'import { useSqlEditorV2StateSnapshot } from '@/state/sql-editor-v2'export type UtilityPanelProps = {@@ -54,7 +53,7 @@ export const UtilityPanel = ({onActiveTabChange,}: UtilityPanelProps) => {const { ref } = useParams()- const { data: org } = useSelectedOrganizationQuery()+ const track = useTrack()const snapV2 = useSqlEditorV2StateSnapshot()const snippet = snapV2.snippets[id]?.snippet@@ -68,8 +67,6 @@ export const UtilityPanel = ({onActiveTabChange?.(tab)}- const { mutate: sendEvent } = useSendEventMutation()-const { mutate: upsertContent } = useContentUpsertMutation({invalidateQueriesOnSuccess: false,// Optimistic update to the cache@@ -151,30 +148,10 @@ export const UtilityPanel = ({type="text"results={result.rows as any[]}fileName={`Supabase Snippet ${snippet.name}`}- onDownloadAsCSV={() =>- sendEvent({- action: 'sql_editor_result_download_csv_clicked',- groups: { project: ref ?? '', organization: org?.slug ?? '' },- })- }- onCopyAsMarkdown={() => {- sendEvent({- action: 'sql_editor_result_copy_markdown_clicked',- groups: { project: ref ?? '', organization: org?.slug ?? '' },- })- }}- onCopyAsJSON={() => {- sendEvent({- action: 'sql_editor_result_copy_json_clicked',- groups: { project: ref ?? '', organization: org?.slug ?? '' },- })- }}- onCopyAsCSV={() => {- sendEvent({- action: 'sql_editor_result_copy_csv_clicked',- groups: { project: ref ?? '', organization: org?.slug ?? '' },- })- }}+ onDownloadAsCSV={() => track('sql_editor_result_download_csv_clicked')}+ onCopyAsMarkdown={() => track('sql_editor_result_copy_markdown_clicked')}+ onCopyAsJSON={() => track('sql_editor_result_copy_json_clicked')}+ onCopyAsCSV={() => track('sql_editor_result_copy_csv_clicked')}/>)}</div>diff --git a/apps/studio/components/interfaces/SignIn/SignInForm.tsx b/apps/studio/components/interfaces/SignIn/SignInForm.tsxindex 80c62609c54..ee860f4d3df 100644--- a/apps/studio/components/interfaces/SignIn/SignInForm.tsx+++ b/apps/studio/components/interfaces/SignIn/SignInForm.tsx@@ -15,10 +15,10 @@ import z from 'zod'import { LastSignInWrapper } from './LastSignInWrapper'import { useAddLoginEvent } from '@/data/misc/audit-login-mutation'import { getMfaAuthenticatorAssuranceLevel } from '@/data/profile/mfa-authenticator-assurance-level-query'-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'import { useLastSignIn } from '@/hooks/misc/useLastSignIn'import { captureCriticalError } from '@/lib/error-reporting'import { auth, buildPathWithParams, getReturnToPath } from '@/lib/gotrue'+import { useTrack } from '@/lib/telemetry/track'const schema = z.object({email: z.string().min(1, 'Email is required').email('Must be a valid email'),@@ -48,7 +48,7 @@ export const SignInForm = () => {setReturnTo(getReturnToPath())}, [])- const { mutate: sendEvent } = useSendEventMutation()+ const track = useTrack()const { mutate: addLoginEvent } = useAddLoginEvent()let forgotPasswordUrl = `/forgot-password`@@ -86,10 +86,7 @@ export const SignInForm = () => {}toast.success(`Signed in successfully!`, { id: toastId })- sendEvent({- action: 'sign_in',- properties: { category: 'account', method: 'email' },- })+ track('sign_in', { category: 'account', method: 'email' })addLoginEvent({})await queryClient.resetQueries()diff --git a/apps/studio/components/interfaces/Storage/AnalyticsBuckets/CreateAnalyticsBucketForm.tsx b/apps/studio/components/interfaces/Storage/AnalyticsBuckets/CreateAnalyticsBucketForm.tsxindex 445e0216e2f..c426ba7743d 100644--- a/apps/studio/components/interfaces/Storage/AnalyticsBuckets/CreateAnalyticsBucketForm.tsx+++ b/apps/studio/components/interfaces/Storage/AnalyticsBuckets/CreateAnalyticsBucketForm.tsx@@ -29,10 +29,9 @@ import { useDatabaseExtensionEnableMutation } from '@/data/database-extensions/dimport { useAnalyticsBucketCreateMutation } from '@/data/storage/analytics-bucket-create-mutation'import { useAnalyticsBucketsQuery } from '@/data/storage/analytics-buckets-query'import { useIcebergWrapperCreateMutation } from '@/data/storage/iceberg-wrapper-create-mutation'-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'-import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'import { DOCS_URL } from '@/lib/constants'+import { useTrack } from '@/lib/telemetry/track'const FormSchema = z.object({@@ -119,7 +118,6 @@ export const CreateAnalyticsBucketForm = ({onOpenChange,}: CreateAnalyticsBucketFormProps) => {const { ref } = useParams()- const { data: org } = useSelectedOrganizationQuery()const { data: project } = useSelectedProjectQuery()const { extension: wrappersExtension, state: wrappersExtensionState } =useIcebergWrapperExtension()@@ -127,7 +125,7 @@ export const CreateAnalyticsBucketForm = ({const { data: buckets = [] } = useAnalyticsBucketsQuery({ projectRef: ref })const wrappersExtensionNeedsUpgrading = wrappersExtensionState === 'needs-upgrade'- const { mutate: sendEvent } = useSendEventMutation()+ const track = useTrack()const { mutateAsync: createAnalyticsBucket, isPending: isCreatingAnalyticsBucket } =useAnalyticsBucketCreateMutation({@@ -174,11 +172,7 @@ export const CreateAnalyticsBucketForm = ({await createIcebergWrapper({ bucketName: values.name })- sendEvent({- action: 'storage_bucket_created',- properties: { bucketType: 'analytics' },- groups: { project: ref ?? 'Unknown', organization: org?.slug ?? 'Unknown' },- })+ track('storage_bucket_created', { bucketType: 'analytics' })form.reset()toast.success(`Created bucket “${values.name}”`)diff --git a/apps/studio/components/interfaces/Storage/CreateBucketModal.tsx b/apps/studio/components/interfaces/Storage/CreateBucketModal.tsxindex c45aa113503..ad4a40a72f3 100644--- a/apps/studio/components/interfaces/Storage/CreateBucketModal.tsx+++ b/apps/studio/components/interfaces/Storage/CreateBucketModal.tsx@@ -34,9 +34,8 @@ import { StorageSizeUnits } from '@/components/interfaces/Storage/StorageSettingimport { InlineLink } from '@/components/ui/InlineLink'import { useProjectStorageConfigQuery } from '@/data/config/project-storage-config-query'import { useBucketCreateMutation } from '@/data/storage/bucket-create-mutation'-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'-import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'import { IS_PLATFORM } from '@/lib/constants'+import { useTrack } from '@/lib/telemetry/track'const FormSchema = z.object({@@ -85,8 +84,6 @@ interface CreateBucketModalProps {export const CreateBucketModal = ({ open, onOpenChange }: CreateBucketModalProps) => {const { ref } = useParams()- const { data: org } = useSelectedOrganizationQuery()-const [selectedUnit, setSelectedUnit] = useState<string>(StorageSizeUnits.MB)const [hasAllowedMimeTypes, setHasAllowedMimeTypes] = useState(false)@@ -94,7 +91,7 @@ export const CreateBucketModal = ({ open, onOpenChange }: CreateBucketModalPropsconst { value, unit } = convertFromBytes(data?.fileSizeLimit ?? 0)const formattedGlobalUploadLimit = `${value} ${unit}`- const { mutate: sendEvent } = useSendEventMutation()+ const track = useTrack()const { mutateAsync: createBucket, isPending: isCreatingBucket } = useBucketCreateMutation({// [Joshen] Silencing the error here as it's being handled in onSubmitonError: () => {},@@ -144,11 +141,7 @@ export const CreateBucketModal = ({ open, onOpenChange }: CreateBucketModalPropsfile_size_limit: fileSizeLimit,allowed_mime_types: allowedMimeTypes,})- sendEvent({- action: 'storage_bucket_created',- properties: { bucketType: 'STANDARD' },- groups: { project: ref ?? 'Unknown', organization: org?.slug ?? 'Unknown' },- })+ track('storage_bucket_created', { bucketType: 'STANDARD' })toast.success(`Successfully created bucket ${values.name}`)form.reset()diff --git a/apps/studio/components/interfaces/Storage/VectorBuckets/CreateVectorBucketDialog.tsx b/apps/studio/components/interfaces/Storage/VectorBuckets/CreateVectorBucketDialog.tsxindex 12ea5714826..c3099f00e31 100644--- a/apps/studio/components/interfaces/Storage/VectorBuckets/CreateVectorBucketDialog.tsx+++ b/apps/studio/components/interfaces/Storage/VectorBuckets/CreateVectorBucketDialog.tsx@@ -28,10 +28,9 @@ import { useDatabaseExtensionEnableMutation } from '@/data/database-extensions/dimport { useS3VectorsWrapperCreateMutation } from '@/data/storage/s3-vectors-wrapper-create-mutation'import { useVectorBucketCreateMutation } from '@/data/storage/vector-bucket-create-mutation'import { useVectorBucketsQuery } from '@/data/storage/vector-buckets-query'-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'-import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'import { DOCS_URL } from '@/lib/constants'+import { useTrack } from '@/lib/telemetry/track'const FormSchema = z.object({name: z@@ -89,7 +88,6 @@ export const CreateVectorBucketDialog = ({setVisible: (visible: boolean) => void}) => {const { ref } = useParams()- const { data: org } = useSelectedOrganizationQuery()const { data: project } = useSelectedProjectQuery()const [isLoading, setIsLoading] = useState(false)@@ -100,7 +98,7 @@ export const CreateVectorBucketDialog = ({defaultValues: { name: '' },})- const { mutate: sendEvent } = useSendEventMutation()+ const track = useTrack()const { mutateAsync: createVectorBucket } = useVectorBucketCreateMutation({onError: () => {},})@@ -150,11 +148,7 @@ export const CreateVectorBucketDialog = ({}setIsLoading(false)- sendEvent({- action: 'storage_bucket_created',- properties: { bucketType: 'vector' },- groups: { project: ref ?? 'Unknown', organization: org?.slug ?? 'Unknown' },- })+ track('storage_bucket_created', { bucketType: 'vector' })toast.success(`Successfully created vector bucket ${values.name}`)form.reset()setVisible(false)diff --git a/apps/studio/components/interfaces/Support/AIAssistantOption.tsx b/apps/studio/components/interfaces/Support/AIAssistantOption.tsxindex a8b11ed3fc6..0557e1b0790 100644--- a/apps/studio/components/interfaces/Support/AIAssistantOption.tsx+++ b/apps/studio/components/interfaces/Support/AIAssistantOption.tsx@@ -5,7 +5,7 @@ import { useCallback, useEffect, useState } from 'react'import { AiIconAnimation, Button } from 'ui'import { NO_ORG_MARKER, NO_PROJECT_MARKER } from './SupportForm.utils'-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'+import { useTrack } from '@/lib/telemetry/track'interface AIAssistantOptionProps {projectRef?: string | null@@ -18,7 +18,7 @@ export const AIAssistantOption = ({organizationSlug,onClick,}: AIAssistantOptionProps) => {- const { mutate: sendEvent } = useSendEventMutation()+ const track = useTrack()const [isVisible, setIsVisible] = useState(false)useEffect(() => {@@ -27,19 +27,16 @@ export const AIAssistantOption = ({}, [])const onAiAssistantClicked = useCallback(() => {- sendEvent({- action: 'ai_assistant_in_support_form_clicked',- groups: {- project: projectRef === null || projectRef === NO_PROJECT_MARKER ? undefined : projectRef,- organization:- organizationSlug === null || organizationSlug === NO_ORG_MARKER- ? undefined- : organizationSlug,- },+ track('ai_assistant_in_support_form_clicked', undefined, {+ project: projectRef === null || projectRef === NO_PROJECT_MARKER ? undefined : projectRef,+ organization:+ organizationSlug === null || organizationSlug === NO_ORG_MARKER+ ? undefined+ : organizationSlug,})onClick?.()- }, [onClick, projectRef, organizationSlug, sendEvent])+ }, [onClick, projectRef, organizationSlug, track])// If no specific project selected, use the wildcard routeconst aiLink = `/project/${projectRef !== NO_PROJECT_MARKER ? projectRef : '_'}?sidebar=ai-assistant&slug=${organizationSlug}`diff --git a/apps/studio/components/interfaces/Support/SupportFormPage.tsx b/apps/studio/components/interfaces/Support/SupportFormPage.tsxindex 0606331122d..0f675c3f165 100644--- a/apps/studio/components/interfaces/Support/SupportFormPage.tsx+++ b/apps/studio/components/interfaces/Support/SupportFormPage.tsx@@ -25,14 +25,14 @@ import { SupportFormV2 } from './SupportFormV2'import { useSupportForm } from './useSupportForm'import CopyButton from '@/components/ui/CopyButton'import { useIncidentStatusQuery } from '@/data/platform/incident-status-query'-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'import { useStateTransition } from '@/hooks/misc/useStateTransition'import { BASE_PATH, DOCS_URL } from '@/lib/constants'+import { useTrack } from '@/lib/telemetry/track'export { SupportForm, SupportFormStatusButton } from './SupportSidebarForm'function useSupportFormTelemetry() {- const { mutate: sendEvent } = useSendEventMutation()+ const track = useTrack()return useCallback(({@@ -44,17 +44,12 @@ function useSupportFormTelemetry() {orgSlug: string | undefinedcategory: ExtendedSupportCategories}) =>- sendEvent({- action: 'support_ticket_submitted',- properties: {- ticketCategory: category,- },- groups: {- project: projectRef,- organization: orgSlug,- },- }),- [sendEvent]+ track(+ 'support_ticket_submitted',+ { ticketCategory: category },+ { project: projectRef, organization: orgSlug }+ ),+ [track])}diff --git a/apps/studio/components/interfaces/Support/SupportSidebarForm.tsx b/apps/studio/components/interfaces/Support/SupportSidebarForm.tsxindex 2c9d06c374c..40b0288d6ea 100644--- a/apps/studio/components/interfaces/Support/SupportSidebarForm.tsx+++ b/apps/studio/components/interfaces/Support/SupportSidebarForm.tsx@@ -15,11 +15,11 @@ import { NO_PROJECT_MARKER, type SupportFormUrlKeys } from './SupportForm.utils'import { SupportFormV3 } from './SupportFormV3'import { useSupportForm } from './useSupportForm'import { useIncidentStatusQuery } from '@/data/platform/incident-status-query'-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'import { useStateTransition } from '@/hooks/misc/useStateTransition'+import { useTrack } from '@/lib/telemetry/track'function useSupportFormTelemetry() {- const { mutate: sendEvent } = useSendEventMutation()+ const track = useTrack()return useCallback(({@@ -31,17 +31,12 @@ function useSupportFormTelemetry() {orgSlug: string | undefinedcategory: ExtendedSupportCategories}) =>- sendEvent({- action: 'support_ticket_submitted',- properties: {- ticketCategory: category,- },- groups: {- project: projectRef,- organization: orgSlug,- },- }),- [sendEvent]+ track(+ 'support_ticket_submitted',+ { ticketCategory: category },+ { project: projectRef, organization: orgSlug }+ ),+ [track])}diff --git a/apps/studio/components/interfaces/TableGridEditor/GridHeaderActions.tsx b/apps/studio/components/interfaces/TableGridEditor/GridHeaderActions.tsxindex 08ddcd03b6c..d9f84636c5d 100644--- a/apps/studio/components/interfaces/TableGridEditor/GridHeaderActions.tsx+++ b/apps/studio/components/interfaces/TableGridEditor/GridHeaderActions.tsx@@ -1,5 +1,4 @@import { PermissionAction } from '@supabase/shared-types/out/constants'-import { useParams } from 'common'import { Realtime } from 'icons'import { BookOpenText, Lightbulb, Lock, MoreVertical, PlusCircle, Unlock } from 'lucide-react'import Link from 'next/link'@@ -47,10 +46,8 @@ import {isView as isTableLikeView,} from '@/data/table-editor/table-editor-types'import { useTableUpdateMutation } from '@/data/tables/table-update-mutation'-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'import { useIsFeatureEnabled } from '@/hooks/misc/useIsFeatureEnabled'-import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'import { useIsProtectedSchema } from '@/hooks/useProtectedSchemas'import { DOCS_URL } from '@/lib/constants'@@ -64,12 +61,9 @@ export interface GridHeaderActionsProps {}export const GridHeaderActions = ({ table, isRefetching }: GridHeaderActionsProps) => {const track = useTrack()- const { ref } = useParams()const appSnap = useAppStateSnapshot()const snap = useTableEditorTableStateSnapshot()const { data: project } = useSelectedProjectQuery()- const { data: org } = useSelectedOrganizationQuery()- const { mutate: sendEvent } = useSendEventMutation()const [rlsConfirmModalOpen, setRlsConfirmModalOpen] = useState(false)const [realtimeDialogOpen, setRealtimeDialogOpen] = useState(false)@@ -156,16 +150,7 @@ export const GridHeaderActions = ({ table, isRefetching }: GridHeaderActionsPropappSnap.setActiveDocsSection(['entities', table.name])appSnap.setShowProjectApiDocs(true)- sendEvent({- action: 'api_docs_opened',- properties: {- source: 'table_editor',- },- groups: {- project: ref ?? 'Unknown',- organization: org?.slug ?? 'Unknown',- },- })+ track('api_docs_opened', { source: 'table_editor' })}const onToggleRLS = async () => {diff --git a/apps/studio/components/interfaces/TableGridEditor/InsertButton.tsx b/apps/studio/components/interfaces/TableGridEditor/InsertButton.tsxindex ca1451a062d..5f1b8545c9a 100644--- a/apps/studio/components/interfaces/TableGridEditor/InsertButton.tsx+++ b/apps/studio/components/interfaces/TableGridEditor/InsertButton.tsx@@ -1,5 +1,4 @@import { PermissionAction } from '@supabase/shared-types/out/constants'-import { useParams } from 'common'import { ArrowUp, ChevronDown, FileText } from 'lucide-react'import {Button,@@ -11,17 +10,15 @@ import {} from 'ui'import { ShortcutBadge } from '@/components/ui/ShortcutBadge'-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'-import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'+import { useTrack } from '@/lib/telemetry/track'import { SHORTCUT_IDS } from '@/state/shortcuts/registry'import { useShortcut } from '@/state/shortcuts/useShortcut'import { useTableEditorStateSnapshot } from '@/state/table-editor'import { useTableEditorTableStateSnapshot } from '@/state/table-editor-table'export const InsertButton = () => {- const { ref: projectRef } = useParams()- const { data: org } = useSelectedOrganizationQuery()+ const track = useTrack()const snap = useTableEditorTableStateSnapshot()const tableEditorSnap = useTableEditorStateSnapshot()@@ -29,7 +26,6 @@ export const InsertButton = () => {PermissionAction.TENANT_SQL_ADMIN_WRITE,'columns')- const { mutate: sendEvent } = useSendEventMutation()const onAddRow =snap.editable && (snap.table.columns ?? []).length > 0 ? tableEditorSnap.onAddRow : undefined@@ -120,14 +116,7 @@ export const InsertButton = () => {className="group gap-x-3"onClick={() => {onImportData()- sendEvent({- action: 'import_data_button_clicked',- properties: { tableType: 'Existing Table' },- groups: {- project: projectRef ?? 'Unknown',- organization: org?.slug ?? 'Unknown',- },- })+ track('import_data_button_clicked', { tableType: 'Existing Table' })}}><div className="relative shrink-0 w-4">diff --git a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/SidePanelEditor.tsx b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/SidePanelEditor.tsxindex 20e232c1bb5..758dc85397e 100644--- a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/SidePanelEditor.tsx+++ b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/SidePanelEditor.tsx@@ -59,7 +59,6 @@ import { tableRowKeys } from '@/data/table-rows/keys'import { tableKeys } from '@/data/tables/keys'import { RetrieveTableResult } from '@/data/tables/table-retrieve-query'import { getTables } from '@/data/tables/tables-query'-import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'import { useConfirmOnClose } from '@/hooks/ui/useConfirmOnClose'import { useUrlState } from '@/hooks/ui/useUrlState'@@ -196,7 +195,6 @@ export const SidePanelEditor = ({const track = useTrack()const queryClient = useQueryClient()const { data: project } = useSelectedProjectQuery()- const { data: org } = useSelectedOrganizationQuery()const isQueueOperationsEnabled = useIsQueueOperationsEnabled()const { updateRow, addRow, isEditPending } = useTableRowOperations()@@ -684,9 +682,9 @@ export const SidePanelEditor = ({foreignKeyRelations,isRLSEnabled,importContent,- organizationSlug: org?.slug,generatedPolicies: acceptedPolicies,onCreatePoliciesSuccess: () => track('rls_generated_policies_created'),+ track,})createTableSpan.setAttribute('table.created', 1)@@ -806,7 +804,7 @@ export const SidePanelEditor = ({foreignKeyRelations,existingForeignKeyRelations,primaryKey,- organizationSlug: org?.slug,+ track,})if (table === undefined) {diff --git a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/SidePanelEditor.utils.createTable.test.ts b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/SidePanelEditor.utils.createTable.test.tsindex d176426ab09..c5732f8fd46 100644--- a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/SidePanelEditor.utils.createTable.test.ts+++ b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/SidePanelEditor.utils.createTable.test.ts@@ -8,7 +8,7 @@ import { createTable } from './SidePanelEditor.utils'// Define mock functions at module levelconst mockExecuteSql = vi.fn()const mockGetTable = vi.fn()-const mockSendEvent = vi.fn()+const mockTrack = vi.fn()const mockPrefetchEditorTablePage = vi.fn()const mockToastLoading = vi.fn()const mockToastSuccess = vi.fn()@@ -31,10 +31,6 @@ vi.mock('@/data/tables/table-retrieve-query', () => ({getTableQuery: (...args: unknown[]) => mockGetTable(...args),}))-vi.mock('@/data/telemetry/send-event-mutation', () => ({- sendEvent: (...args: unknown[]) => mockSendEvent(...args),-}))-vi.mock('@/data/prefetchers/project.$ref.editor.$id', () => ({prefetchEditorTablePage: (...args: unknown[]) => mockPrefetchEditorTablePage(...args),}))@@ -99,7 +95,7 @@ describe('createTable', () => {// Default mock implementationsmockExecuteSql.mockResolvedValue({ result: [] })mockGetTable.mockResolvedValue(mockTableResult)- mockSendEvent.mockResolvedValue({})+ mockTrack.mockReset()mockPrefetchEditorTablePage.mockResolvedValue(undefined)mockFetchQuery.mockImplementation(({ queryFn }) => {if (queryFn) {@@ -118,6 +114,7 @@ describe('createTable', () => {columns: [],foreignKeyRelations: [],isRLSEnabled: false,+ track: mockTrack,})expect(mockExecuteSql).toHaveBeenCalledTimes(1)@@ -134,20 +131,11 @@ describe('createTable', () => {id: toastId,})- // Should track table creation event- expect(mockSendEvent).toHaveBeenCalledWith({- event: {- action: 'table_created',- properties: {- has_generated_policies: false,- method: 'table_editor',- schema_name: 'public',- table_name: 'test_table',- },- groups: {- project: projectRef,- },- },+ expect(mockTrack).toHaveBeenCalledWith('table_created', {+ has_generated_policies: false,+ method: 'table_editor',+ schema_name: 'public',+ table_name: 'test_table',})// Should prefetch the editor table page@@ -174,23 +162,16 @@ describe('createTable', () => {columns: [],foreignKeyRelations: [],isRLSEnabled: true,+ track: mockTrack,})const sqlCall = mockExecuteSql.mock.calls[0][0]expect(sqlCall.sql).toContain('ENABLE ROW LEVEL SECURITY')- expect(mockSendEvent).toHaveBeenCalledWith({- event: {- action: 'table_rls_enabled',- properties: {- method: 'table_editor',- schema_name: 'public',- table_name: 'test_table',- },- groups: {- project: projectRef,- },- },+ expect(mockTrack).toHaveBeenCalledWith('table_rls_enabled', {+ method: 'table_editor',+ schema_name: 'public',+ table_name: 'test_table',})})@@ -220,6 +201,7 @@ describe('createTable', () => {columns,foreignKeyRelations: [],isRLSEnabled: false,+ track: mockTrack,})const sqlCall = mockExecuteSql.mock.calls[0][0]@@ -255,6 +237,7 @@ describe('createTable', () => {columns,foreignKeyRelations: [],isRLSEnabled: false,+ track: mockTrack,})const sqlCall = mockExecuteSql.mock.calls[0][0]@@ -299,6 +282,7 @@ describe('createTable', () => {columns,foreignKeyRelations,isRLSEnabled: false,+ track: mockTrack,})const sqlCall = mockExecuteSql.mock.calls[0][0]@@ -308,67 +292,6 @@ describe('createTable', () => {expect(sqlCall.sql).toContain('ON DELETE CASCADE')})- it('should include organization slug in telemetry when provided', async () => {- const organizationSlug = 'test-org'-- await createTable({- projectRef,- connectionString,- toastId,- payload: basePayload,- columns: [],- foreignKeyRelations: [],- isRLSEnabled: true,- organizationSlug,- })-- expect(mockSendEvent).toHaveBeenCalledWith({- event: expect.objectContaining({- action: 'table_created',- groups: {- project: projectRef,- organization: organizationSlug,- },- }),- })-- expect(mockSendEvent).toHaveBeenCalledWith({- event: expect.objectContaining({- action: 'table_rls_enabled',- groups: {- project: projectRef,- organization: organizationSlug,- },- }),- })- })-- it('should handle telemetry errors gracefully', async () => {- const consoleErrorSpy = vi.spyOn(console, 'error').mockImplementation(() => {})- mockSendEvent.mockRejectedValue(new Error('Telemetry failed'))-- const result = await createTable({- projectRef,- connectionString,- toastId,- payload: basePayload,- columns: [],- foreignKeyRelations: [],- isRLSEnabled: false,- })-- expect(result).toStrictEqual({- failedPolicies: [],- table: mockTableResult,- })- expect(consoleErrorSpy).toHaveBeenCalledWith(- 'Failed to track table creation event:',- expect.any(Error)- )-- consoleErrorSpy.mockRestore()- })-it('should create a table with nullable connectionString', async () => {await createTable({projectRef,@@ -378,6 +301,7 @@ describe('createTable', () => {columns: [],foreignKeyRelations: [],isRLSEnabled: false,+ track: mockTrack,})expect(mockExecuteSql).toHaveBeenCalledWith(@@ -405,6 +329,7 @@ describe('createTable', () => {columns,foreignKeyRelations: [],isRLSEnabled: false,+ track: mockTrack,})expect(mockExecuteSql).toHaveBeenCalledTimes(1)@@ -427,6 +352,7 @@ describe('createTable', () => {columns,foreignKeyRelations: [],isRLSEnabled: false,+ track: mockTrack,})expect(mockExecuteSql).toHaveBeenCalledTimes(1)@@ -448,6 +374,7 @@ describe('createTable', () => {columns,foreignKeyRelations: [],isRLSEnabled: false,+ track: mockTrack,})expect(mockExecuteSql).toHaveBeenCalledTimes(1)@@ -471,6 +398,7 @@ describe('createTable', () => {columns,foreignKeyRelations: [],isRLSEnabled: false,+ track: mockTrack,})expect(mockExecuteSql).toHaveBeenCalledTimes(1)@@ -488,6 +416,7 @@ describe('createTable', () => {columns: [],foreignKeyRelations: [],isRLSEnabled: false,+ track: mockTrack,})).rejects.toThrow('SQL execution failed')})@@ -507,17 +436,15 @@ describe('createTable', () => {columns: [],foreignKeyRelations: [],isRLSEnabled: false,+ track: mockTrack,})const sqlCall = mockExecuteSql.mock.calls[0][0]expect(sqlCall.sql).toMatch(/private\.custom_table|"private"\."custom_table"/)- expect(mockSendEvent).toHaveBeenCalledWith({- event: expect.objectContaining({- properties: expect.objectContaining({- schema_name: 'private',- }),- }),- })+ expect(mockTrack).toHaveBeenCalledWith(+ 'table_created',+ expect.objectContaining({ schema_name: 'private' })+ )})})diff --git a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/SidePanelEditor.utils.tsx b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/SidePanelEditor.utils.tsxindex 307e83c66af..f45fb92b94e 100644--- a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/SidePanelEditor.utils.tsx+++ b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/SidePanelEditor.utils.tsx@@ -51,15 +51,17 @@ import {updateTable as updateTableMutation,} from '@/data/tables/table-update-mutation'import { getTables } from '@/data/tables/tables-query'-import { sendEvent } from '@/data/telemetry/send-event-mutation'import { isObject, isObjectContainingKeys, timeout, tryParseJson } from '@/lib/helpers'import type { SafePostgresColumn } from '@/lib/postgres-types'+import type { useTrack } from '@/lib/telemetry/track'import type { DeepReadonly } from '@/lib/type-helpers'import type { SidePanel } from '@/state/table-editor'const BATCH_SIZE = 1000const CHUNK_SIZE = 1024 * 1024 * 0.1 // 0.1MB+type Track = ReturnType<typeof useTrack>+/*** Extracts the row data from the current side panel state.* Used when queuing cell edit operations to get the row being edited.@@ -441,9 +443,9 @@ export const createTable = async ({foreignKeyRelations,isRLSEnabled,importContent,- organizationSlug,generatedPolicies = [],onCreatePoliciesSuccess,+ track,}: {projectRef: stringconnectionString?: string | null@@ -457,9 +459,9 @@ export const createTable = async ({foreignKeyRelations: ForeignKey[]isRLSEnabled: booleanimportContent?: ImportContent- organizationSlug?: stringgeneratedPolicies?: AcceptedGeneratedPolicy[]onCreatePoliciesSuccess?: () => void+ track: Track}) => {const queryClient = getQueryClient()@@ -583,42 +585,18 @@ export const createTable = async ({)}- // Track table creation event (fire-and-forget to avoid blocking)- sendEvent({- event: {- action: 'table_created',- properties: {- method: 'table_editor',- schema_name: payload.schema,- table_name: payload.name,- has_generated_policies: generatedPolicies.length > 0 && isRLSEnabled,- },- groups: {- project: projectRef,- ...(organizationSlug && { organization: organizationSlug }),- },- },- }).catch((error) => {- console.error('Failed to track table creation event:', error)+ track('table_created', {+ method: 'table_editor',+ schema_name: payload.schema,+ table_name: payload.name,+ has_generated_policies: generatedPolicies.length > 0 && isRLSEnabled,})- // Track RLS enablement event if enabled (fire-and-forget)if (isRLSEnabled) {- sendEvent({- event: {- action: 'table_rls_enabled',- properties: {- method: 'table_editor',- schema_name: payload.schema,- table_name: payload.name,- },- groups: {- project: projectRef,- ...(organizationSlug && { organization: organizationSlug }),- },- },- }).catch((error) => {- console.error('Failed to track RLS enablement event:', error)+ track('table_rls_enabled', {+ method: 'table_editor',+ schema_name: payload.schema,+ table_name: payload.name,})}@@ -762,7 +740,7 @@ export const updateTable = async ({foreignKeyRelations,existingForeignKeyRelations,primaryKey,- organizationSlug,+ track,}: {projectRef: stringconnectionString?: string | null@@ -773,7 +751,7 @@ export const updateTable = async ({foreignKeyRelations: ForeignKey[]existingForeignKeyRelations: ForeignKeyConstraint[]primaryKey?: Constraint- organizationSlug?: string+ track: Track}) => {const queryClient = getQueryClient()@@ -805,26 +783,12 @@ export const updateTable = async ({})}- // Track RLS enablement if it's being turned onif (payload.rls_enabled === true) {- try {- await sendEvent({- event: {- action: 'table_rls_enabled',- properties: {- method: 'table_editor',- schema_name: table.schema,- table_name: payload.name ?? table.name,- },- groups: {- project: projectRef,- ...(organizationSlug && { organization: organizationSlug }),- },- },- })- } catch (error) {- console.error('Failed to track RLS enablement event:', error)- }+ track('table_rls_enabled', {+ method: 'table_editor',+ schema_name: table.schema,+ table_name: payload.name ?? table.name,+ })}const updatedTable = await queryClient.fetchQuery({diff --git a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/SpreadsheetImport/SpreadsheetImport.tsx b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/SpreadsheetImport/SpreadsheetImport.tsxindex 52209e481ac..bd8894b58c4 100644--- a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/SpreadsheetImport/SpreadsheetImport.tsx+++ b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/SpreadsheetImport/SpreadsheetImport.tsx@@ -1,5 +1,4 @@import type { PGTable } from '@supabase/pg-meta'-import { useParams } from 'common'import { noop } from 'lodash'import { useCallback, type ChangeEvent, type DragEvent } from 'react'import { toast } from 'sonner'@@ -20,8 +19,7 @@ import {isParsingState,useSpreadsheetImport,} from './useSpreadsheetImport'-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'-import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'+import { useTrack } from '@/lib/telemetry/track'interface SpreadsheetImportProps {visible: boolean@@ -38,8 +36,7 @@ export const SpreadsheetImport = ({closePanel,updateEditorDirty = noop,}: SpreadsheetImportProps) => {- const { ref: projectRef } = useParams()- const { data: org } = useSelectedOrganizationQuery()+ const track = useTrack()const {state,handleSwitchTab,@@ -59,7 +56,6 @@ export const SpreadsheetImport = ({)const isCompatible = !selectedTable || incompatibleHeaders.length === 0- const { mutate: sendEvent } = useSendEventMutation()const onConfirm = (resolve: () => void) => {if (state._tag === 'no_selected_file') {toast.error('Please upload a file to import your data with')@@ -86,10 +82,7 @@ export const SpreadsheetImport = ({emptyStringAsNullHeaders: state.emptyStringAsNullHeaders,resolve,})- sendEvent({- action: 'import_data_added',- groups: { project: projectRef ?? 'Unknown', organization: org?.slug ?? 'Unknown' },- })+ track('import_data_added')}}diff --git a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/TableEditor/ColumnManagement.tsx b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/TableEditor/ColumnManagement.tsxindex 1c1b4f502b2..14e793ef171 100644--- a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/TableEditor/ColumnManagement.tsx+++ b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/TableEditor/ColumnManagement.tsx@@ -13,7 +13,6 @@ import {sortableKeyboardCoordinates,verticalListSortingStrategy,} from '@dnd-kit/sortable'-import { useParams } from 'common'import { isEmpty, noop, partition } from 'lodash'import { Edit, ExternalLink, HelpCircle, Key, Trash } from 'lucide-react'import { useState } from 'react'@@ -37,9 +36,8 @@ import { Column } from './Column'import type { ImportContent, TableField } from './TableEditor.types'import InformationBox from '@/components/ui/InformationBox'import type { EnumeratedType } from '@/data/enumerated-types/enumerated-types-query'-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'-import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'import { DOCS_URL } from '@/lib/constants'+import { useTrack } from '@/lib/telemetry/track'interface ColumnManagementProps {table: TableField@@ -66,15 +64,12 @@ export const ColumnManagement = ({onClearImportContent = noop,onUpdateFkRelations,}: ColumnManagementProps) => {- const { ref: projectRef } = useParams()- const { data: org } = useSelectedOrganizationQuery()+ const track = useTrack()const [open, setOpen] = useState(false)const [selectedColumn, setSelectedColumn] = useState<ColumnField>()const [selectedFk, setSelectedFk] = useState<ForeignKey>()- const { mutate: sendEvent } = useSendEventMutation()-const hasImportContent = !isEmpty(importContent)const [primaryKeyColumns, otherColumns] = partition(columns,@@ -186,14 +181,7 @@ export const ColumnManagement = ({type="default"onClick={() => {onSelectImportData()- sendEvent({- action: 'import_data_button_clicked',- properties: { tableType: 'New Table' },- groups: {- project: projectRef ?? 'Unknown',- organization: org?.slug ?? 'Unknown',- },- })+ track('import_data_button_clicked', { tableType: 'New Table' })}}>Import data from CSVdiff --git a/apps/studio/components/layouts/EdgeFunctionsLayout/EdgeFunctionDetailsLayout.tsx b/apps/studio/components/layouts/EdgeFunctionsLayout/EdgeFunctionDetailsLayout.tsxindex d5850dd9455..cc75877a54e 100644--- a/apps/studio/components/layouts/EdgeFunctionsLayout/EdgeFunctionDetailsLayout.tsx+++ b/apps/studio/components/layouts/EdgeFunctionsLayout/EdgeFunctionDetailsLayout.tsx@@ -49,11 +49,10 @@ import { ShortcutTooltip } from '@/components/ui/ShortcutTooltip'import { useProjectApiUrl } from '@/data/config/project-endpoint-query'import { useEdgeFunctionBodyQuery } from '@/data/edge-functions/edge-function-body-query'import { useEdgeFunctionQuery } from '@/data/edge-functions/edge-function-query'-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'-import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'import { withAuth } from '@/hooks/misc/withAuth'import { DOCS_URL } from '@/lib/constants'+import { useTrack } from '@/lib/telemetry/track'import { SHORTCUT_IDS } from '@/state/shortcuts/registry'dayjs.extend(relativeTime)@@ -67,9 +66,8 @@ const EdgeFunctionDetailsLayout = ({children,}: PropsWithChildren<EdgeFunctionDetailsLayoutProps>) => {const router = useRouter()- const { data: org } = useSelectedOrganizationQuery()+ const track = useTrack()const { functionSlug, ref } = useParams()- const { mutate: sendEvent } = useSendEventMutation()const { isLoading, can: canReadFunctions } = useAsyncCheckPermissions(PermissionAction.FUNCTIONS_READ,@@ -244,13 +242,7 @@ const EdgeFunctionDetailsLayout = ({if (!functionSlug) returnsetIsOpen(true)if (IS_PLATFORM) {- sendEvent({- action: 'edge_function_test_side_panel_opened',- groups: {- project: ref ?? 'Unknown',- organization: org?.slug ?? 'Unknown',- },- })+ track('edge_function_test_side_panel_opened')}}diff --git a/apps/studio/components/layouts/Navigation/LayoutHeader/FeedbackDropdown/FeedbackWidget.tsx b/apps/studio/components/layouts/Navigation/LayoutHeader/FeedbackDropdown/FeedbackWidget.tsxindex dc081564b68..9b13cc47657 100644--- a/apps/studio/components/layouts/Navigation/LayoutHeader/FeedbackDropdown/FeedbackWidget.tsx+++ b/apps/studio/components/layouts/Navigation/LayoutHeader/FeedbackDropdown/FeedbackWidget.tsx@@ -28,11 +28,10 @@ import { SupportLink } from '@/components/interfaces/Support/SupportLink'import { InlineLinkClassName } from '@/components/ui/InlineLink'import { useFeedbackCategoryQuery } from '@/data/feedback/feedback-category'import { useSendFeedbackMutation } from '@/data/feedback/feedback-send'-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'import { useLocalStorageQuery } from '@/hooks/misc/useLocalStorage'-import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'import { timeout } from '@/lib/helpers'import { useProfile } from '@/lib/profile'+import { useTrack } from '@/lib/telemetry/track'interface FeedbackWidgetProps {onClose: () => void@@ -43,7 +42,7 @@ export const FeedbackWidget = ({ onClose, onSwitchToIssueOptions }: FeedbackWidgconst router = useRouter()const { profile } = useProfile()const { ref, slug } = useParams()- const { data: org } = useSelectedOrganizationQuery()+ const track = useTrack()const uploadButtonRef = useRef(null)const [feedback, setFeedback] = useState('')@@ -68,7 +67,6 @@ export const FeedbackWidget = ({ onClose, onSwitchToIssueOptions }: FeedbackWidgconst isLikelySupport = isLikelySupportRequest(feedback)const effectiveCategory = category ?? (isLikelySupport ? 'support' : null)- const { mutate: sendEvent } = useSendEventMutation()const { mutate: submitFeedback } = useSendFeedbackMutation({onSuccess: () => {setIsFeedbackSent(true)@@ -312,10 +310,7 @@ export const FeedbackWidget = ({ onClose, onSwitchToIssueOptions }: FeedbackWidgloading={isSending}onClick={() => {sendFeedback()- sendEvent({- action: 'send_feedback_button_clicked',- groups: { project: ref, organization: org?.slug },- })+ track('send_feedback_button_clicked')}}>Senddiff --git a/apps/studio/components/layouts/Navigation/LayoutHeader/MergeRequestButton.tsx b/apps/studio/components/layouts/Navigation/LayoutHeader/MergeRequestButton.tsxindex 49f08ee4b28..c527117c625 100644--- a/apps/studio/components/layouts/Navigation/LayoutHeader/MergeRequestButton.tsx+++ b/apps/studio/components/layouts/Navigation/LayoutHeader/MergeRequestButton.tsx@@ -6,8 +6,6 @@ import { toast } from 'sonner'import { ButtonTooltip } from '@/components/ui/ButtonTooltip'import { useBranchUpdateMutation } from '@/data/branches/branch-update-mutation'import { useBranchesQuery } from '@/data/branches/branches-query'-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'-import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'import { useTrack } from '@/lib/telemetry/track'@@ -15,15 +13,12 @@ export const MergeRequestButton = () => {const { ref } = useParams()const router = useRouter()const { data: projectDetails } = useSelectedProjectQuery()- const { data: selectedOrg } = useSelectedOrganizationQuery()+ const track = useTrack()const projectRef = projectDetails?.parent_project_ref || refconst { data: branches } = useBranchesQuery({ projectRef }, { enabled: Boolean(projectDetails) })- const { mutate: sendEvent } = useSendEventMutation()- const track = useTrack()-const { mutate: updateBranch, isPending: isUpdating } = useBranchUpdateMutation({onError: () => {toast.error(`Failed to open merge request`)@@ -53,16 +48,9 @@ export const MergeRequestButton = () => {onSuccess: () => {toast.success('Merge request created')router.push(`/project/${selectedBranch.project_ref}/merge`)- sendEvent({- action: 'branch_create_merge_request_button_clicked',- properties: {- branchType: selectedBranch.persistent ? 'persistent' : 'preview',- origin: 'header',- },- groups: {- project: projectRef ?? 'Unknown',- organization: selectedOrg?.slug ?? 'Unknown',- },+ track('branch_create_merge_request_button_clicked', {+ branchType: selectedBranch.persistent ? 'persistent' : 'preview',+ origin: 'header',})},}diff --git a/apps/studio/components/layouts/ProjectLayout/LayoutSidebar/LayoutSidebarProvider.tsx b/apps/studio/components/layouts/ProjectLayout/LayoutSidebar/LayoutSidebarProvider.tsxindex 85d135944a0..981e4115c91 100644--- a/apps/studio/components/layouts/ProjectLayout/LayoutSidebar/LayoutSidebarProvider.tsx+++ b/apps/studio/components/layouts/ProjectLayout/LayoutSidebar/LayoutSidebarProvider.tsx@@ -5,11 +5,12 @@ import { parseAsString, useQueryState } from 'nuqs'import { useEffect, type PropsWithChildren } from 'react'import { getSupportLinkQueryParams } from '@/components/ui/HelpPanel/HelpPanel.utils'-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'import useLatest from '@/hooks/misc/useLatest'import { useLocalStorageQuery } from '@/hooks/misc/useLocalStorage'import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'+import { useStaticEffectEvent } from '@/hooks/useStaticEffectEvent'+import { useTrack } from '@/lib/telemetry/track'import { SHORTCUT_IDS } from '@/state/shortcuts/registry'import { useShortcut } from '@/state/shortcuts/useShortcut'import {@@ -44,7 +45,7 @@ export const LayoutSidebarProvider = ({ children }: PropsWithChildren) => {const router = useRouter()const { data: project } = useSelectedProjectQuery()const { data: org } = useSelectedOrganizationQuery()- const { mutate: sendEvent } = useSendEventMutation()+ const track = useTrack()const { openSidebar, closeSidebar, activeSidebar } = useSidebarManagerSnapshot()const [sidebarURLParam, setSidebarUrlParam] = useQueryState('sidebar', parseAsString)@@ -83,20 +84,16 @@ export const LayoutSidebarProvider = ({ children }: PropsWithChildren) => {sidebarManagerState.toggleSidebar(SIDEBAR_KEYS.EDITOR_PANEL))+ const onSidebarChanged = useStaticEffectEvent(+ (sidebarId: (typeof SIDEBAR_KEYS)[keyof typeof SIDEBAR_KEYS]) => {+ track('sidebar_opened', { sidebar: sidebarId })+ }+ )+useEffect(() => {if (!!project) {if (activeSidebar) {- // add event tracking- sendEvent({- action: 'sidebar_opened',- properties: {- sidebar: activeSidebar.id as (typeof SIDEBAR_KEYS)[keyof typeof SIDEBAR_KEYS],- },- groups: {- project: project?.ref ?? 'Unknown',- organization: org?.slug ?? 'Unknown',- },- })+ onSidebarChanged(activeSidebar.id as (typeof SIDEBAR_KEYS)[keyof typeof SIDEBAR_KEYS])setSidebarLocalStorage(activeSidebar.id)} else {setSidebarLocalStorage('')diff --git a/apps/studio/components/layouts/ProjectLayout/LayoutSidebar/index.test.tsx b/apps/studio/components/layouts/ProjectLayout/LayoutSidebar/index.test.tsxindex 5f8c10f6132..05cd28f6e20 100644--- a/apps/studio/components/layouts/ProjectLayout/LayoutSidebar/index.test.tsx+++ b/apps/studio/components/layouts/ProjectLayout/LayoutSidebar/index.test.tsx@@ -79,10 +79,8 @@ vi.mock('@/hooks/misc/useSelectedOrganization', () => ({}),}))-vi.mock('@/data/telemetry/send-event-mutation', () => ({- useSendEventMutation: () => ({- mutate: vi.fn(),- }),+vi.mock('@/lib/telemetry/track', () => ({+ useTrack: () => vi.fn(),}))const resetSidebarManagerState = () => {diff --git a/apps/studio/components/ui/AIAssistantPanel/EdgeFunctionRenderer.test.tsx b/apps/studio/components/ui/AIAssistantPanel/EdgeFunctionRenderer.test.tsxindex f56b95f5f3d..b4246956938 100644--- a/apps/studio/components/ui/AIAssistantPanel/EdgeFunctionRenderer.test.tsx+++ b/apps/studio/components/ui/AIAssistantPanel/EdgeFunctionRenderer.test.tsx@@ -6,13 +6,13 @@ import { EdgeFunctionRenderer } from './EdgeFunctionRenderer'import { render } from '@/tests/helpers'const {- mockSendEvent,+ mockTrack,mockUseEdgeFunctionQuery,mockUseParams,mockUseProjectSettingsV2Query,mockUseSelectedOrganizationQuery,} = vi.hoisted(() => ({- mockSendEvent: vi.fn(),+ mockTrack: vi.fn(),mockUseEdgeFunctionQuery: vi.fn(),mockUseParams: vi.fn(),mockUseProjectSettingsV2Query: vi.fn(),@@ -36,8 +36,8 @@ vi.mock('@/data/edge-functions/edge-function-query', () => ({useEdgeFunctionQuery: mockUseEdgeFunctionQuery,}))-vi.mock('@/data/telemetry/send-event-mutation', () => ({- useSendEventMutation: () => ({ mutate: mockSendEvent }),+vi.mock('@/lib/telemetry/track', () => ({+ useTrack: () => mockTrack,}))vi.mock('@/hooks/misc/useSelectedOrganization', () => ({@@ -78,7 +78,7 @@ vi.mock('./ConfirmFooter', () => ({describe('EdgeFunctionRenderer', () => {beforeEach(() => {- mockSendEvent.mockReset()+ mockTrack.mockReset()mockUseEdgeFunctionQuery.mockReset()mockUseParams.mockReturnValue({ ref: 'project-ref' })mockUseProjectSettingsV2Query.mockReturnValue({ data: undefined })@@ -106,11 +106,11 @@ describe('EdgeFunctionRenderer', () => {await user.click(screen.getByRole('button', { name: 'Deploy' }))expect(onApprove).not.toHaveBeenCalled()- expect(mockSendEvent).not.toHaveBeenCalled()+ expect(mockTrack).not.toHaveBeenCalled()await user.click(screen.getByRole('button', { name: 'Replace function' }))expect(onApprove).toHaveBeenCalledTimes(1)- expect(mockSendEvent).toHaveBeenCalledTimes(1)+ expect(mockTrack).toHaveBeenCalledTimes(1)})it('deploys immediately when no existing function is found', async () => {@@ -131,6 +131,6 @@ describe('EdgeFunctionRenderer', () => {await user.click(screen.getByRole('button', { name: 'Deploy' }))expect(onApprove).toHaveBeenCalledTimes(1)- expect(mockSendEvent).toHaveBeenCalledTimes(1)+ expect(mockTrack).toHaveBeenCalledTimes(1)})})diff --git a/apps/studio/components/ui/AIAssistantPanel/EdgeFunctionRenderer.tsx b/apps/studio/components/ui/AIAssistantPanel/EdgeFunctionRenderer.tsxindex dff4f383751..f62e16320a1 100644--- a/apps/studio/components/ui/AIAssistantPanel/EdgeFunctionRenderer.tsx+++ b/apps/studio/components/ui/AIAssistantPanel/EdgeFunctionRenderer.tsx@@ -5,8 +5,7 @@ import { EdgeFunctionBlock } from '../EdgeFunctionBlock/EdgeFunctionBlock'import { ConfirmFooter } from './ConfirmFooter'import { useProjectSettingsV2Query } from '@/data/config/project-settings-v2-query'import { useEdgeFunctionQuery } from '@/data/edge-functions/edge-function-query'-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'-import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'+import { useTrack } from '@/lib/telemetry/track'interface EdgeFunctionRendererProps {label: string@@ -30,8 +29,7 @@ export const EdgeFunctionRenderer = ({showConfirmFooter = true,}: PropsWithChildren<EdgeFunctionRendererProps>) => {const { ref } = useParams()- const { data: org } = useSelectedOrganizationQuery()- const { mutate: sendEvent } = useSendEventMutation()+ const track = useTrack()const [showReplaceWarning, setShowReplaceWarning] = useState(false)const { data: settings } = useProjectSettingsV2Query({ projectRef: ref }, { enabled: !!ref })@@ -69,14 +67,7 @@ export const EdgeFunctionRenderer = ({if (!code || isDeploying || !ref || !functionName) returnsetShowReplaceWarning(false)- sendEvent({- action: 'edge_function_deploy_button_clicked',- properties: { origin: 'functions_ai_assistant' },- groups: {- project: ref ?? 'Unknown',- organization: org?.slug ?? 'Unknown',- },- })+ track('edge_function_deploy_button_clicked', { origin: 'functions_ai_assistant' })onApprove?.()}diff --git a/apps/studio/components/ui/APIDocsButton.tsx b/apps/studio/components/ui/APIDocsButton.tsxindex 5eb6ac714b8..481a9111426 100644--- a/apps/studio/components/ui/APIDocsButton.tsx+++ b/apps/studio/components/ui/APIDocsButton.tsx@@ -1,9 +1,7 @@-import { useParams } from 'common'import { BookOpenText } from 'lucide-react'import { ButtonTooltip } from './ButtonTooltip'-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'-import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'+import { useTrack } from '@/lib/telemetry/track'import { useAppStateSnapshot } from '@/state/app-state'interface APIDocsButtonProps {@@ -15,9 +13,7 @@ interface APIDocsButtonProps {export const APIDocsButton = ({ section, source, label, tooltip }: APIDocsButtonProps) => {const snap = useAppStateSnapshot()- const { ref } = useParams()- const { data: org } = useSelectedOrganizationQuery()- const { mutate: sendEvent } = useSendEventMutation()+ const track = useTrack()return (<ButtonTooltip@@ -27,16 +23,7 @@ export const APIDocsButton = ({ section, source, label, tooltip }: APIDocsButtonif (section) snap.setActiveDocsSection(section)snap.setShowProjectApiDocs(true)- sendEvent({- action: 'api_docs_opened',- properties: {- source,- },- groups: {- project: ref ?? 'Unknown',- organization: org?.slug ?? 'Unknown',- },- })+ track('api_docs_opened', { source })}}icon={<BookOpenText />}className={label ? undefined : 'w-7'}diff --git a/apps/studio/components/ui/GrafanaPromoBanner.tsx b/apps/studio/components/ui/GrafanaPromoBanner.tsxindex 8a6a2647308..c71ba4d14e1 100644--- a/apps/studio/components/ui/GrafanaPromoBanner.tsx+++ b/apps/studio/components/ui/GrafanaPromoBanner.tsx@@ -1,11 +1,9 @@-import { useParams } from 'common'import { BookOpen } from 'lucide-react'import Link from 'next/link'import { Alert, AlertDescription, AlertTitle, Button, cn } from 'ui'-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'-import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'import { BASE_PATH, DOCS_URL } from '@/lib/constants'+import { useTrack } from '@/lib/telemetry/track'const GrafanaPromoBanner = () => (<Alert className="relative overflow-hidden">@@ -51,9 +49,7 @@ const GrafanaPromoBanner = () => ()const GrafanaBannerActions = ({ className }: { className?: string }) => {- const { ref } = useParams()- const { data: org } = useSelectedOrganizationQuery()- const { mutate: sendEvent } = useSendEventMutation()+ const track = useTrack()return (<div className={cn('flex gap-2', className)}>@@ -61,12 +57,7 @@ const GrafanaBannerActions = ({ className }: { className?: string }) => {<Linkhref={`${DOCS_URL}/guides/telemetry/metrics`}target="_blank"- onClick={() =>- sendEvent({- action: 'reports_database_grafana_banner_clicked',- groups: { project: ref ?? 'Unknown', organization: org?.slug ?? 'Unknown' },- })- }+ onClick={() => track('reports_database_grafana_banner_clicked')}>Docs</Link>@@ -75,12 +66,7 @@ const GrafanaBannerActions = ({ className }: { className?: string }) => {<Linkhref="https://github.com/supabase/supabase-grafana"target="_blank"- onClick={() =>- sendEvent({- action: 'reports_database_grafana_banner_clicked',- groups: { project: ref ?? 'Unknown', organization: org?.slug ?? 'Unknown' },- })- }+ onClick={() => track('reports_database_grafana_banner_clicked')}>Configure Grafana</Link>diff --git a/apps/studio/components/ui/HelpPanel/HelpButton.tsx b/apps/studio/components/ui/HelpPanel/HelpButton.tsxindex ecfd92d18e3..102035ff4c2 100644--- a/apps/studio/components/ui/HelpPanel/HelpButton.tsx+++ b/apps/studio/components/ui/HelpPanel/HelpButton.tsx@@ -3,16 +3,12 @@ import { cn } from 'ui'import { SIDEBAR_KEYS } from '@/components/layouts/ProjectLayout/LayoutSidebar/LayoutSidebarProvider'import { ButtonTooltip } from '@/components/ui/ButtonTooltip'-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'-import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'-import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'+import { useTrack } from '@/lib/telemetry/track'import { useSidebarManagerSnapshot } from '@/state/sidebar-manager-state'export const HelpButton = () => {const { toggleSidebar, activeSidebar } = useSidebarManagerSnapshot()- const { data: project } = useSelectedProjectQuery()- const { data: org } = useSelectedOrganizationQuery()- const { mutate: sendEvent } = useSendEventMutation()+ const track = useTrack()const isOpen = activeSidebar?.id === SIDEBAR_KEYS.HELP_PANEL@@ -24,12 +20,8 @@ export const HelpButton = () => {className={cn('rounded-full w-[32px] h-[32px] flex items-center justify-center p-0 group')}onClick={() => {toggleSidebar(SIDEBAR_KEYS.HELP_PANEL)- // Don't send telemetry event if dropdown is already openif (!isOpen) {- sendEvent({- action: 'help_button_clicked',- groups: { project: project?.ref, organization: org?.slug },- })+ track('help_button_clicked')}}}tooltip={{ content: { text: 'Help' } }}diff --git a/apps/studio/components/ui/QueryBlock/EditQueryButton.tsx b/apps/studio/components/ui/QueryBlock/EditQueryButton.tsxindex 7f402dad624..0f40adad39d 100644--- a/apps/studio/components/ui/QueryBlock/EditQueryButton.tsx+++ b/apps/studio/components/ui/QueryBlock/EditQueryButton.tsx@@ -1,4 +1,3 @@-import { useParams } from 'common'import { Edit } from 'lucide-react'import { useRouter } from 'next/router'import { ComponentProps } from 'react'@@ -16,8 +15,7 @@ import { useIsInlineEditorEnabled } from '@/components/interfaces/Account/Preferimport useNewQuery from '@/components/interfaces/SQLEditor/hooks'import { DiffType } from '@/components/interfaces/SQLEditor/SQLEditor.types'import { SIDEBAR_KEYS } from '@/components/layouts/ProjectLayout/LayoutSidebar/LayoutSidebarProvider'-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'-import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'+import { useTrack } from '@/lib/telemetry/track'import { editorPanelState } from '@/state/editor-panel-state'import { useSidebarManagerSnapshot } from '@/state/sidebar-manager-state'import { useSqlEditorV2StateSnapshot } from '@/state/sql-editor-v2'@@ -38,7 +36,6 @@ export const EditQueryButton = ({type = 'text',}: EditQueryButtonProps) => {const router = useRouter()- const { ref } = useParams()const { newQuery } = useNewQuery()const sqlEditorSnap = useSqlEditorV2StateSnapshot()@@ -51,8 +48,7 @@ export const EditQueryButton = ({content: { side: 'bottom', text: 'Edit in SQL Editor' },}- const { data: org } = useSelectedOrganizationQuery()- const { mutate: sendEvent } = useSendEventMutation()+ const track = useTrack()if (id !== undefined) {return (@@ -85,13 +81,9 @@ export const EditQueryButton = ({} else {if (sql) newQuery(sql, title)}- sendEvent({- action: 'assistant_edit_in_sql_editor_clicked',- properties: {- isInSQLEditor,- isInNewSnippet,- },- groups: { project: ref ?? 'Unknown', organization: org?.slug ?? 'Unknown' },+ track('assistant_edit_in_sql_editor_clicked', {+ isInSQLEditor,+ isInNewSnippet,})}}tooltip={tooltip}diff --git a/apps/studio/components/ui/SingleStat.tsx b/apps/studio/components/ui/SingleStat.tsxindex 8ecb8a28eec..0cc07c2a2c1 100644--- a/apps/studio/components/ui/SingleStat.tsx+++ b/apps/studio/components/ui/SingleStat.tsx@@ -2,9 +2,7 @@ import Link from 'next/link'import type { ReactNode } from 'react'import { cn } from 'ui'-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'-import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'-import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'+import { useTrack } from '@/lib/telemetry/track'type SingleStatProps = {icon: ReactNode@@ -28,20 +26,11 @@ export const SingleStat = ({onClick,trackingProperties,}: SingleStatProps) => {- const { mutate: sendEvent } = useSendEventMutation()- const { data: project } = useSelectedProjectQuery()- const { data: organization } = useSelectedOrganizationQuery()+ const track = useTrack()const trackActivityStat = () => {- if (trackingProperties && project?.ref && organization?.slug) {- sendEvent({- action: 'home_activity_stat_clicked',- properties: trackingProperties,- groups: {- project: project.ref,- organization: organization.slug,- },- })+ if (trackingProperties) {+ track('home_activity_stat_clicked', trackingProperties)}}const content = (diff --git a/apps/studio/data/sql/execute-sql-mutation.ts b/apps/studio/data/sql/execute-sql-mutation.tsindex 29b39e8f181..7186ce6085d 100644--- a/apps/studio/data/sql/execute-sql-mutation.ts+++ b/apps/studio/data/sql/execute-sql-mutation.ts@@ -2,9 +2,8 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'import { executeSql, ExecuteSqlData, ExecuteSqlVariables } from './execute-sql-query'-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'-import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'import { sqlEventParser } from '@/lib/sql-event-parser'+import { useTrack } from '@/lib/telemetry/track'import { UseCustomMutationOptions } from '@/types'// [Joshen] Intention is that we invalidate all database related keys whenever running a mutation related query@@ -39,31 +38,26 @@ export const useExecuteSqlMutation = ({'mutationFn'> = {}) => {const queryClient = useQueryClient()- const { mutate: sendEvent } = useSendEventMutation()- const { data: org } = useSelectedOrganizationQuery()+ const track = useTrack()return useMutation<ExecuteSqlData, QueryResponseError, ExecuteSqlMutationVariables>({mutationFn: (args) => executeSql(args),async onSuccess(data, variables, context) {const { contextualInvalidation, sql, projectRef } = variables- // Track all table-related events from SQL executiontry {const tableEvents = sqlEventParser.getTableEvents(sql)tableEvents.forEach((event) => {if (projectRef) {- sendEvent({- action: event.type,- properties: {+ track(+ event.type,+ {method: 'sql_editor',schema_name: event.schema,table_name: event.tableName,},- groups: {- project: projectRef,- ...(org?.slug && { organization: org.slug }),- },- })+ { project: projectRef }+ )}})} catch (error) {diff --git a/apps/studio/data/table-rows/table-row-create-mutation.ts b/apps/studio/data/table-rows/table-row-create-mutation.tsindex 772e2d80329..9531b1c4b5e 100644--- a/apps/studio/data/table-rows/table-row-create-mutation.ts+++ b/apps/studio/data/table-rows/table-row-create-mutation.ts@@ -4,9 +4,8 @@ import { toast } from 'sonner'import { tableRowKeys } from './keys'import { executeSql } from '@/data/sql/execute-sql-query'-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'-import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'import { RoleImpersonationState, wrapWithRoleImpersonation } from '@/lib/role-impersonation'+import { useTrack } from '@/lib/telemetry/track'import { isRoleImpersonationEnabled } from '@/state/role-impersonation-state'import type { ResponseError, UseCustomMutationOptions } from '@/types'@@ -67,31 +66,22 @@ export const useTableRowCreateMutation = ({'mutationFn'> = {}) => {const queryClient = useQueryClient()- const { mutate: sendEvent } = useSendEventMutation()- const { data: org } = useSelectedOrganizationQuery()+ const track = useTrack()return useMutation<TableRowCreateData, ResponseError, TableRowCreateVariables>({mutationFn: (vars) => createTableRow(vars),async onSuccess(data, variables, context) {const { projectRef, table } = variables- // Track data insertion event- try {- sendEvent({- action: 'table_data_added',- properties: {- method: 'table_editor',- schema_name: table.schema,- table_name: table.name,- },- groups: {- project: projectRef,- ...(org?.slug && { organization: org.slug }),- },- })- } catch (error) {- console.error('Failed to track table data insertion event:', error)- }+ track(+ 'table_data_added',+ {+ method: 'table_editor',+ schema_name: table.schema,+ table_name: table.name,+ },+ { project: projectRef }+ )await queryClient.invalidateQueries({queryKey: tableRowKeys.tableRowsAndCount(projectRef, table.id),diff --git a/apps/studio/data/telemetry/send-event-mutation.ts b/apps/studio/data/telemetry/send-event-mutation.tsdeleted file mode 100644index c70791ec5e5..00000000000--- a/apps/studio/data/telemetry/send-event-mutation.ts+++ /dev/null@@ -1,51 +0,0 @@-import { useMutation } from '@tanstack/react-query'-import { sendTelemetryEvent } from 'common'-import { TelemetryEvent } from 'common/telemetry-constants'-import { useRouter } from 'next/router'--import { handleError } from '@/data/fetchers'-import { API_URL } from '@/lib/constants'-import type { ResponseError, UseCustomMutationOptions } from '@/types'--interface SendEventVariables {- event: TelemetryEvent- pathname?: string-}--export async function sendEvent({ event, pathname }: SendEventVariables) {- try {- await sendTelemetryEvent(API_URL, event, pathname)- } catch (error) {- handleError(error)- }-}--type SendEventData = Awaited<ReturnType<typeof sendEvent>>--export const useSendEventMutation = ({- onSuccess,- onError,- ...options-}: Omit<- UseCustomMutationOptions<SendEventData, ResponseError, TelemetryEvent>,- 'mutationFn'-> = {}) => {- const router = useRouter()-- return useMutation<SendEventData, ResponseError, TelemetryEvent>({- mutationFn: (event) => {- return sendEvent({ event, pathname: router.pathname })- },- async onSuccess(data, variables, context) {- await onSuccess?.(data, variables, context)- },- async onError(data, variables, context) {- if (onError === undefined) {- console.error(`Failed to send Telemetry event: ${data.message}`)- } else {- onError(data, variables, context)- }- },- ...options,- })-}diff --git a/apps/studio/hooks/misc/useStudioCommandMenuTelemetry.ts b/apps/studio/hooks/misc/useStudioCommandMenuTelemetry.tsindex 86aa1dd91c1..b662fe2f527 100644--- a/apps/studio/hooks/misc/useStudioCommandMenuTelemetry.ts+++ b/apps/studio/hooks/misc/useStudioCommandMenuTelemetry.ts@@ -1,19 +1,20 @@-import { useParams } from 'common'+import { sendTelemetryEvent, useParams } from 'common'import type {CommandMenuClosedEvent,CommandMenuCommandClickedEvent,CommandMenuOpenedEvent,CommandMenuSearchSubmittedEvent,} from 'common/telemetry-constants'+import { useRouter } from 'next/router'import { useCallback } from 'react'-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'+import { API_URL } from '@/lib/constants'export function useStudioCommandMenuTelemetry() {const { ref: projectRef } = useParams()const { data: organization } = useSelectedOrganizationQuery()- const { mutate: sendEvent } = useSendEventMutation()+ const router = useRouter()const onTelemetry = useCallback((@@ -23,19 +24,20 @@ export function useStudioCommandMenuTelemetry() {| CommandMenuCommandClickedEvent| CommandMenuSearchSubmittedEvent) => {- // Add studio-specific groups (project and organization)- const eventWithGroups = {- ...event,- groups: {- ...event.groups,- ...(projectRef && { project: projectRef }),- ...(organization?.slug && { organization: organization.slug }),+ sendTelemetryEvent(+ API_URL,+ {+ ...event,+ groups: {+ ...event.groups,+ ...(projectRef && { project: projectRef }),+ ...(organization?.slug && { organization: organization.slug }),+ },},- }-- sendEvent(eventWithGroups)+ router.pathname+ )},- [projectRef, organization?.slug, sendEvent]+ [projectRef, organization?.slug, router.pathname])return { onTelemetry }diff --git a/apps/studio/lib/profile.tsx b/apps/studio/lib/profile.tsxindex 90e819569a4..b4f14943b4b 100644--- a/apps/studio/lib/profile.tsx+++ b/apps/studio/lib/profile.tsx@@ -11,7 +11,7 @@ import { useProfileCreateMutation } from '@/data/profile/profile-create-mutationimport { useProfileIdentitiesQuery } from '@/data/profile/profile-identities-query'import { useProfileQuery } from '@/data/profile/profile-query'import type { Profile } from '@/data/profile/types'-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'+import { useTrack } from '@/lib/telemetry/track'import type { ResponseError } from '@/types'export type ProfileContextType = {@@ -36,10 +36,10 @@ export const ProfileProvider = ({ children }: PropsWithChildren<{}>) => {const router = useRouter()const signOut = useSignOut()- const { mutate: sendEvent } = useSendEventMutation()+ const track = useTrack()const { mutate: createProfile, isPending: isCreatingProfile } = useProfileCreateMutation({onSuccess: () => {- sendEvent({ action: 'sign_up', properties: { category: 'conversion' } })+ track('sign_up', { category: 'conversion' })if (user) {// Send an event to GTM, will do nothing if GTM is not enableddiff --git a/apps/studio/pages/project/[ref]/branches/index.tsx b/apps/studio/pages/project/[ref]/branches/index.tsxindex e0994a0fafa..e479cec2ce0 100644--- a/apps/studio/pages/project/[ref]/branches/index.tsx+++ b/apps/studio/pages/project/[ref]/branches/index.tsx@@ -20,11 +20,11 @@ import { TextConfirmModal } from '@/components/ui/TextConfirmModalWrapper'import { useBranchDeleteMutation } from '@/data/branches/branch-delete-mutation'import { Branch, useBranchesQuery } from '@/data/branches/branches-query'import { useGitHubConnectionsQuery } from '@/data/integrations/github-connections-query'-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'import { DOCS_URL } from '@/lib/constants'+import { useTrack } from '@/lib/telemetry/track'import { useAppStateSnapshot } from '@/state/app-state'import type { NextPageWithLayout } from '@/types'@@ -37,7 +37,7 @@ const BranchesPage: NextPageWithLayout = () => {const [selectedBranchToDelete, setSelectedBranchToDelete] = useState<Branch>()- const { mutate: sendEvent } = useSendEventMutation()+ const track = useTrack()const isBranch = project?.parent_project_ref !== undefinedconst projectRef =@@ -108,18 +108,14 @@ const BranchesPage: NextPageWithLayout = () => {if (branchRef === ref) {router.push(`/project/${projectRef}/branches`)}- // Track delete button click- sendEvent({- action: 'branch_delete_button_clicked',- properties: {+ track(+ 'branch_delete_button_clicked',+ {branchType: persistent ? 'persistent' : 'preview',origin: 'branches_page',},- groups: {- project: projectRef ?? 'Unknown',- organization: selectedOrg?.slug ?? 'Unknown',- },- })+ { project: projectRef }+ )},})diff --git a/apps/studio/pages/project/[ref]/branches/merge-requests.tsx b/apps/studio/pages/project/[ref]/branches/merge-requests.tsxindex 509fc9f9276..db24ab8e476 100644--- a/apps/studio/pages/project/[ref]/branches/merge-requests.tsx+++ b/apps/studio/pages/project/[ref]/branches/merge-requests.tsx@@ -31,11 +31,11 @@ import NoPermission from '@/components/ui/NoPermission'import { useBranchUpdateMutation } from '@/data/branches/branch-update-mutation'import { Branch, useBranchesQuery } from '@/data/branches/branches-query'import { useGitHubConnectionsQuery } from '@/data/integrations/github-connections-query'-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'import { DOCS_URL } from '@/lib/constants'+import { useTrack } from '@/lib/telemetry/track'import type { NextPageWithLayout } from '@/types'const MergeRequestsPage: NextPageWithLayout = () => {@@ -88,7 +88,7 @@ const MergeRequestsPage: NextPageWithLayout = () => {const isGithubConnected = githubConnection !== undefined- const { mutate: sendEvent } = useSendEventMutation()+ const track = useTrack()const { mutate: updateBranch, isPending: isUpdating } = useBranchUpdateMutation({onError: () => {@@ -111,18 +111,14 @@ const MergeRequestsPage: NextPageWithLayout = () => {onSuccess: () => {toast.success('Merge request created')- // Track merge request creation- sendEvent({- action: 'branch_create_merge_request_button_clicked',- properties: {+ track(+ 'branch_create_merge_request_button_clicked',+ {branchType: persistent ? 'persistent' : 'preview',origin: 'merge_page',},- groups: {- project: projectRef ?? 'Unknown',- organization: selectedOrg?.slug ?? 'Unknown',- },- })+ { project: projectRef }+ )router.push(`/project/${branchRef}/merge`)},@@ -144,13 +140,8 @@ const MergeRequestsPage: NextPageWithLayout = () => {onSuccess: () => {toast.success('Merge request closed')- // Track merge request closed- sendEvent({- action: 'branch_close_merge_request_button_clicked',- groups: {- project: projectRef ?? 'Unknown',- organization: selectedOrg?.slug ?? 'Unknown',- },+ track('branch_close_merge_request_button_clicked', undefined, {+ project: projectRef,})},}@@ -313,7 +304,6 @@ const MergeRequestsPageWrapper = ({ children }: PropsWithChildren<{}>) => {const router = useRouter()const { ref } = useParams()const { data: project } = useSelectedProjectQuery()- const { data: selectedOrg } = useSelectedOrganizationQuery()const isBranch = project?.parent_project_ref !== undefinedconst projectRef =@@ -322,7 +312,7 @@ const MergeRequestsPageWrapper = ({ children }: PropsWithChildren<{}>) => {const { data: branches } = useBranchesQuery({ projectRef })const previewBranches = (branches || []).filter((b) => !b.is_default)- const { mutate: sendEvent } = useSendEventMutation()+ const track = useTrack()const { mutate: updateBranch, isPending: isUpdating } = useBranchUpdateMutation({onError: () => {@@ -345,18 +335,14 @@ const MergeRequestsPageWrapper = ({ children }: PropsWithChildren<{}>) => {onSuccess: () => {toast.success('Merge request created')- // Track merge request creation- sendEvent({- action: 'branch_create_merge_request_button_clicked',- properties: {+ track(+ 'branch_create_merge_request_button_clicked',+ {branchType: persistent ? 'persistent' : 'preview',origin: 'branch_selector',},- groups: {- project: projectRef ?? 'Unknown',- organization: selectedOrg?.slug ?? 'Unknown',- },- })+ { project: projectRef }+ )router.push(`/project/${branchRef}/merge`)},diff --git a/apps/studio/pages/project/[ref]/functions/[functionSlug]/code.tsx b/apps/studio/pages/project/[ref]/functions/[functionSlug]/code.tsxindex ff56dca50a8..a5a2c56e354 100644--- a/apps/studio/pages/project/[ref]/functions/[functionSlug]/code.tsx+++ b/apps/studio/pages/project/[ref]/functions/[functionSlug]/code.tsx@@ -18,18 +18,18 @@ import { InlineLink } from '@/components/ui/InlineLink'import { useEdgeFunctionBodyQuery } from '@/data/edge-functions/edge-function-body-query'import { useEdgeFunctionQuery } from '@/data/edge-functions/edge-function-query'import { useEdgeFunctionDeployMutation } from '@/data/edge-functions/edge-functions-deploy-mutation'-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'import { BASE_PATH } from '@/lib/constants'+import { useTrack } from '@/lib/telemetry/track'const CodePage = () => {const { ref, functionSlug } = useParams()const { data: project } = useSelectedProjectQuery()const { data: org } = useSelectedOrganizationQuery()- const { mutate: sendEvent } = useSendEventMutation()+ const track = useTrack()const [showDeployWarning, setShowDeployWarning] = useState(false)const { can: canDeployFunction } = useAsyncCheckPermissions(PermissionAction.FUNCTIONS_WRITE, '*')@@ -122,23 +122,11 @@ const CodePage = () => {const handleDeployClick = () => {if (files.length === 0 || isLoadingFiles) returnsetShowDeployWarning(true)- sendEvent({- action: 'edge_function_deploy_updates_button_clicked',- groups: {- project: ref ?? 'Unknown',- organization: org?.slug ?? 'Unknown',- },- })+ track('edge_function_deploy_updates_button_clicked')}const handleDeployConfirm = () => {- sendEvent({- action: 'edge_function_deploy_updates_confirm_clicked',- groups: {- project: ref ?? 'Unknown',- organization: org?.slug ?? 'Unknown',- },- })+ track('edge_function_deploy_updates_confirm_clicked')onUpdate()}diff --git a/apps/studio/pages/project/[ref]/functions/new.tsx b/apps/studio/pages/project/[ref]/functions/new.tsxindex 6cb09a857df..a640e634e41 100644--- a/apps/studio/pages/project/[ref]/functions/new.tsx+++ b/apps/studio/pages/project/[ref]/functions/new.tsx@@ -40,11 +40,11 @@ import { PreventNavigationOnUnsavedChanges } from '@/components/ui-patterns/Dialimport { FileExplorerAndEditor } from '@/components/ui/FileExplorerAndEditor'import { FileData } from '@/components/ui/FileExplorerAndEditor/FileExplorerAndEditor.types'import { useEdgeFunctionDeployMutation } from '@/data/edge-functions/edge-functions-deploy-mutation'-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'import { useIsFeatureEnabled } from '@/hooks/misc/useIsFeatureEnabled'import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'import { BASE_PATH } from '@/lib/constants'+import { useTrack } from '@/lib/telemetry/track'import { useAiAssistantStateSnapshot } from '@/state/ai-assistant-state'import { useSidebarManagerSnapshot } from '@/state/sidebar-manager-state'@@ -116,7 +116,7 @@ const NewFunctionPage = () => {const { data: project } = useSelectedProjectQuery()const { data: org } = useSelectedOrganizationQuery()const snap = useAiAssistantStateSnapshot()- const { mutate: sendEvent } = useSendEventMutation()+ const track = useTrack()const showStripeExample = useIsFeatureEnabled('edge_functions:show_stripe_example')const { openSidebar } = useSidebarManagerSnapshot()@@ -171,11 +171,7 @@ const NewFunctionPage = () => {files: files.map(({ name, content }) => ({ name, content })),})- sendEvent({- action: 'edge_function_deploy_button_clicked',- properties: { origin: 'functions_editor' },- groups: { project: ref ?? 'Unknown', organization: org?.slug ?? 'Unknown' },- })+ track('edge_function_deploy_button_clicked', { origin: 'functions_editor' })}const handleChat = () => {@@ -209,11 +205,7 @@ const NewFunctionPage = () => {],},})- sendEvent({- action: 'edge_function_ai_assistant_button_clicked',- properties: { origin: 'functions_editor_chat' },- groups: { project: ref ?? 'Unknown', organization: org?.slug ?? 'Unknown' },- })+ track('edge_function_ai_assistant_button_clicked', { origin: 'functions_editor_chat' })}const onSelectTemplate = (templateValue: string) => {@@ -225,10 +217,9 @@ const NewFunctionPage = () => {))setOpen(false)- sendEvent({- action: 'edge_function_template_clicked',- properties: { templateName: template.name, origin: 'editor_page' },- groups: { project: ref ?? 'Unknown', organization: org?.slug ?? 'Unknown' },+ track('edge_function_template_clicked', {+ templateName: template.name,+ origin: 'editor_page',})}setIsPreviewingTemplate(false)diff --git a/apps/studio/pages/project/[ref]/merge.tsx b/apps/studio/pages/project/[ref]/merge.tsxindex 98bc528cae7..f5dc6f7d4e5 100644--- a/apps/studio/pages/project/[ref]/merge.tsx+++ b/apps/studio/pages/project/[ref]/merge.tsx@@ -31,18 +31,16 @@ import { useBranchUpdateMutation } from '@/data/branches/branch-update-mutation'import { useBranchesQuery } from '@/data/branches/branches-query'import { useProjectGitHubConnectionQuery } from '@/data/integrations/github-connections-query'import { useProjectDetailQuery } from '@/data/projects/project-detail-query'-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'import { useBranchMergeDiff } from '@/hooks/branches/useBranchMergeDiff'import { useWorkflowManagement } from '@/hooks/branches/useWorkflowManagement'-import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'+import { useTrack } from '@/lib/telemetry/track'import type { NextPageWithLayout } from '@/types'const MergePage: NextPageWithLayout = () => {const router = useRouter()const { ref, workflow_run_id: currentWorkflowRunId } = useParams()const { data: project } = useSelectedProjectQuery()- const { data: selectedOrg } = useSelectedOrganizationQuery()const pgDeltaDiffEnabled = useIsPgDeltaDiffEnabled()const [isSubmitting, setIsSubmitting] = useState(false)@@ -52,8 +50,12 @@ const MergePage: NextPageWithLayout = () => {const isBranch = project?.parent_project_ref !== undefinedconst parentProjectRef = project?.parent_project_ref- const { data: parentProject } = useProjectDetailQuery({ ref: parentProjectRef })- const { data: ghConnection } = useProjectGitHubConnectionQuery({ ref: parentProjectRef })+ const { data: parentProject } = useProjectDetailQuery({+ ref: parentProjectRef,+ })+ const { data: ghConnection } = useProjectGitHubConnectionQuery({+ ref: parentProjectRef,+ })const { data: branches } = useBranchesQuery({ projectRef: parentProjectRef },@@ -179,24 +181,14 @@ const MergePage: NextPageWithLayout = () => {addWorkflowRun(data.workflow_run_id)}- // Track branch update- sendEvent({- action: 'branch_updated',- properties: {- source: 'merge_page',- },- groups: {- project: parentProjectRef ?? 'Unknown',- organization: selectedOrg?.slug ?? 'Unknown',- },- })+ track('branch_updated', { source: 'merge_page' }, { project: parentProjectRef })},onError: (error) => {toast.error(`Failed to update branch: ${error.message}`)},})- const { mutate: sendEvent } = useSendEventMutation()+ const track = useTrack()const { mutate: mergeBranch, isPending: isMerging } = useBranchMergeMutation({onSuccess: (data) => {@@ -205,17 +197,11 @@ const MergePage: NextPageWithLayout = () => {toast.success('Branch merge initiated!')addWorkflowRun(data.workflowRunId)- // Track successful merge- sendEvent({- action: 'branch_merge_completed',- properties: {- branchType: currentBranch?.persistent ? 'persistent' : 'preview',- },- groups: {- project: parentProjectRef ?? 'Unknown',- organization: selectedOrg?.slug ?? 'Unknown',- },- })+ track(+ 'branch_merge_completed',+ { branchType: currentBranch?.persistent ? 'persistent' : 'preview' },+ { project: parentProjectRef }+ )} else {toast.info('No changes to merge')}@@ -224,18 +210,14 @@ const MergePage: NextPageWithLayout = () => {setIsSubmitting(false)toast.error(`Failed to merge branch: ${error.message}`)- // Track failed merge- sendEvent({- action: 'branch_merge_failed',- properties: {+ track(+ 'branch_merge_failed',+ {branchType: currentBranch?.persistent ? 'persistent' : 'preview',error: error.message,},- groups: {- project: parentProjectRef ?? 'Unknown',- organization: selectedOrg?.slug ?? 'Unknown',- },- })+ { project: parentProjectRef }+ )},})@@ -243,17 +225,7 @@ const MergePage: NextPageWithLayout = () => {onSuccess: () => {toast.success('Branch closed successfully')router.push(`/project/${parentProjectRef}/branches`)- // Track delete button click- sendEvent({- action: 'branch_delete_button_clicked',- properties: {- origin: 'merge_page',- },- groups: {- project: parentProjectRef ?? 'Unknown',- organization: selectedOrg?.slug ?? 'Unknown',- },- })+ track('branch_delete_button_clicked', { origin: 'merge_page' }, { project: parentProjectRef })},onError: (error) => {toast.error(`Failed to close branch: ${error.message}`)@@ -280,14 +252,7 @@ const MergePage: NextPageWithLayout = () => {if (!ref || !parentProjectRef) returnsetIsSubmitting(true)- // Track merge attempt- sendEvent({- action: 'branch_merge_submitted',- groups: {- project: parentProjectRef ?? 'Unknown',- organization: selectedOrg?.slug ?? 'Unknown',- },- })+ track('branch_merge_submitted', undefined, { project: parentProjectRef })mergeBranch({branchProjectRef: ref,@@ -490,7 +455,9 @@ const MergePage: NextPageWithLayout = () => {<ConfirmationModalvisible={showConfirmDialog}title="Confirm Branch Merge"- description={`Are you sure you want to merge "${currentBranch?.name}" into "${mainBranch?.name || 'main'}"? This action cannot be undone.`}+ description={`Are you sure you want to merge "${+ currentBranch?.name+ }" into "${mainBranch?.name || 'main'}"? This action cannot be undone.`}confirmLabel="Merge branch"confirmLabelLoading="Merging..."onConfirm={() => {diff --git a/apps/studio/pages/sign-in-mfa.tsx b/apps/studio/pages/sign-in-mfa.tsxindex b6702fd7bf7..ed1a2edd495 100644--- a/apps/studio/pages/sign-in-mfa.tsx+++ b/apps/studio/pages/sign-in-mfa.tsx@@ -9,9 +9,10 @@ import { LogoLoader } from 'ui'import { SignInMfaForm } from '@/components/interfaces/SignIn/SignInMfaForm'import SignInLayout from '@/components/layouts/SignInLayout/SignInLayout'import { useAddLoginEvent } from '@/data/misc/audit-login-mutation'-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'import useLatest from '@/hooks/misc/useLatest'+import { useStaticEffectEvent } from '@/hooks/useStaticEffectEvent'import { auth, buildPathWithParams, getReturnToPath } from '@/lib/gotrue'+import { useTrack } from '@/lib/telemetry/track'import type { NextPageWithLayout } from '@/types'const SignInMfaPage: NextPageWithLayout = () => {@@ -24,7 +25,13 @@ const SignInMfaPage: NextPageWithLayout = () => {} = useParams()const signInMethodRef = useLatest(signInMethod)- const { mutate: sendEvent } = useSendEventMutation()+ const track = useTrack()+ const onSignInTracked = useStaticEffectEvent(() => {+ track('sign_in', {+ category: 'account',+ method: signInMethodRef.current,+ })+ })const { mutate: addLoginEvent } = useAddLoginEvent()const [loading, setLoading] = useState(true)@@ -54,13 +61,7 @@ const SignInMfaPage: NextPageWithLayout = () => {}if (data.currentLevel === data.nextLevel) {- sendEvent({- action: 'sign_in',- properties: {- category: 'account',- method: signInMethodRef.current,- },- })+ onSignInTracked()addLoginEvent({})await queryClient.resetQueries()@@ -85,6 +86,7 @@ const SignInMfaPage: NextPageWithLayout = () => {setLoading(false)router.push({ pathname: '/sign-in', query: router.query })})+ // eslint-disable-next-line react-hooks/exhaustive-deps}, [])if (loading) {