:hedgehog: PostHog is the leading platform for building self-driving products. Our developer tools – AI observability, analytics, session replay, flags, experiments, error tracking, logs, and more – capture all the context agents need to diagnose problems, uncover opportunities, and ship fixes. Steer it all from Slack, web, desktop, or the MCP.
Python ab-testingai-analyticsanalyticscdpdata-warehouseexperimentsfeature-flagsjavascriptproduct-analyticspythonreactsession-replaysurveystypescriptweb-analytics
fix(hogql): remove the broken scout filter from team 2 query_log (#129500)
Andrew Maguire610b7f9bf3a6
diff --git a/posthog/hogql/database/schema/query_log_archive.py b/posthog/hogql/database/schema/query_log_archive.pyindex 4184d8da6417..34f1a9c72d8d 100644--- a/posthog/hogql/database/schema/query_log_archive.py+++ b/posthog/hogql/database/schema/query_log_archive.py@@ -1,4 +1,4 @@-from typing import TYPE_CHECKING, Any+from typing import Anyfrom posthog.hogql import astfrom posthog.hogql.database.models import (@@ -14,9 +14,6 @@ from posthog.hogql.database.models import (Table,)-if TYPE_CHECKING:- from posthog.hogql.context import HogQLContext-QUERY_LOG_ARCHIVE_FIELDS: dict[str, FieldOrTable] = {"event_date": DateDatabaseField(name="event_date", nullable=False, description="Date partition the query was logged under."@@ -298,17 +295,5 @@ class RawQueryLogArchiveTable(Table):def to_printed_clickhouse(self, context) -> str:return "query_log_archive"- def to_printed_clickhouse_table_ref(self, context: "HogQLContext", use_logical_alias: bool = True) -> str:- if context.team_id != 2:- return self.to_printed_clickhouse(context)- # Retained trial queries stay private even after new trials are disabled.- # Keep private activity in operator logs without exposing the raw log metadata through HogQL.- # Archive fields are ALIAS columns, so the nested * must include them.- table = (- "(SELECT * FROM query_log_archive WHERE NOT ifNull(dynamicElement(log_comment.is_scout_experiment, 'Bool'), false) "- "SETTINGS asterisk_include_alias_columns = 1)"- )- return f"{table} AS query_log_archive" if use_logical_alias else table-def to_printed_hogql(self) -> str:return "raw_query_log"diff --git a/posthog/hogql/database/schema/test/test_table_query_log.py b/posthog/hogql/database/schema/test/test_table_query_log.pyindex afc1fa3723e5..f0694c49fdd4 100644--- a/posthog/hogql/database/schema/test/test_table_query_log.py+++ b/posthog/hogql/database/schema/test/test_table_query_log.py@@ -1,65 +1,15 @@from posthog.test.base import APIBaseTest, ClickhouseTestMixinfrom unittest.mock import MagicMock, patch-from django.test import SimpleTestCase, override_settings--from parameterized import parameterized-from posthog.hogql.context import HogQLContextfrom posthog.hogql.cost.accuracy import cost_estimate_accuracy_hogqlfrom posthog.hogql.database.database import Database-from posthog.hogql.parser import parse_select-from posthog.hogql.printer import prepare_and_print_ast-from posthog.hogql.property_metadata import PropertyMetadatafrom posthog.hogql.query import execute_hogql_queryfrom posthog.clickhouse.client import sync_executefrom posthog.clickhouse.client.connection import ClickHouseUser-@override_settings(SCOUT_LIVE_TRIALS_PRIVATE_CAPTURE=False)-class TestPrivateQueryLogVisibility(SimpleTestCase):- @parameterized.expand(- [- (f"{name}_{team_id}", query, scans, team_id)- for name, query, scans in [- ("friendly", "SELECT query_id FROM query_log", 1),- ("raw", "SELECT query_id FROM raw_query_log", 1),- ("alias", "SELECT q.query_id FROM raw_query_log AS q", 1),- (- "join",- "SELECT a.query_id FROM raw_query_log a LEFT JOIN raw_query_log b ON a.query_id = b.query_id",- 2,- ),- ("subquery", "SELECT * FROM (SELECT query_id FROM raw_query_log)", 1),- ]- for team_id in (2, 123)- ]- )- def test_only_trial_project_scans_exclude_private_activity(- self, _name: str, query: str, scans: int, team_id: int- ) -> None:- with patch("posthog.hogql.transforms.property_types.load_property_metadata", return_value=PropertyMetadata()):- sql, _ = prepare_and_print_ast(- parse_select(query),- HogQLContext(- team_id=team_id,- database=Database(),- enable_select_queries=True,- restricted_properties=set(),- use_new_events_schema=False,- ),- "clickhouse",- )- self.assertEqual(- sql.count("NOT ifNull(dynamicElement(log_comment.is_scout_experiment, 'Bool'), false)"),- scans if team_id == 2 else 0,- )- if team_id != 2:- self.assertNotIn("asterisk_include_alias_columns", sql)- self.assertIn(f"team_id, {team_id}", sql)--class TestQueryLogTable(ClickhouseTestMixin, APIBaseTest):"""Mostly tests for the optimization of pre-filtering before aggregating. See https://github.com/PostHog/posthog/pull/25604@@ -74,19 +24,13 @@ class TestQueryLogTable(ClickhouseTestMixin, APIBaseTest):def test_simple_query(self, mock_sync_execute: MagicMock):response = execute_hogql_query("select query_start_time from query_log limit 10", self.team)- table_ref = "query_log_archive"- if self.team.pk == 2:- table_ref = (- "(SELECT * FROM query_log_archive WHERE NOT ifNull(dynamicElement(log_comment.is_scout_experiment, 'Bool'), false) "- "SETTINGS asterisk_include_alias_columns = 1) AS query_log_archive"- )ch_query = f"""SELECTquery_log.query_start_time AS query_start_timeFROM(SELECTtoTimeZone(query_log_archive.query_start_time, %(hogql_val_0)s) AS query_start_timeFROM- {table_ref}+ query_log_archiveWHEREand(equals(query_log_archive.team_id, {self.team.pk}), not(query_log_archive.lc_is_impersonated))) AS query_logLIMIT 10 SETTINGS readonly=2, max_execution_time=60, allow_experimental_object_type=1, max_ast_elements=4000000, max_expanded_ast_elements=4000000, max_bytes_before_external_group_by=0, transform_null_in=1, optimize_min_equality_disjunction_chain_length=4294967295, optimize_rewrite_aggregate_function_with_if=0, optimize_min_inequality_conjunction_chain_length=4294967295, allow_experimental_join_condition=1, use_hive_partitioning=0"""