Merge branch 'master' into dw-data-warehouse-experiment-filtering

PostHog · Mar 22, 2024 · 0fd54db · 0fd54db
2 parents 35f90c1 + 36d1dd0
commit 0fd54db
Show file tree

Hide file tree

Showing 50 changed files with 1,863 additions and 616 deletions.
diff --git a/ee/frontend/mobile-replay/__mocks__/increment-with-child-duplication.json b/ee/frontend/mobile-replay/__mocks__/increment-with-child-duplication.json
@@ -191,6 +191,13 @@
                     "x": 66,
                     "y": 556
                 }
+            },
+            {
+                "parentId": 209272202,
+                "wireframe": {
+                    "id": 52129787123,
+                    "type": "text"
+                }
             }
         ],
         "removes": [

diff --git a/ee/frontend/mobile-replay/__snapshots__/transform.test.ts.snap b/ee/frontend/mobile-replay/__snapshots__/transform.test.ts.snap
@@ -160,6 +160,147 @@ exports[`replay/transform transform can convert images 1`] = `
 ]
 `;
 
+exports[`replay/transform transform can convert invalid text wireframe 1`] = `
+[
+  {
+    "data": {
+      "height": 600,
+      "href": "",
+      "width": 300,
+    },
+    "timestamp": 1,
+    "type": 4,
+  },
+  {
+    "data": {
+      "initialOffset": {
+        "left": 0,
+        "top": 0,
+      },
+      "node": {
+        "childNodes": [
+          {
+            "id": 2,
+            "name": "html",
+            "publicId": "",
+            "systemId": "",
+            "type": 1,
+          },
+          {
+            "attributes": {
+              "data-rrweb-id": 3,
+              "style": "height: 100vh; width: 100vw;",
+            },
+            "childNodes": [
+              {
+                "attributes": {
+                  "data-rrweb-id": 4,
+                },
+                "childNodes": [
+                  {
+                    "attributes": {
+                      "type": "text/css",
+                    },
+                    "childNodes": [
+                      {
+                        "id": 102,
+                        "textContent": "
+                    body {
+                      margin: unset;
+                    }
+                    input, button, select, textarea {
+                        font: inherit;
+                        margin: 0;
+                        padding: 0;
+                        border: 0;
+                        outline: 0;
+                        background: transparent;
+                        padding-block: 0 !important;
+                    }
+                    .input:focus {
+                        outline: none;
+                    }
+                    img {
+                      border-style: none;
+                    }
+                ",
+                        "type": 3,
+                      },
+                    ],
+                    "id": 101,
+                    "tagName": "style",
+                    "type": 2,
+                  },
+                ],
+                "id": 4,
+                "tagName": "head",
+                "type": 2,
+              },
+              {
+                "attributes": {
+                  "data-rrweb-id": 5,
+                  "style": "height: 100vh; width: 100vw;",
+                },
+                "childNodes": [
+                  {
+                    "attributes": {
+                      "data-rrweb-id": 12345,
+                      "style": "border-width: 4px;border-radius: 10px;border-color: #ee3ee4;border-style: solid;color: #ee3ee4;width: 100px;height: 30px;position: fixed;left: 11px;top: 12px;overflow:hidden;white-space:normal;",
+                    },
+                    "childNodes": [],
+                    "id": 12345,
+                    "tagName": "div",
+                    "type": 2,
+                  },
+                  {
+                    "attributes": {
+                      "data-render-reason": "a fixed placeholder to contain the keyboard in the correct stacking position",
+                      "data-rrweb-id": 9,
+                    },
+                    "childNodes": [],
+                    "id": 9,
+                    "tagName": "div",
+                    "type": 2,
+                  },
+                  {
+                    "attributes": {
+                      "data-rrweb-id": 7,
+                    },
+                    "childNodes": [],
+                    "id": 7,
+                    "tagName": "div",
+                    "type": 2,
+                  },
+                  {
+                    "attributes": {
+                      "data-rrweb-id": 11,
+                    },
+                    "childNodes": [],
+                    "id": 11,
+                    "tagName": "div",
+                    "type": 2,
+                  },
+                ],
+                "id": 5,
+                "tagName": "body",
+                "type": 2,
+              },
+            ],
+            "id": 3,
+            "tagName": "html",
+            "type": 2,
+          },
+        ],
+        "id": 1,
+        "type": 0,
+      },
+    },
+    "timestamp": 1,
+    "type": 2,
+  },
+]
+`;
+
 exports[`replay/transform transform can convert navigation bar 1`] = `
 [
   {
@@ -1453,6 +1594,20 @@ exports[`replay/transform transform incremental mutations de-duplicate the tree
         },
         "parentId": 52129787,
       },
