feat(hogql): Add feature flag for opting queries into v3 persons-on-e…

…vents (#21150)
PostHog · Mar 27, 2024 · 205376b · 205376b
1 parent ccee1fb
commit 205376b
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 4 deletions.
diff --git a/posthog/api/test/__snapshots__/test_insight.ambr b/posthog/api/test/__snapshots__/test_insight.ambr
@@ -1616,6 +1616,24 @@
   LIMIT 21 /*controller='project_insights-list',route='api/projects/%28%3FP%3Cparent_lookup_team_id%3E%5B%5E/.%5D%2B%29/insights/%3F%24'*/
   '''
 # ---
+# name: TestInsight.test_listing_insights_does_not_nplus1.30
+  '''
+  SELECT "posthog_taggeditem"."id",
+         "posthog_taggeditem"."tag_id",
+         "posthog_taggeditem"."dashboard_id",
+         "posthog_taggeditem"."insight_id",
+         "posthog_taggeditem"."event_definition_id",
+         "posthog_taggeditem"."property_definition_id",
+         "posthog_taggeditem"."action_id",
+         "posthog_taggeditem"."feature_flag_id"
+  FROM "posthog_taggeditem"
+  WHERE "posthog_taggeditem"."insight_id" IN (1,
+                                              2,
+                                              3,
+                                              4,
+                                              5 /* ... */) /*controller='project_insights-list',route='api/projects/%28%3FP%3Cparent_lookup_team_id%3E%5B%5E/.%5D%2B%29/insights/%3F%24'*/
+  '''
+# ---
 # name: TestInsight.test_listing_insights_does_not_nplus1.4
   '''
   SELECT "posthog_team"."id",

diff --git a/posthog/hogql/modifiers.py b/posthog/hogql/modifiers.py
@@ -1,7 +1,12 @@
 from typing import Optional, TYPE_CHECKING
 
-from posthog.schema import HogQLQueryModifiers, InCohortVia, MaterializationMode, PersonsArgMaxVersion
-from posthog.utils import PersonOnEventsMode
+from posthog.schema import (
+    HogQLQueryModifiers,
+    InCohortVia,
+    MaterializationMode,
+    PersonsArgMaxVersion,
+    PersonsOnEventsMode,
+)
 
 if TYPE_CHECKING:
     from posthog.models import Team
@@ -16,7 +21,10 @@ def create_default_modifiers_for_team(
         modifiers = modifiers.model_copy()
 
     if modifiers.personsOnEventsMode is None:
-        modifiers.personsOnEventsMode = team.person_on_events_mode or PersonOnEventsMode.DISABLED
+        if team.person_on_events_v3_querying_enabled:
+            modifiers.personsOnEventsMode = PersonsOnEventsMode.v3_enabled
+        else:
+            modifiers.personsOnEventsMode = team.person_on_events_mode
 
     if modifiers.personsArgMaxVersion is None:
         modifiers.personsArgMaxVersion = PersonsArgMaxVersion.auto

diff --git a/posthog/hogql/test/test_modifiers.py b/posthog/hogql/test/test_modifiers.py
@@ -7,7 +7,11 @@
 
 
 class TestModifiers(BaseTest):
-    @override_settings(PERSON_ON_EVENTS_OVERRIDE=False, PERSON_ON_EVENTS_V2_OVERRIDE=False)
+    @override_settings(
+        PERSON_ON_EVENTS_OVERRIDE=False,
+        PERSON_ON_EVENTS_V2_OVERRIDE=False,
+        PERSON_ON_EVENTS_V3_OVERRIDE=False,
+    )
     def test_create_default_modifiers_for_team_init(self):
         assert self.team.person_on_events_mode == "disabled"
         modifiers = create_default_modifiers_for_team(self.team)
@@ -23,6 +27,9 @@ def test_create_default_modifiers_for_team_init(self):
         )
         assert modifiers.personsOnEventsMode == PersonsOnEventsMode.v2_enabled
 
+        with override_settings(PERSON_ON_EVENTS_V3_OVERRIDE=True):
+            assert create_default_modifiers_for_team(self.team).personsOnEventsMode == PersonsOnEventsMode.v3_enabled
+
     def test_modifiers_persons_on_events_mode_v1_enabled(self):
         query = "SELECT event, person_id FROM events"
 

diff --git a/posthog/models/team/team.py b/posthog/models/team/team.py
@@ -357,6 +357,25 @@ def _person_on_events_v2_querying_enabled(self) -> bool:
 
         return get_instance_setting("PERSON_ON_EVENTS_V2_ENABLED")
 
+    @property
+    def person_on_events_v3_querying_enabled(self) -> bool:
+        if settings.PERSON_ON_EVENTS_V3_OVERRIDE is not None:
+            return settings.PERSON_ON_EVENTS_V3_OVERRIDE
+
+        return posthoganalytics.feature_enabled(
+            "persons-on-events-v3-reads-enabled",
+            str(self.uuid),
+            groups={"organization": str(self.organization_id)},
+            group_properties={
+                "organization": {
+                    "id": str(self.organization_id),
+                    "created_at": self.organization.created_at,
+                }
+            },
+            only_evaluate_locally=True,
+            send_feature_flag_events=False,
+        )
+
     @property
     def strict_caching_enabled(self) -> bool:
         enabled_teams = get_list(get_instance_setting("STRICT_CACHING_TEAMS"))

diff --git a/posthog/settings/__init__.py b/posthog/settings/__init__.py
@@ -96,6 +96,7 @@
 
 # Only written in specific scripts - do not use outside of them.
 PERSON_ON_EVENTS_V2_OVERRIDE = get_from_env("PERSON_ON_EVENTS_V2_OVERRIDE", optional=True, type_cast=str_to_bool)
+PERSON_ON_EVENTS_V3_OVERRIDE = get_from_env("PERSON_ON_EVENTS_V3_OVERRIDE", optional=True, type_cast=str_to_bool)
 
 # Wether to use insight queries converted to HogQL.
 HOGQL_INSIGHTS_OVERRIDE = get_from_env("HOGQL_INSIGHTS_OVERRIDE", optional=True, type_cast=str_to_bool)