clean up the last bits

plugin-server/src/config/config.ts

@@ -79,7 +79,7 @@ export function getDefaultConfig(): PluginsServerConfig {
         SITE_URL: null,
         NEW_PERSON_PROPERTIES_UPDATE_ENABLED_TEAMS: '',
         EXPERIMENTAL_EVENTS_LAST_SEEN_ENABLED: true,
-        EXPERIMENTAL_EVENT_PROPERTY_COUNTER_ENABLED_TEAMS: '',
+        EXPERIMENTAL_EVENT_PROPERTY_TRACKER_ENABLED_TEAMS: '',
     }
 }
 
@@ -139,8 +139,8 @@ export function getConfigHelp(): Record<keyof PluginsServerConfig, string> {
         NEW_PERSON_PROPERTIES_UPDATE_ENABLED_TEAMS:
             '(advanced) teams for which to run the new person properties update flow on',
         EXPERIMENTAL_EVENTS_LAST_SEEN_ENABLED: '(advanced) enable experimental feature to track lastSeenAt',
-        EXPERIMENTAL_EVENT_PROPERTY_COUNTER_ENABLED_TEAMS:
-            '(advanced) teams for which to enable experimental feature to count event properties',
+        EXPERIMENTAL_EVENT_PROPERTY_TRACKER_ENABLED_TEAMS:
+            '(advanced) teams for which to enable experimental feature to track event properties',
     }
 }
 

plugin-server/src/types.ts

@@ -105,7 +105,7 @@ export interface PluginsServerConfig extends Record<string, any> {
     SITE_URL: string | null
     NEW_PERSON_PROPERTIES_UPDATE_ENABLED_TEAMS: string
     EXPERIMENTAL_EVENTS_LAST_SEEN_ENABLED: boolean
-    EXPERIMENTAL_EVENT_PROPERTY_COUNTER_ENABLED_TEAMS: string
+    EXPERIMENTAL_EVENT_PROPERTY_TRACKER_ENABLED_TEAMS: string
 }
 
 export interface Hub extends PluginsServerConfig {
@@ -767,11 +767,6 @@ export interface EventPropertyType {
     id: string
     event: string
     property: string
-    property_type: string | null
-    property_type_format: string | null
-    total_volume: number | null
-    created_at: string // DateTime
-    last_seen_at: string // DateTime
     team_id: number
 }
 

plugin-server/src/worker/ingestion/process-event.ts

@@ -78,7 +78,6 @@ export class EventsProcessor {
     teamManager: TeamManager
     personManager: PersonManager
     groupTypeManager: GroupTypeManager
-    propertyCounterTeams: number[]
 
     constructor(pluginsServer: Hub) {
         this.pluginsServer = pluginsServer
@@ -89,8 +88,6 @@ export class EventsProcessor {
         this.teamManager = pluginsServer.teamManager
         this.personManager = new PersonManager(pluginsServer)
         this.groupTypeManager = new GroupTypeManager(pluginsServer.db, this.teamManager, pluginsServer.SITE_URL)
-        this.propertyCounterTeams =
-            pluginsServer.EXPERIMENTAL_EVENT_PROPERTY_COUNTER_ENABLED_TEAMS.split(',').map(parseInt)
     }
 
     public async processEvent(

plugin-server/src/worker/ingestion/team-manager.ts

@@ -41,10 +41,10 @@ export class TeamManager {
         this.lastFlushAt = DateTime.now()
 
         // TODO: #7422 Remove temporary EXPERIMENTAL_EVENTS_LAST_SEEN_ENABLED
-        // TODO: #7500 Remove temporary EXPERIMENTAL_EVENT_PROPERTY_COUNTER_ENABLED_TEAMS
+        // TODO: #7500 Remove temporary EXPERIMENTAL_EVENT_PROPERTY_TRACKER_ENABLED_TEAMS
         this.experimentalLastSeenAtEnabled = serverConfig.EXPERIMENTAL_EVENTS_LAST_SEEN_ENABLED ?? false
         this.propertyCounterTeams = new Set(
-            (serverConfig.EXPERIMENTAL_EVENT_PROPERTY_COUNTER_ENABLED_TEAMS || '').split(',').map(parseInt)
+            (serverConfig.EXPERIMENTAL_EVENT_PROPERTY_TRACKER_ENABLED_TEAMS || '').split(',').map(parseInt)
         )
     }
 
@@ -177,13 +177,13 @@ export class TeamManager {
         if (!this.propertyCounterTeams.has(team.id)) {
             return
         }
+        const key = JSON.stringify([team.id, event])
+        let properties = this.eventPropertiesCache.get(key)
+        if (!properties) {
+            properties = new Set()
+            this.eventPropertiesCache.set(key, properties)
+        }
         for (const property of propertyKeys) {
-            const key = JSON.stringify([team.id, event])
-            let properties = this.eventPropertiesCache.get(key)
-            if (!properties) {
-                properties = new Set()
-                this.eventPropertiesCache.set(key, properties)
-            }
             if (!properties.has(property)) {
                 properties.add(property)
                 await this.db.postgresQuery(

plugin-server/tests/shared/process-event.ts

@@ -121,7 +121,7 @@ export const createProcessEventTests = (
             PLUGINS_CELERY_QUEUE: 'test-plugins-celery-queue',
             CELERY_DEFAULT_QUEUE: 'test-celery-default-queue',
             LOG_LEVEL: LogLevel.Log,
-            EXPERIMENTAL_EVENT_PROPERTY_COUNTER_ENABLED_TEAMS: '2',
+            EXPERIMENTAL_EVENT_PROPERTY_TRACKER_ENABLED_TEAMS: '2',
             ...(extraServerConfig ?? {}),
             ...(additionalProps ?? {}),
         })

plugin-server/tests/worker/ingestion/team-manager.test.ts

@@ -23,7 +23,7 @@ describe('TeamManager()', () => {
 
     beforeEach(async () => {
         ;[hub, closeHub] = await createHub({
-            EXPERIMENTAL_EVENT_PROPERTY_COUNTER_ENABLED_TEAMS: '2',
+            EXPERIMENTAL_EVENT_PROPERTY_TRACKER_ENABLED_TEAMS: '2',
         })
         await resetTestDatabase()
         teamManager = hub.teamManager