Merge branch 'PostHog:master' into master

.github/ISSUE_TEMPLATE/performance_issue_report.md

@@ -17,7 +17,7 @@ labels: performance
 ## Environment
 
 - [ ] PostHog Cloud
-- [ ] self-hosted PostHog, version/commit: _please provide_
+- [ ] PostHog self-hosted with Kubernetes (deprecated, see ["Sunsetting Kubernetes support"](https://posthog.com/blog/sunsetting-helm-support-posthog)), version/commit: [please provide]
 
 ## Additional context
 

.run/PostHog.run.xml

@@ -18,6 +18,7 @@
       <env name="SESSION_RECORDING_KAFKA_HOSTS" value="localhost" />
       <env name="SESSION_RECORDING_KAFKA_MAX_REQUEST_SIZE_BYTES" value="524288" />
       <env name="SKIP_SERVICE_VERSION_REQUIREMENTS" value="1" />
+      <env name="PYDEVD_USE_CYTHON" value="NO" />
     </envs>
     <option name="SDK_HOME" value="$PROJECT_DIR$/env/bin/python" />
     <option name="SDK_NAME" value="Python 3.10 (posthog)" />
@@ -46,4 +47,4 @@
     <option name="customRunCommand" value="" />
     <method v="2" />
   </configuration>
-</component>
+</component>

CHANGELOG.md

@@ -1,5 +1,3 @@
 # Changelog
 
-Updates to the PostHog project can be found at [https://posthog.com/blog/categories/product-updates](https://posthog.com/blog/categories/product-updates). Each release of PostHog self-hosted is accompanied by an "Array" blog post which details all relevant changes and any deprecation or warning notices.
-
-Find the latest Array blog post in the [Product updates](https://posthog.com/blog/categories/product-updates) section of our blog.
+Updates to the PostHog project can be found on [https://posthog.com/changelog](our changelog).

README.md

@@ -51,6 +51,8 @@ You can deploy a hobby instance in one line on Linux with Docker (recommended 4G
 
 Open source deployments should scale to approximately 100k events per month, after which we recommend migrating to a PostHog Cloud instance. See our [docs for more info and limitations](https://posthog.com/docs/self-host/open-source/deployment).
 
+PostHog has [sunset support for self-hosted K8s deployments](https://posthog.com/blog/sunsetting-helm-support-posthog).
+
 ## Features
 ![ui-demo](https://user-images.githubusercontent.com/85295485/144591577-fe97e4a5-5631-4a60-a684-45caf421507f.gif)
 <p align="center">Want to find out more? <a href="https://posthog.com/book-a-demo">Request a demo!</a>

docker-compose.base.yml

@@ -1,9 +1,6 @@
 #
 # docker-compose base file used for local development, hobby deploys, and other compose use cases.
 #
-# If you are looking at self-hosted deployment options check
-# https://posthog.com/docs/self-host
-#
 
 services:
     db:

docker-compose.dev-full.yml

@@ -4,8 +4,8 @@
 # For more info, see:
 # https://posthog.com/handbook/engineering/developing-locally
 #
-# If you are looking at self-hosted deployment options check
-# https://posthog.com/docs/self-host
+# PostHog has sunset support for self-hosted K8s deployments.
+# See: https://posthog.com/blog/sunsetting-helm-support-posthog
 #
 
 services:

docker-compose.dev.yml

@@ -3,8 +3,8 @@
 # For more info, see:
 # https://posthog.com/handbook/engineering/developing-locally
 #
-# If you are looking at self-hosted deployment options check
-# https://posthog.com/docs/self-host
+# PostHog has sunset support for self-hosted K8s deployments.
+# See: https://posthog.com/blog/sunsetting-helm-support-posthog
 #
 
 services:

docker-compose.hobby.yml

@@ -4,6 +4,9 @@
 # Please take a look at https://posthog.com/docs/self-host/deploy/hobby
 # for more info.
 #
+# PostHog has sunset support for self-hosted K8s deployments.
+# See: https://posthog.com/blog/sunsetting-helm-support-posthog
+#
 
 services:
     db:

ee/api/test/base.py

@@ -19,7 +19,7 @@ class LicensedTestMixin:
 
     def license_required_response(
         self,
-        message: str = "This feature is part of the premium PostHog offering. To use it, get a self-hosted license: https://license.posthog.com",
+        message: str = "This feature is part of the premium PostHog offering. Self-hosted licenses are no longer available for purchase. Please contact sales@posthog.com to discuss options.",
     ) -> Dict[str, Optional[str]]:
         return {"type": "server_error", "code": "payment_required", "detail": message, "attr": None}
 

ee/api/test/test_event_definition.py

@@ -211,7 +211,7 @@ def test_update_event_without_license(self):
             f"/api/projects/@current/event_definitions/{str(event.id)}", data={"description": "test"}
         )
         self.assertEqual(response.status_code, status.HTTP_402_PAYMENT_REQUIRED)
-        self.assertIn("This feature is part of the premium PostHog offering.", response.json()["detail"])
+        self.assertIn("Self-hosted licenses are no longer available for purchase.", response.json()["detail"])
 
     def test_with_expired_license(self):
         super(LicenseManager, cast(LicenseManager, License.objects)).create(
@@ -222,7 +222,7 @@ def test_with_expired_license(self):
             f"/api/projects/@current/event_definitions/{str(event.id)}", data={"description": "test"}
         )
         self.assertEqual(response.status_code, status.HTTP_402_PAYMENT_REQUIRED)
-        self.assertIn("This feature is part of the premium PostHog offering.", response.json()["detail"])
+        self.assertIn("Self-hosted licenses are no longer available for purchase.", response.json()["detail"])
 
     def test_can_get_event_verification_data(self):
         super(LicenseManager, cast(LicenseManager, License.objects)).create(

ee/api/test/test_property_definition.py

@@ -213,15 +213,15 @@ def test_update_property_description_without_license(self):
             f"/api/projects/@current/property_definitions/{str(property.id)}/", data={"description": "test"}
         )
         self.assertEqual(response.status_code, status.HTTP_402_PAYMENT_REQUIRED)
-        self.assertIn("This feature is part of the premium PostHog offering.", response.json()["detail"])
+        self.assertIn("Self-hosted licenses are no longer available for purchase.", response.json()["detail"])
 
     def test_update_property_tags_without_license(self):
         property = EnterprisePropertyDefinition.objects.create(team=self.team, name="enterprise property")
         response = self.client.patch(
             f"/api/projects/@current/property_definitions/{str(property.id)}/", data={"tags": ["test"]}
         )
         self.assertEqual(response.status_code, status.HTTP_402_PAYMENT_REQUIRED)
-        self.assertIn("This feature is part of the premium PostHog offering.", response.json()["detail"])
+        self.assertIn("Self-hosted licenses are no longer available for purchase.", response.json()["detail"])
 
     def test_can_update_property_type_without_license(self):
         property = EnterprisePropertyDefinition.objects.create(team=self.team, name="enterprise property")
@@ -239,7 +239,7 @@ def test_cannot_update_more_than_property_type_without_license(self):
             data={"property_type": "DateTime", "tags": ["test"]},
         )
         self.assertEqual(response.status_code, status.HTTP_402_PAYMENT_REQUIRED)
-        self.assertIn("This feature is part of the premium PostHog offering.", response.json()["detail"])
+        self.assertIn("Self-hosted licenses are no longer available for purchase.", response.json()["detail"])
 
     def test_with_expired_license(self):
         super(LicenseManager, cast(LicenseManager, License.objects)).create(
@@ -250,7 +250,7 @@ def test_with_expired_license(self):
             f"/api/projects/@current/property_definitions/{str(property.id)}/", data={"description": "test"}
         )
         self.assertEqual(response.status_code, status.HTTP_402_PAYMENT_REQUIRED)
-        self.assertIn("This feature is part of the premium PostHog offering.", response.json()["detail"])
+        self.assertIn("Self-hosted licenses are no longer available for purchase.", response.json()["detail"])
 
     def test_filter_property_definitions(self):
         super(LicenseManager, cast(LicenseManager, License.objects)).create(

ee/billing/quota_limiting.py

@@ -14,7 +14,7 @@
 from posthog.models.team.team import Team
 from posthog.redis import get_client
 from posthog.tasks.usage_report import (
-    get_teams_with_event_count_in_period,
+    get_teams_with_billable_event_count_in_period,
     get_teams_with_recording_count_in_period,
     convert_team_usage_rows_to_dict,
 )
@@ -147,7 +147,7 @@ def update_all_org_billing_quotas(dry_run: bool = False) -> Dict[str, Dict[str,
     # Clickhouse is good at counting things so we count across all teams rather than doing it one by one
     all_data = dict(
         teams_with_event_count_in_period=convert_team_usage_rows_to_dict(
-            get_teams_with_event_count_in_period(period_start, period_end)
+            get_teams_with_billable_event_count_in_period(period_start, period_end)
         ),
         teams_with_recording_count_in_period=convert_team_usage_rows_to_dict(
             get_teams_with_recording_count_in_period(period_start, period_end)

frontend/src/layout/navigation-3000/components/Breadcrumbs.tsx

@@ -33,7 +33,7 @@ export function Breadcrumbs(): JSX.Element | null {
             {/* TODO: These buttons below are hardcoded right now, scene-based system coming in the next PR */}
             <LemonButton className="Breadcrumbs3000__more" icon={<IconEllipsisVertical />} size="small" />
             <div className="Breadcrumbs3000__actions">
-                <FlaggedFeature flag={FEATURE_FLAGS.NOTEBOOKS} match={true}>
+                <FlaggedFeature flag={FEATURE_FLAGS.NOTEBOOKS}>
                     <NotebookButton />
                 </FlaggedFeature>
                 <NewInsightButton dataAttr="project-home-new-insight" />

frontend/src/layout/navigation-3000/components/Sidebar.tsx

@@ -145,7 +145,7 @@ function SidebarSearchBar({
                 // Show a loading spinner when search term is being debounced or just loading data
                 prefix={
                     (localSearchTerm || searchTerm) && (localSearchTerm !== searchTerm || isLoading) ? (
-                        <Spinner monocolor />
+                        <Spinner textColored />
                     ) : null
                 }
                 placeholder="Search..."

frontend/src/layout/navigation/TopBar/SitePopover.tsx

@@ -314,7 +314,7 @@ export function SitePopoverOverlay(): JSX.Element {
                     <InstanceSettings />
                 </SitePopoverSection>
             )}
-            <FlaggedFeature flag={FEATURE_FLAGS.EARLY_ACCESS_FEATURE_SITE_BUTTON} match>
+            <FlaggedFeature flag={FEATURE_FLAGS.EARLY_ACCESS_FEATURE_SITE_BUTTON}>
                 <SitePopoverSection>
                     <FeaturePreviewsButton />
                 </SitePopoverSection>

frontend/src/lib/api.ts

@@ -1141,6 +1141,17 @@ const api = {
                 .withAction('snapshots')
                 .withQueryString(toParams({ source: 'blob', blob_key: blobKey, version: '2' }))
                 .getResponse()
+
+            try {
+                const textLines = await response.text()
+
+                if (textLines) {
+                    return textLines.split('\n')
+                }
+            } catch (e) {
+                // Must be gzipped
+            }
+
             const contentBuffer = new Uint8Array(await response.arrayBuffer())
             return strFromU8(decompressSync(contentBuffer)).trim().split('\n')
         },

frontend/src/lib/components/FlaggedFeature.tsx

@@ -4,17 +4,24 @@ import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
 
 export type PostHogFeatureProps = {
     flag: FeatureFlagKey
+    /** What specific state or variant of feature flag needs to be active. */
     match?: string | boolean
+    /** Rendered when the flag state/variant matches. */
     children: React.ReactNode | ((payload: any) => React.ReactNode)
+    /** Rendered when the flag state/variant doesn't match. */
+    fallback?: React.ReactNode
 }
 
-export function FlaggedFeature({ flag, match, children }: PostHogFeatureProps): JSX.Element | null {
+export function FlaggedFeature({ flag, match, children, fallback }: PostHogFeatureProps): JSX.Element | null {
     const { featureFlags } = useValues(featureFlagLogic)
 
     const flagValue = featureFlags[flag] || false
+    const doesFlagMatch = match === undefined ? !!flagValue : flagValue === match
 
-    if (match === undefined || flagValue === match) {
+    if (doesFlagMatch) {
         return typeof children === 'function' ? children(flagValue) : children
+    } else if (fallback) {
+        return <>{fallback}</>
     }
 
     return null

frontend/src/lib/components/HedgehogBuddy/HedgehogBuddy.tsx

@@ -499,7 +499,7 @@ export function HedgehogBuddy({
                             </div>
                         ))}
 
-                        <FlaggedFeature flag={FEATURE_FLAGS.HEDGEHOG_MODE_DEBUG} match>
+                        <FlaggedFeature flag={FEATURE_FLAGS.HEDGEHOG_MODE_DEBUG}>
                             <>
                                 <LemonDivider />
                                 <div className="flex gap-2 my-2 overflow-y-auto">

frontend/src/lib/constants.tsx

@@ -161,6 +161,8 @@ export const FEATURE_FLAGS = {
     ARTIFICIAL_HOG: 'artificial-hog', // owner: @Twixes
     REFERRAL_SOURCE_SELECT: 'referral-source-select', // owner: @raquelmsmith
     SESSION_RECORDING_PLAYER_PREVIEW: 'session-recording-player-preview', // owner: #team-monitoring
+    SESSION_RECORDING_TEST_ACCOUNTS_FILTER: 'session-recording-test-accounts-filter', // owner: #team-monitoring
+    SESSION_RECORDING_SHOW_FILTERS_BY_DEFAULT: 'session-recording-show-filters-by-default', // owner: #team-monitoring
 } as const
 export type FeatureFlagKey = (typeof FEATURE_FLAGS)[keyof typeof FEATURE_FLAGS]
 

frontend/src/lib/lemon-ui/LemonButton/LemonButton.scss

@@ -21,18 +21,22 @@
     user-select: none;
     -webkit-appearance: none !important; // Important as this gets overridden by Ant styles...
 
-    &[aria-disabled='true'] {
-        opacity: var(--opacity-disabled);
-        cursor: not-allowed;
-    }
-
     .LemonButton__content {
         flex: 1;
         line-height: initial;
         display: flex;
         align-items: center;
     }
 
+    &[aria-disabled='true']:not(.LemonButton--loading) {
+        cursor: not-allowed;
+        opacity: var(--opacity-disabled);
+    }
+
+    &.LemonButton--loading {
+        cursor: default;
+    }
+
     &.LemonButton--full-width {
         width: 100%;
         padding-left: 0.5rem;

frontend/src/lib/lemon-ui/LemonButton/LemonButton.tsx

@@ -119,7 +119,7 @@ export const LemonButton: React.FunctionComponent<LemonButtonProps & React.RefAt
                 }
             }
             if (loading) {
-                icon = <Spinner monocolor />
+                icon = <Spinner textColored />
                 disabled = true // Cannot interact with a loading button
             }
 
@@ -160,6 +160,7 @@ export const LemonButton: React.FunctionComponent<LemonButtonProps & React.RefAt
                         'LemonButton',
                         `LemonButton--${type}`,
                         `LemonButton--status-${status}`,
+                        loading && `LemonButton--loading`,
                         noPadding && `LemonButton--no-padding`,
                         size && `LemonButton--${size}`,
                         active && 'LemonButton--active',

frontend/src/lib/lemon-ui/LemonInput/LemonInput.tsx

@@ -41,6 +41,7 @@ interface LemonInputPropsBase
     transparentBackground?: boolean
     /** Size of the element. Default: `'medium'`. */
     size?: 'small' | 'medium'
+    onPressEnter?: (event: React.KeyboardEvent<HTMLInputElement>) => void
     'data-attr'?: string
     'aria-label'?: string
 }
@@ -50,7 +51,6 @@ export interface LemonInputPropsText extends LemonInputPropsBase {
     value?: string
     defaultValue?: string
     onChange?: (newValue: string) => void
-    onPressEnter?: (newValue: string) => void
 }
 
 export interface LemonInputPropsNumber
@@ -60,7 +60,6 @@ export interface LemonInputPropsNumber
     value?: number
     defaultValue?: number
     onChange?: (newValue: number | undefined) => void
-    onPressEnter?: (newValue: number | undefined) => void
 }
 
 export type LemonInputProps = LemonInputPropsText | LemonInputPropsNumber
@@ -152,15 +151,6 @@ export const LemonInput = React.forwardRef<HTMLInputElement, LemonInputProps>(fu
                 className
             )}
             aria-disabled={textProps.disabled}
-            onKeyDown={(event) => {
-                if (onPressEnter && event.key === 'Enter') {
-                    if (type === 'number') {
-                        onPressEnter(value ?? 0)
-                    } else {
-                        onPressEnter(value?.toString() ?? '')
-                    }
-                }
-            }}
             onClick={() => focus()}
         >
             {prefix}
@@ -186,6 +176,11 @@ export const LemonInput = React.forwardRef<HTMLInputElement, LemonInputProps>(fu
                     setFocused(false)
                     onBlur?.(event)
                 }}
+                onKeyDown={(event) => {
+                    if (onPressEnter && event.key === 'Enter') {
+                        onPressEnter(event)
+                    }
+                }}
                 {...textProps}
             />
             {suffix}