The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.
TypeScript aialternativeauthdatabasedenoembeddingsexamplefirebasenextjsoauth2pgvectorpostgispostgrespostgresqlpostgrestrealtimesupabasevectorswebsockets
feat(telemetry): mirror org_count to PostHog person property (#45946)
Sean Oliver4c77ab5fef3c
diff --git a/apps/studio/hooks/misc/__tests__/useDataApiRevokeOnCreateDefault.test.ts b/apps/studio/hooks/misc/__tests__/useDataApiRevokeOnCreateDefault.test.tsindex d6e636fed41..c4e2ee97841 100644--- a/apps/studio/hooks/misc/__tests__/useDataApiRevokeOnCreateDefault.test.ts+++ b/apps/studio/hooks/misc/__tests__/useDataApiRevokeOnCreateDefault.test.ts@@ -1,4 +1,5 @@import { renderHook } from '@testing-library/react'+import { posthogClient } from 'common'import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'import {@@ -25,6 +26,17 @@ vi.mock('@/lib/telemetry/track', () => ({useTrack: vi.fn(),}))+vi.mock('common', async () => {+ const actual = await vi.importActual<typeof import('common')>('common')+ return {+ ...actual,+ posthogClient: {+ getPersonProperty: vi.fn(),+ onFeatureFlags: vi.fn(() => () => {}),+ },+ }+})+describe('useDataApiRevokeOnCreateDefaultEnabled', () => {afterEach(() => {vi.restoreAllMocks()@@ -62,6 +74,11 @@ describe('useTrackDefaultPrivilegesExposure', () => {beforeEach(() => {vi.mocked(useTrack).mockReturnValue(track)+ // Default: org_count is set on the person — most tests want to exercise+ // the post-targeting-resolution behavior. The gate-blocked case has its+ // own test below.+ vi.mocked(posthogClient.getPersonProperty).mockReturnValue(1)+ vi.mocked(posthogClient.onFeatureFlags).mockReturnValue(() => {})})afterEach(() => {@@ -74,6 +91,13 @@ describe('useTrackDefaultPrivilegesExposure', () => {expect(track).not.toHaveBeenCalled()})+ it('does not fire while org_count is missing from the SDK person', () => {+ vi.mocked(usePHFlag).mockReturnValue(true)+ vi.mocked(posthogClient.getPersonProperty).mockReturnValue(undefined)+ renderHook(() => useTrackDefaultPrivilegesExposure({ surface: 'main', dataApiEnabled: true }))+ expect(track).not.toHaveBeenCalled()+ })+it('fires once when the flag resolves to true on the main surface', () => {vi.mocked(usePHFlag).mockReturnValue(true)renderHook(() => useTrackDefaultPrivilegesExposure({ surface: 'main', dataApiEnabled: true }))diff --git a/apps/studio/hooks/misc/useDataApiRevokeOnCreateDefault.ts b/apps/studio/hooks/misc/useDataApiRevokeOnCreateDefault.tsindex 077d63e2308..5299d6cdac9 100644--- a/apps/studio/hooks/misc/useDataApiRevokeOnCreateDefault.ts+++ b/apps/studio/hooks/misc/useDataApiRevokeOnCreateDefault.ts@@ -1,4 +1,5 @@-import { useEffect, useRef } from 'react'+import { posthogClient } from 'common'+import { useEffect, useRef, useState } from 'react'import { usePHFlag } from '../ui/useFlag'import { IS_TEST_ENV } from '@/lib/constants'@@ -28,28 +29,49 @@ type DefaultPrivilegesExposureOptions =| { surface: 'vercel' }/**- * Fires `project_creation_default_privileges_exposed` once per mount after the- * `dataApiRevokeOnCreateDefault` flag resolves. Gating on flag resolution keeps- * cohort attribution clean — users whose flag never resolves are not counted in- * either cohort. Deduplicated via ref so re-renders and mid-session flag flips- * don't re-fire.+ * Fires `project_creation_default_privileges_exposed` once per mount after both+ * the `dataApiRevokeOnCreateDefault` flag resolves AND the `org_count` person+ * property has been set on the PostHog SDK. Waiting for both signals avoids+ * locking in the variant on the initial /flags/ response, which races the+ * org_count identify for brand-new signups — the exposure must reflect the+ * targeting-aware flag value. Deduplicated via ref so re-renders and mid-session+ * flag flips don't re-fire.*/export const useTrackDefaultPrivilegesExposure = (options: DefaultPrivilegesExposureOptions) => {const track = useTrack()const flag = usePHFlag<boolean>('dataApiRevokeOnCreateDefault')const hasTracked = useRef(false)+ const [orgCountReady, setOrgCountReady] = useState(+ () => posthogClient.getPersonProperty('org_count') !== undefined+ )const { surface } = optionsconst dataApiEnabled = options.surface === 'main' ? options.dataApiEnabled : null+ // Mark ready once org_count appears on the SDK person. A /flags/ response+ // received after our identify will have included org_count in the evaluation,+ // so subscribing via onFeatureFlags is the right signal that the flag store+ // reflects the targeting-aware value.+ useEffect(() => {+ if (orgCountReady) return+ const check = () => {+ if (posthogClient.getPersonProperty('org_count') !== undefined) {+ setOrgCountReady(true)+ }+ }+ check()+ return posthogClient.onFeatureFlags(check)+ }, [orgCountReady])+useEffect(() => {if (hasTracked.current) returnif (flag === undefined) return+ if (!orgCountReady) returnhasTracked.current = truetrack('project_creation_default_privileges_exposed', {surface,...(dataApiEnabled !== null && { dataApiEnabled }),dataApiRevokeOnCreateDefaultEnabled: flag,})- }, [flag, track, surface, dataApiEnabled])+ }, [flag, orgCountReady, track, surface, dataApiEnabled])}diff --git a/apps/studio/lib/telemetry.tsx b/apps/studio/lib/telemetry.tsxindex 3b90b4049b7..dddd789fe24 100644--- a/apps/studio/lib/telemetry.tsx+++ b/apps/studio/lib/telemetry.tsx@@ -1,8 +1,9 @@import * as Sentry from '@sentry/nextjs'-import { LOCAL_STORAGE_KEYS, PageTelemetry, useUser } from 'common'-import { useEffect } from 'react'+import { LOCAL_STORAGE_KEYS, PageTelemetry, posthogClient, useUser } from 'common'+import { useEffect, useRef } from 'react'import { useConsentToast } from 'ui-patterns/consent'+import { useOrganizationsQuery } from '@/data/organizations/organizations-query'import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'import { API_URL, IS_PLATFORM } from '@/lib/constants'@@ -28,6 +29,21 @@ export function Telemetry() {const user = useUser()+ // Mirror the user's org-list length into a PostHog person property so feature+ // flags and analytics can segment by current org membership (e.g. "users in+ // exactly one org") without behavioral-cohort lag. Only fires when the value+ // changes.+ const { data: organizations } = useOrganizationsQuery()+ const lastSentRef = useRef<{ userId: string; orgCount: number } | null>(null)+ useEffect(() => {+ if (!user?.id || !organizations) return+ const orgCount = organizations.length+ const last = lastSentRef.current+ if (last?.userId === user.id && last.orgCount === orgCount) return+ lastSentRef.current = { userId: user.id, orgCount }+ posthogClient.identify(user.id, { org_count: orgCount })+ }, [user?.id, organizations])+useEffect(() => {// don't set the sentry user id if the user hasn't logged in (so that Sentry errors show null user id instead of anonymous id)if (!user?.id) {diff --git a/packages/common/posthog-client.ts b/packages/common/posthog-client.tsindex acff08b0b9e..20d03887f49 100644--- a/packages/common/posthog-client.ts+++ b/packages/common/posthog-client.ts@@ -170,8 +170,15 @@ class PostHogClient {if (!hasConsent) returnif (!this.initialized) {- // Queue the identification for when PostHog initializes- this.pendingIdentification = { userId, properties }+ // Queue the identification for when PostHog initializes. Merge properties+ // across pre-init calls for the same user so callers don't clobber each+ // other (e.g. useTelemetryIdentify sets gotrue_id, then a separate effect+ // sets org_count — both should land when the SDK flushes).+ const pending = this.pendingIdentification+ this.pendingIdentification =+ pending && pending.userId === userId+ ? { userId, properties: { ...pending.properties, ...properties } }+ : { userId, properties }return}@@ -252,6 +259,27 @@ class PostHogClient {return undefined}+ /**+ * Returns the current value of a person property as stored locally by posthog-js.+ * Returns undefined if PostHog hasn't initialized or the property hasn't been set.+ * Use this to gate behavior on whether a property has actually landed in the SDK+ * (e.g., waiting for an identify to complete before evaluating flag-dependent UI).+ *+ * Person properties set via `identify(id, props)` are stored under the+ * `$stored_person_properties` bucket in persistence — `get_property(key)`+ * reads top-level super properties, not person properties, so we index in.+ */+ getPersonProperty(key: string): unknown {+ if (!this.initialized) return undefined+ try {+ const stored = posthog.get_property('$stored_person_properties')+ if (!stored || typeof stored !== 'object') return undefined+ return (stored as Record<string, unknown>)[key]+ } catch {+ return undefined+ }+ }+/*** Returns a PostHog feature flag value directly from the client-side SDK.* Use this for www/docs pages where server-side evaluation lacks full person context.