+      {
+        "nextId": null,
+        "node": {
+          "attributes": {
+            "data-rrweb-id": 52129787123,
+            "style": "position: fixed;left: 0px;top: 0px;overflow:hidden;white-space:normal;",
+          },
+          "childNodes": [],
+          "id": 52129787123,
+          "tagName": "div",
+          "type": 2,
+        },
+        "parentId": 209272202,
+      },
     ],
     "attributes": [],
     "removes": [
@@ -1689,6 +1844,13 @@ AAAAAAAAAAAAAAAAAAAAAAAAgCN/AW0xMqHnNQceAAAAAElFTkSuQmCC
             "y": 556,
           },
         },
+        {
+          "parentId": 209272202,
+          "wireframe": {
+            "id": 52129787123,
+            "type": "text",
+          },
+        },
       ],
       "removes": [
         {

diff --git a/ee/frontend/mobile-replay/transform.test.ts b/ee/frontend/mobile-replay/transform.test.ts
@@ -480,6 +480,43 @@ describe('replay/transform', () => {
             expect(converted).toMatchSnapshot()
         })
 
+        test('can convert invalid text wireframe', () => {
+            const converted = posthogEEModule.mobileReplay?.transformToWeb([
+                {
+                    data: {
+                        width: 300,
+                        height: 600,
+                    },
+                    timestamp: 1,
+                    type: 4,
+                },
+                {
+                    type: 2,
+                    data: {
+                        wireframes: [
+                            {
+                                id: 12345,
+                                type: 'text',
+                                x: 11,
+                                y: 12,
+                                width: 100,
+                                height: 30,
+                                style: {
+                                    color: '#ee3ee4',
+                                    borderColor: '#ee3ee4',
+                                    borderWidth: '4',
+                                    borderRadius: '10px',
+                                },
+                                // text property is missing
+                            },
+                        ],
+                    },
+                    timestamp: 1,
+                },
+            ])
+            expect(converted).toMatchSnapshot()
+        })
+
         test('can set background image to base64 png', () => {
             const converted = posthogEEModule.mobileReplay?.transformToWeb([
                 {

diff --git a/ee/frontend/mobile-replay/transformer/transformers.ts b/ee/frontend/mobile-replay/transformer/transformers.ts
@@ -105,6 +105,10 @@ export function _isPositiveInteger(id: unknown): id is number {
     return typeof id === 'number' && id > 0 && id % 1 === 0
 }
 
+function _isNullish(x: unknown): x is null | undefined {
+    return x === null || x === undefined
+}
+
 function isRemovedNodeMutation(x: addedNodeMutation | removedNodeMutation): x is removedNodeMutation {
     return isObject(x) && 'id' in x
 }
@@ -218,6 +222,17 @@ function makeTextElement(
     // because we might have to style the text, we always wrap it in a div
     // and apply styles to that
     const id = context.idSequence.next().value
+
+    const childNodes = [...children]
+    if (!_isNullish(wireframe.text)) {
+        childNodes.unshift({
+            type: NodeType.Text,
+            textContent: wireframe.text,
+            // since the text node is wrapped, we assign it a synthetic id
+            id,
+        })
+    }
+
     return {
         result: {
             type: NodeType.Element,
@@ -227,15 +242,7 @@ function makeTextElement(
                 'data-rrweb-id': wireframe.id,
             },
             id: wireframe.id,
-            childNodes: [
-                {
-                    type: NodeType.Text,
-                    textContent: wireframe.text,
-                    // since the text node is wrapped, we assign it a synthetic id
-                    id: id,
-                },
-                ...children,
-            ],
+            childNodes,
         },
         context,
     }
@@ -983,6 +990,7 @@ function isMobileIncrementalSnapshotEvent(x: unknown): x is MobileIncrementalSna
 
 function makeIncrementalAdd(add: MobileNodeMutation, context: ConversionContext): addedNodeMutation[] | null {
     const converted = convertWireframe(add.wireframe, context)
+
     if (!converted) {
         return null
     }

diff --git a/ee/session_recordings/ai/error_clustering.py b/ee/session_recordings/ai/error_clustering.py
@@ -6,6 +6,7 @@
 import pandas as pd
 import numpy as np
 from posthog.session_recordings.models.session_recording_event import SessionRecordingViewed
+from datetime import date
 
 CLUSTER_REPLAY_ERRORS_TIMING = Histogram(
     "posthog_session_recordings_cluster_replay_errors",
@@ -30,7 +31,7 @@ def error_clustering(team: Team, user: User):
     if not results:
         return []
 
-    df = pd.DataFrame(results, columns=["session_id", "input", "embeddings"])
+    df = pd.DataFrame(results, columns=["session_id", "error", "embeddings", "timestamp"])
 
     df["cluster"] = cluster_embeddings(df["embeddings"].tolist())
 
@@ -42,7 +43,7 @@ def error_clustering(team: Team, user: User):
 def fetch_error_embeddings(team_id: int):
     query = """
             SELECT
-                session_id, input, embeddings
+                session_id, input, embeddings, generation_timestamp
             FROM
                 session_replay_embeddings
             WHERE
@@ -76,13 +77,21 @@ def construct_response(df: pd.DataFrame, team: Team, user: User):
     clusters = []
     for cluster, rows in df.groupby("cluster"):
         session_ids = rows["session_id"].unique()
-        sample = rows.sample(n=1)[["session_id", "input"]].rename(columns={"input": "error"}).to_dict("records")[0]
+        sample = rows.sample(n=1)[["session_id", "error"]].to_dict("records")[0]
+
+        date_series = (
+            df.groupby([df["timestamp"].dt.date])
+            .size()
+            .reindex(pd.date_range(end=date.today(), periods=7), fill_value=0)
+        )
+        sparkline = dict(zip(date_series.index.astype(str), date_series))
         clusters.append(
             {
                 "cluster": cluster,
                 "sample": sample.get("error"),
                 "session_ids": np.random.choice(session_ids, size=DBSCAN_MIN_SAMPLES - 1),
                 "occurrences": rows.size,
+                "sparkline": sparkline,
                 "unique_sessions": len(session_ids),
                 "viewed": len(np.intersect1d(session_ids, viewed_session_ids, assume_unique=True)),
             }

diff --git a/...nd/__snapshots__/scenes-app-insights--funnel-top-to-bottom-breakdown--light.png b/...nd/__snapshots__/scenes-app-insights--funnel-top-to-bottom-breakdown--light.png
diff --git a/frontend/__snapshots__/scenes-other-signup--cloud--light.png b/frontend/__snapshots__/scenes-other-signup--cloud--light.png
diff --git a/frontend/__snapshots__/scenes-other-signup--self-hosted--light.png b/frontend/__snapshots__/scenes-other-signup--self-hosted--light.png
diff --git a/frontend/__snapshots__/scenes-other-signup--self-hosted-sso--light.png b/frontend/__snapshots__/scenes-other-signup--self-hosted-sso--light.png
diff --git a/frontend/__snapshots__/scenes-other-toolbar--unauthenticated--dark.png b/frontend/__snapshots__/scenes-other-toolbar--unauthenticated--dark.png
diff --git a/frontend/__snapshots__/scenes-other-toolbar--unauthenticated--light.png b/frontend/__snapshots__/scenes-other-toolbar--unauthenticated--light.png
diff --git a/frontend/src/queries/schema.json b/frontend/src/queries/schema.json
@@ -2567,7 +2567,7 @@
                     "type": "string"
                 },
                 "personsOnEventsMode": {
-                    "enum": ["disabled", "v1_enabled", "v1_mixed", "v2_enabled"],
+                    "enum": ["disabled", "v1_enabled", "v1_mixed", "v2_enabled", "v3_enabled"],
                     "type": "string"
                 }
             },

diff --git a/frontend/src/queries/schema.ts b/frontend/src/queries/schema.ts
@@ -176,7 +176,7 @@ export interface DataNode extends Node {
 
 /** HogQL Query Options are automatically set per team. However, they can be overriden in the query. */
 export interface HogQLQueryModifiers {
-    personsOnEventsMode?: 'disabled' | 'v1_enabled' | 'v1_mixed' | 'v2_enabled'
+    personsOnEventsMode?: 'disabled' | 'v1_enabled' | 'v1_mixed' | 'v2_enabled' | 'v3_enabled'
     personsArgMaxVersion?: 'auto' | 'v1' | 'v2'
     inCohortVia?: 'auto' | 'leftjoin' | 'subquery' | 'leftjoin_conjoined'
     materializationMode?: 'auto' | 'legacy_null_as_string' | 'legacy_null_as_null' | 'disabled'

diff --git a/frontend/src/scenes/authentication/signup/SignupContainer.tsx b/frontend/src/scenes/authentication/signup/SignupContainer.tsx
@@ -22,12 +22,8 @@ export function SignupContainer(): JSX.Element | null {
     const { user } = useValues(userLogic)
 
     const footerHighlights = {
-        cloud: ['Hosted & managed by PostHog', 'Pay per event, cancel anytime', 'Community, Slack & email support'],
-        selfHosted: [
-            'Fully featured product, unlimited events',
-            'Data in your own infrastructure',
-            'Community, Slack & email support',
-        ],
+        cloud: ['Hosted & managed by PostHog', 'Pay per event, cancel anytime', 'Fast and reliable support'],
+        selfHosted: ['Fully featured product, unlimited events', 'Data in your own infrastructure', 'Community forum'],
     }
 
     return !user ? (

diff --git a/frontend/src/scenes/batch_exports/BatchExportEditForm.tsx b/frontend/src/scenes/batch_exports/BatchExportEditForm.tsx
@@ -242,6 +242,15 @@ export function BatchExportsEditFields({
                                     ]}
                                 />
                             </LemonField>
+
+                            <LemonField name="file_format" label="Format" className="flex-1">
+                                <LemonSelect
+                                    options={[
+                                        { value: 'JSONLines', label: 'JSON lines' },
+                                        { value: 'Parquet', label: 'Apache Parquet' },
+                                    ]}
+                                />
+                            </LemonField>
                         </div>
 
                         <div className="flex gap-4">