From c15ab5489544c72fe629906f6491a82cb0afba5a Mon Sep 17 00:00:00 2001
From: Marius Andra <marius.andra@gmail.com>
Date: Sun, 22 Dec 2024 22:36:22 +0100
Subject: [PATCH 01/15] feat(cdp): snapchat pixel (#26890)

Co-authored-by: MarconLP <13001502+MarconLP@users.noreply.github.com>
---
 .run/PostHog.run.xml                          |   2 +-
 frontend/public/services/snapchat.png         | Bin 0 -> 7164 bytes
 .../src/lib/integrations/integrationsLogic.ts |   2 +
 frontend/src/types.ts                         |   1 +
 posthog/cdp/templates/__init__.py             |   4 +
 .../templates/snapchat_ads/template_pixel.py  | 269 +++++++++++++
 .../snapchat_ads/template_snapchat_ads.py     | 368 ++++++++++++++++++
 .../test_template_snapchat_ads.py             |  73 ++++
 .../migrations/0489_alter_integration_kind.py |   1 +
 posthog/models/integration.py                 |  20 +-
 posthog/settings/integrations.py              |   3 +
 11 files changed, 741 insertions(+), 2 deletions(-)
 create mode 100644 frontend/public/services/snapchat.png
 create mode 100644 posthog/cdp/templates/snapchat_ads/template_pixel.py
 create mode 100644 posthog/cdp/templates/snapchat_ads/template_snapchat_ads.py
 create mode 100644 posthog/cdp/templates/snapchat_ads/test_template_snapchat_ads.py

diff --git a/.run/PostHog.run.xml b/.run/PostHog.run.xml
index 32624c2ec1c8f..4d02e04919841 100644
--- a/.run/PostHog.run.xml
+++ b/.run/PostHog.run.xml
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="PostHog" type="Python.DjangoServer" factoryName="Django server">
     <module name="posthog" />
-    <option name="ENV_FILES" value="" />
+    <option name="ENV_FILES" value="$PROJECT_DIR$/.env" />
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />
     <envs>
diff --git a/frontend/public/services/snapchat.png b/frontend/public/services/snapchat.png
new file mode 100644
index 0000000000000000000000000000000000000000..4fd5486e6dd774947906056b39e002fc2fb931df
GIT binary patch
literal 7164
zcmc(DcTiK?+inmLX(CNJIf6<PkSaY#Jb-|JpaRk&BGN>pNzj-`??kCb5D*YTk3s^d
zkO-k1K?o3vf<TIj^h7CJ2+7U)zB|9U|J`ryKX=W%d-lxUv)22p_jxPl6K4*T4C49!
zy*Ted;zvM_L63QPR6vKsd3eQnIDI@-AP^7#f2#)i-;3uEFCYJ5fg^%K!pA^|czAga
z@$vHW^YL;2e8l|*;uGhWIH7m`u%xTMfJ&s4e!|nrBdXS~d!*gQ87B>HMkNXg9hZ@n
zlRtG@O<hCN(8&0liK*Fzzie#nF4{X>xq8jr!}GdVz^%aBLBS!R(J`_2<6!X*l9E$W
z)6z3C^YRM{i;Dk#R#H{{vZfYYSKrXuhQ+mabiR4pOYG|(82snM&;)sMYI^3==UFO^
z{`K4Ur60>H%%8uuws&@c-+MeD-v8Y6e*^kI@Q8Eq9OC2S<rDZ956_`EuJDTU@t@E;
zEOFjdz&}z_ML*$)l=aif*FA!&25t=Ln^EIJ$4?qkPci?6^k0bnXMhs_pAh{A(0}l7
zW<esnJY0kEii02^_IvfJOb+OA^xnTOp#OnLMBG}eeIezM#kzk`h398~Ea!U%l<xn@
z@?hxpit&8<#~&#H+l01_YwK(p%lI1Dwm++IV;*f?IY+Ge;cix5e^y|)?dH`PN>INp
zV1{7}=1{cV>6aKe#p`0sTv@de+3iI>mf-};^2I_^IM&4<(pPaDW_R^XqP4xf+W4Bn
zT|qYm)m@}8BFD-M7`OH$h`=@I&bq_PBNNS~-`?0fxUQ&WSF)v6M)y<D$O*<yQkc)T
zrd!H$*?#6`L#@-*xr0>3&-<azzn9sTHBG8~nOI!77ZQP+Wfvs~nCv|gqdP)JP`yaN
z48;~qVM<<WCtLU-AaJQ%+INN9GZv2+Lu5b3HoCn3ueT{nL>CDd*%g~13;J1$x?kx@
z&}<^^k|>x#R1yRm^muDAg9AEbr4E2;i;rWYJ_OP*Jg`(^pPAd2hO|;=e3+>h-F~Y1
zTK@V2D@=rc!)FQijR|9mKw8@PyFm#5vTGkuN%fGscOU9UcvW5UJ>Dt)>-H)RMy*@&
zbZH7S((2Z>H6es)p`}lb-H2|&=!f5U{prqMMfg!^51eCH{m|JGZ{IrX+fUnX)df^l
zpRU><lunXE&@%U%_Po*mZ0nSdoUO{#0J+*o{YO0dDj1iMb4k<+mgLNiH;}aN0C%#T
zQemvQ?|~C6WWu7fjiBiqki_<;75E4MzEoEIWVZRBPjW?mqwdvcjIMCV+v(On-Wa<Q
z&&|cMu5ds-BeR%vLNEt3m&O*va6o)p6Go+F<`;p4mf!~qHT*CA=hzaET!_@xX0n+v
zE>hSumlkmp7I9(b`zr&xziq1#ua0%(HF7{cj|AXC!-%I)d*wrnMXPHS!jqUBn$DRV
z!K-L@g4n%<qwPW2!*svWY{uf8^s;|c{LLFvmn<STa2lFVQdmdTMl=KEjI|W(3TJ!@
zf}^$SrkYP3nd<Pc_X{-+b-KP>--GP2B2e-P?E);t^Gx|owvZ$T#IFJn=v-eJmXY5<
z*RZr0#mR@39}MQil<B$#V_0eo1G{Pe$r!Oz=n)nqmN)n<x=%RAz?&(S9b2kot8i;-
zJ7x-g1<e5kazH!;N*aM-&jEd&J5Sz%q;Wv6Fl!u8y?tPqQrChCP)2EV$@V)tdFvWf
zf7OlY(tnug+-T9EuTgTbvS@b5R5r`o+_Sy6q8ch>B?|*n28qZ+tdl@EbrmcOw*msG
zx?(Va9xEj>-E-X#DhxO};>Hbqt)#DAb{E!Czwpoby!h;5NrMr?mW8y09}rCrs5Lw3
zj}I{K)59ilsjW=}6)LM#&`x(K3XT@F<1fB()-zb$mFR!3GuW-#w#-Pj#o?ZPO=zZD
zQ~}|6!*rwH%a!SRGhC?sXpL810oru<y7Bz(gWq?skW-LgG2ny;OCoIN$(WJ0%pmgB
z;`_2gD?76nUobs-T?D;ZGR)d%Rx>|!4Y_1u=|zb8KGVJxZD>53{UG=6pQx>Fs}+^;
zbIknx7%qj3AmL!Zm`EEf-j8MXAdka6n2tNf({PuUFeL3<3jAj6_eY24uHc1hVFEkJ
zV}`*^a0rbg086zC*Xmi6#d?d1U1xAW=`HKn-`XtG=J_8T3o0CtgC>&$LRIjwc=m1K
zGC(B*Ov}v*!@w<oZc2m%%ba<?I68vAmsAC`U8=C}Ea5LVl~C9hynA92JB)*x4PI$$
z!za+o7tZ+r`Kg`A?5Hy{sV0r5hdYzf+PakP91hRF{mIMo%e%8ZGw$_i{r+LSF)P+y
z4*DU^1$6m>8o7RZGwD_T#w!@>rXN!^MkZI$YH|avvm-H&u8cRInHv8M-4{iCS`_Ah
zA|RjhsTJ$z7=;_!T@d<+84On;vSQG0)j@$M1h=&Non@Tv9B+78f=V;8$&=NYHla>!
zWnjCbru9M^yqh0ILi;ya^38NHS=K4w1DDmu4pQK*bsSKz7fY9!Q=EP0rpT%^I+G<$
zcS2GKsEzgTXPE;=edI1ROX{%cqtoM^S{nKL))-)HF9dcXVbA<P1^yR<c&gqDBl-<s
z9gpbU=ynP7LWxBxLsLhizDPf4A!E{q{WFR@JS1H;Xn_f_U*9ws6RJBSjLIYPZ!inv
zA9Yo0#?IRNHOs86IGw7>{-zw0w;SI)u~wC-_50$kb*B1@L;nhDhPAV8mGtI)6>6sA
z(vsC@Io9B0ELtI2Yd!XN<JKb!{6X>#0u{~ysr`mrV3OHFWn6&O2hWj|qG`4`gOqCl
zp}Ay16fBUnE;O(RT$K^HQ(FDyI?Qch!`GZGv8Vv6aQDuFhy;7=6?RXTRrVjQXk3;5
zHdVNPeVKXP^UI>z&*KD!o2VFDD4M(VDhHJ4j~IK+(www9>IsC=cGu91S}slZ2D8H9
zfu*FQ@JOaW`pM}Nlj||QJXIatsQ#Uz@1t}V$Mn<WuTN|9Oatb22U#+X#0BGn3?${%
zVrvjfnwKWiqkx>{-SKbDr=EO(O51h}-e8%EW#W&EMmtTjl|$pqQi>{H23x7TBkP9a
zPq558r`NwuY(tNE4{KhCK1gfq7uZhP*8<S&BlBE6pOCE-*i(=rcm=pHP|tLsbY!s9
z=vi9LaqmmOiI5Q8goSfso7Gcr%P@MWr8ss`+WWkJ({;fua&#RGMa5+3p7C3<#n0Tx
z9wKaq>>FEUEA!p+NVbxPZTD=21|d#I#vOJ~lZf;t>2+qBh}ees6<+$468v>bFHGZo
zQ?Xo9O_6)y9ll@o?mcg(!aAp8NWCUx^N~ooTyxDnBS(R>J|o*i^zg_Lq)=Cb;g>IT
zwUgv;yM=i;(p=r%In~YfKes=SX!cyXu1*$8{rUL)6K9&e(r}cs7;g(mPBGR<8(C+6
z{nY1^*f1O1#@D%xxp#4QXI?W!=NI<~(80a)uEW_n7r|XwavO0ipk2%E6^GQoA<Vu`
zlK>p^NA72zyP&TUdfBwUQ9rK(g4_$U97j@$!3+;5pn)0)K^zN($~7TQumTTi5egxA
znF+Xm1f?hB3;~<MjU}UPM(fil7~HomjVj-{X6*5c-@U6%pQ&c_uqPmtA`Xb*3H?0B
z7AmB2Kr%gyMO!AA2+2Yo)xKi{QG)-$teGyWTPeaTPwC)^{<KX&Anl?S8ffdq)L|c7
z+n${bdC-#8;1m|t7;@I8F2tiGZHxoLo$GS}RCQV6GDKw)V4c31g5*WWvfKbd3#@Tq
znyti$NHm1VBPJ@8EUwX%+<$q_<P(X|M~?mBl|HK-ac<Dil9rAaaDB$qx5dK9_}UNJ
z-Oo9o;bN8oi2_cC;?A+8W_Gv-C6>d&DBB&}<g{-Dd}8@dSm;uf4o!Xrtmyp}$KjDx
zuuQQuwrr8C;eoj~>it{Wr^fH-qIPy<%7o$OvC!kk&ZCzH-4Z9rteS&bh|MC8Nky-&
zB>Rb?i_mjZTCo^o!>iR<J$~9aM{!A^XtZ4TH1)xo)2h-Ijk0ZlYQ^J4lKgi1Xg{2V
zSD$l{a<^GUTu=N$nBCc)K+pRPl$EIpZ1vikGLuQSf>q6@_C412&dzR;*m$og@BOGH
zwZy}=20v`=Ciix>PG^QL1*_GA%JFISmLI;B<KL`0V}9SNA0F9wS)Bi{S$W^Laju3m
zf2DgXbfhtc-0&!ZaJR=s>gs=0M3>`bmntqLZP6=;1nVOv)np9x$Af*OkH-+9U2VN$
z-xARaIUEbgt-u!N%Jd)v+Xx+F*sO<^R&*bxT{is6BmR+rGOF%jSk%X??r3Ot;^+#+
zR({TfycVu&WEtj0Hhkw;`VSkG0`q{-FL6NX)Lf|{1Dz8zi(d+MJOy8$*&b~-*ZZhf
zxDw?`q~7}!t2x!+G~d~)(W_Tz-$~9Y8R~vu^1w*zrY5=Cw!mlQYQ51BTS4<T_Umy~
z8#^->rV;vpH&rbgF9Z8UL@FCXc!4a+`ckUVLsa@6w6D?fGzawFuGcK^<=djyNZQ{x
zoY@_Dzo$VF#%P_I=##oN3a)itq=;BP{Taq@4(KqGCBmo}AOO0gesC`M)j$~?lLme*
zv-SgV7AUaO>1c9^XoQ<G%hMWJra%Z|*SmZ2E@H7R1aHpt<#Op*mn9V??pVM035M($
znrS7~1MxVXAiC~)4cGflazIHa{K*BxAoP`84+kU;S2%c5?9u9yS*|k^D;OR#S0=6#
z@TPs5o3%(8UOxIiN{q8aB1Jte0w*Z-Mr9sQLh@l3xsi}C<FbPhZa6*zp*(}~akBup
zb(33b1uZ5&W6GpQY!vq+Wf5mWy<*Ie8Td0S+qc-v>D@lF0`aaThcWDMFxi$7loIf^
z6USIc;*0!X$!>et9J*I=;J_XMR|#Z5Z4qL$yMHhpEe3CNCZX!TwN_K{V#f73|G)wS
zQu3RAi3~}Fxex0p`sU=Jt#NnwRxfD3ciY3v=t;jeTK0#C(4AF!gFG`0?-@?kQLk2?
zxmEvj6kFPgb_qFS;r2cI_T2N*{MK&~TX}l8`(N|S^5@@`+gWUz3`B3$t5*>wg-_kW
z+Mk4*Ty;yln$TkkqSv06BmEJbL=vb}TJcinW%Uy%?Z`uL9)=eCs2*dp4+W@)7iZy5
zvimEr&~&^4>q6UPtYw@}2l)<Ljsxm7^`}@~AsVch#V{A<07t4=UyjkHg%efj@Xw)b
zmSA+qnJ~q@S^M~dIk*91hDZ_s1bVIH0jDY$gjgZ6g%S&S1(UI1@D~-MfzzbkUtWW;
zFFR7TWBx*2G}E4c$@Kf|^Qo~1DYc3SeAaTEWW=>Kx2Q|J%97_kUn4%wEb_BY%%cS0
zwv585-Apz=+`o;S?>cQI2V3!$!aYS}7e(IAB(PlhjAx;_EOnjm0Zf2&QH_6OAWc-p
zhJa&pX&giV)FCV>7q;jMkXFm?gD~7&63cafvVDV)-8lC}L6(0tRHxGFDK)0-pD9St
zX2yf(mtoN~wa3;D#jS81ruKIfO-x`o%5WQb*tsp3j4b4Uu){xMY0wFeR9IMM*BMge
z@6?CyJMV;_@ksUjI19T|oc^k?;UH)qs#=+janbB$-WGSj3FY+-6tuyc$9o4A?8Fm^
zROVt_kA+RrhsK%8+#1>O{-~eyLaWe%Kv5;LR@Z_BWvALaw&Lvl$f!s*69Oidi@}$k
z=TB$;ZrgD_Xhs}j&vG5l0>WI{iDvdGn*k3oKEBI&KBeZ(s@{yvbnI063R{X9l(x->
zy3E+kFs!he-`HBMi7A==PIe`?;6!zHM%nabGY+U&=Op#xujJ@2<WyLx=0|<2KR)Oc
z{$wqxjod4IWt!`oOLQV*QU?6>#8X10>zzzSrBz;*%uYw_3Q5<|G_EvTztkMBm)4B^
z<9DSAt~$%RHZfBjb8Pb8xq*u_q!_$}mS*j8{jQI|aN>Y+!Hmn$&tcSg(%QNZkWVXK
z`%Q<60}EtoLN|_l7oiG7^jj%)jBW3O#r&W?UdtnNOKI!~#C6PYe>E!@mt`88V?0ZZ
zbu3i~L;bLQ^4M0);UKIBEYq3)zCz06T>oA1)I%M|?%fT%0#54vUJwY?8F20Mk2FR2
zKOP__S6;jPQUA+rU4FB_A7J&Qq+_9CUWG90mv9zIx4PuUYgrLH$m{+qSHCY~(E@T0
zFFISyI1Pkq*OuJ3Z}eg7b3l{|BqPQNwZ_lbe_!z$v);{ZU00{9_-z=egN}@x>H2+3
zm=%%g{_5%SSbq%^mepU;wv@XL*X6@&cOOr>%7moHK;-8z8Ac&3n;w_i;;ZeEcw};g
zw1pV6gX%$qW-lH!Dwshi!#x=?$yO&}3O;9@ZpB6%0T%y!%~VT^m1%qDxzY6U-2_hI
zdSKhTiyO_SL$q50>}j#!G$`Xr1fT{bf&mTa+As~7U}fCZ#wgC7egx@*3gOS7)7Ee!
z(bUD97~9VLOI?Cm-q28Gxv3LxyT>g&UU-MPBkzuHD`aKaYj10ro6^}qaBh>qN90D}
zQb?eSXb4mo83dX8J{pmN6k8{>;=urv2*sk)n=H=N{wVrse=0Zs1>i`7CfsTr!*=%N
z?1T&1B{{b)jN4`$`?9#Ty%lj#y8wa>_DUOo#XC`{7LxQkM~ywt45oIX(<?;|8z)v;
z!{CdjNP3?XF@ov6H*3tWD>oV(S35N)Z#V9TN)m52B2>%nxrY_s^tl%kcH1+=u0;BW
zTNkylTeF~2!``r2=hmB3$otbF$ZF3ROF5VE1h#D%bg7K7$rk2zb^Mjw*y6@=VGI%p
zfEEX|wqMT*1MDzgv{TTi^(`@e06LiG)n`3i$Fc+(8Otib1*Y=P(fRV9TmrK-aj%(5
z#CSat4J;~B!fqnmMgh9IED7XJ4Ws=TO^lEInFA7li#ParS1$s>bX3M2gdmIqI{!{6
zmF_Z$1*aP<AD?OUGDxqP>^j#F#s-&M64t)CZ12xby`^~J3Df;bA_)jE8|q9`{TQ-;
zhhXx-Ktv~`kX}FE0zVDmcgM?!OREoQPc)i4=sS<<JAQ4v+?-Z#X7ppS+WjcG#!VvS
zqPbd#wY`JRh`C`|$s^Z24(O83-ydQ@H}X6|`uYYWIRRD6H<&^2Y!+L1lWW`ZgMu#I
z`c=H{!7Kc6*2S4{?fETI8WI${Dwb0Ynb~-MT1!~zT#wATJ)Qhh148|EKu4dl;@DJS
z-)vLh{fcjn17L=41)!tLl5V8wX0X8AJ&OR*c!mHaH31$ohf=!mlFLZuwJx0><6qzx
zfX_^`dAuCV(d!-76SK~erYN0RosH2SzWWxPsd5dU2g}MZd6=vZk2n_T7hiC1+NSvY
zwZSFRoq*&a{g0=NCj%^O&B5Mcsa0q-*(=fY%JD;IQ<hFXv(33<b8)=Vp(eELev0Ph
zLWex$e6nQzZ`J*2V4q2%lGZ*m0%#qBn^|68N@R%Oqy;{vTAz#J3gbGde*QWvf+&A$
zwy5%;qIOp6%Szm?h9HiNT@C!Txry#*OK)`Qh9n>X^)!|u@!wWY4~V2AKV|K3hXsj|
zp#)h9@FuVhc5}`bSf=djW-A-M&bpFFcfc_rj}d}^@?f7lG=&vg(;s)bno3YuVH-`R
zC2!K5{`7RxZXJmr!FJh#zFg*LA!hs(C#@ve<i(EB3bkIaV(CSThtvou#5h}h25wLn
z^2E=3<q*l6;X)+v%`UT5+7f@x3U_YZE^^X;IOlD9uSyo3wU@!wDhAO57DiIaAZ=<1
zgdkFyzIWJOdwzI)1J?v)#%Tf7Ko%`7XM1>H5`La0>gk2+|0wU}JhtqoIMx!Y{bw*+
zfgDq2<=FU!QvN;SSKG4IzB7xT5tRIcZec`ImS?u*{89{>y5|ESTG((vg7LSNrNTyA
z!pnm^6;B7IqSGp`yH-2uR;trqPc$7A)Q#1+ck5z4z|;&szE<p<HER86apRljRLCj!
zaQjmZWg0^U-wW=3nZ2CpHIJ?6AuuA)EJ+MqjU_p}W6C_9#AIK@Vz@JD1-7bMzhxZt
zTWxhjLl1*|se^&fr#=!OzOC6#-Zk@G%-U$e{*Hx6;tQiA0|HLY-p}svh+dBV2MMbO
z@g|JLC?{nfO{z69#Bo4p5e5LJ4{ri1?PqI7A}0g-ECNa#^#{j?&;IQF_UU48j-s+K
zZ$h={WW%dYMS^Hb&v=na^BpJ8%hw`}8r`3-kapHOc<i)#{28)wYK~$8vO{-&l}1Gs
zERjpx^22pw{l@LDt8i1{$D@?0Omz@fc#a6v?XZsOTcz=;cFXcT&+Ss&L#9RMJ~J6~
z@X~^Yu1yuSKMX@VZiZu>v?Ukao3Qxy&H5#R6haDa1k6x!qN$kvMG#;|i{r**N$*nM
zhdt${V=<c&K=c(<*qMmvn$Rac-j8ZU`<rzuJvY~0UdtPWotiU5l9mP_fKl<k!)tTz
zu4&eZa3-1J6Ibl!3l?J;0#Ab)fSXg_f0tXHa|DX1B>9C9#$mpfdMm%IGkXpHx_q4Q
z(o1UxDvW<xZUWQTP6s?_5i<AO6=aM&WQqgj+D`<^z8!ba#H*d|GyClXw@%D4@@f%^
zy()n+!diT}?^O8R9kwPda;d6WZZdHx@nPMlMO)@pF%4-7=0{Ryz`&{9-m<7+U*_Fn
zW+Q#(lTN_9tUrN9ro_TvZ?w}fZMn%9Nb0OW;;pHGg%`M*g_<3WVm+T8L+1}r0tX~!
zr2q&}b(3PiX#`=GG&Ld(!N=$?@dO_B;DyIx2qLfm8?5tR#_~F-@UVcpKHt!VH{&;M
zX<L5XmHg-9e804^`oRg-9cBY8j#iNY_a4B$Dpc}O7BCqJBWd(Z=S3FYQFb{$HpIZy
z9H*>a?&+;g`Wki5LG}GNx!c}x30wk9<YCdy&#!(h8j9{PY>o?SpPF-CZ-0E$1nm4}
zduw%(18NE81*6?uT<T3X9c>WCE5;>1)|&Aor;Uwv=Uv>4`vc<+kMNjq!kc%vA0^P7
UA@!;k{x(vVdHydV!1?^Y074BUGXMYp

literal 0
HcmV?d00001

diff --git a/frontend/src/lib/integrations/integrationsLogic.ts b/frontend/src/lib/integrations/integrationsLogic.ts
index dd5f28959706f..3e83f31c017c3 100644
--- a/frontend/src/lib/integrations/integrationsLogic.ts
+++ b/frontend/src/lib/integrations/integrationsLogic.ts
@@ -10,6 +10,7 @@ import IconGoogleCloudStorage from 'public/services/google-cloud-storage.png'
 import IconHubspot from 'public/services/hubspot.png'
 import IconSalesforce from 'public/services/salesforce.png'
 import IconSlack from 'public/services/slack.png'
+import IconSnapchat from 'public/services/snapchat.png'
 import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
 import { urls } from 'scenes/urls'
 
@@ -24,6 +25,7 @@ const ICONS: Record<IntegrationKind, any> = {
     'google-pubsub': IconGoogleCloud,
     'google-cloud-storage': IconGoogleCloudStorage,
     'google-ads': IconGoogleAds,
+    snapchat: IconSnapchat,
 }
 
 export const integrationsLogic = kea<integrationsLogicType>([
diff --git a/frontend/src/types.ts b/frontend/src/types.ts
index f587d1b4b8398..4b218bd90f0f9 100644
--- a/frontend/src/types.ts
+++ b/frontend/src/types.ts
@@ -3759,6 +3759,7 @@ export type IntegrationKind =
     | 'google-pubsub'
     | 'google-cloud-storage'
     | 'google-ads'
+    | 'snapchat'
 
 export interface IntegrationType {
     id: number
diff --git a/posthog/cdp/templates/__init__.py b/posthog/cdp/templates/__init__.py
index 57855bb7ca96f..fd2f988a8df72 100644
--- a/posthog/cdp/templates/__init__.py
+++ b/posthog/cdp/templates/__init__.py
@@ -47,6 +47,8 @@
 from ._siteapps.template_debug_posthog import template as debug_posthog
 from ._internal.template_broadcast import template_new_broadcast as _broadcast
 from ._internal.template_blank import blank_site_destination, blank_site_app
+from .snapchat_ads.template_snapchat_ads import template as snapchat_ads
+from .snapchat_ads.template_pixel import template_snapchat_pixel as snapchat_pixel
 from ._transformations.template_pass_through import template as pass_through_transformation
 
 HOG_FUNCTION_TEMPLATES = [
@@ -92,6 +94,8 @@
     salesforce_create,
     salesforce_update,
     sendgrid,
+    snapchat_ads,
+    snapchat_pixel,
     zapier,
     zendesk,
     early_access_features,
diff --git a/posthog/cdp/templates/snapchat_ads/template_pixel.py b/posthog/cdp/templates/snapchat_ads/template_pixel.py
new file mode 100644
index 0000000000000..24091ca16f7b8
--- /dev/null
+++ b/posthog/cdp/templates/snapchat_ads/template_pixel.py
@@ -0,0 +1,269 @@
+from posthog.cdp.templates.hog_function_template import HogFunctionMappingTemplate, HogFunctionTemplate
+
+common_inputs = [
+    {
+        "key": "eventProperties",
+        "type": "dictionary",
+        "description": "Map of Snapchat event attributes and their values. Check out this page for more details: https://businesshelp.snapchat.com/s/article/pixel-direct-implementation",
+        "label": "Event parameters",
+        "default": {
+            "price": "{toFloat(event.properties.price ?? event.properties.value ?? event.properties.revenue)}",
+            "currency": "{event.properties.currency}",
+            "item_ids": "{event.properties.item_ids}",
+            "item_category": "{event.properties.category}",
+            "description": "{event.properties.description}",
+            "search_string": "{event.properties.search_string}",
+            "number_items": "{toInt(event.properties.number_items ?? event.properties.quantity)}",
+            "payment_info_available": "{toInt(event.properties.payment_info_available)}",
+            "sign_up_method": "{event.properties.sign_up_method}",
+            "brands": "{event.properties.brands}",
+            "success": "{toInt(event.properties.success) in (0, 1) ? toInt(event.properties.success) : null}",
+            "transaction_id": "{event.properties.orderId ?? event.properties.transactionId ?? event.properties.transaction_id}",
+            "client_dedup_id": "{event.uuid}",
+        },
+        "secret": False,
+        "required": False,
+    },
+]
+
+template_snapchat_pixel: HogFunctionTemplate = HogFunctionTemplate(
+    status="client-side",
+    type="site_destination",
+    id="template-snapchat-pixel",
+    name="Snapchat Pixel",
+    description="Track how many Snapchat users interact with your website.",
+    icon_url="/static/services/snapchat.png",
+    category=["Advertisement"],
+    hog="""
+// Adds window.snaptr and lazily loads the Snapchat Pixel script
+function initSnippet() {
+    (function(e,t,n){if(e.snaptr)return;var a=e.snaptr=function()
+    {a.handleRequest?a.handleRequest.apply(a,arguments):a.queue.push(arguments)};
+    a.queue=[];var s='script';r=t.createElement(s);r.async=!0;
+    r.src=n;var u=t.getElementsByTagName(s)[0];
+    u.parentNode.insertBefore(r,u);})(window,document,
+    'https://sc-static.net/scevent.min.js');
+}
+
+export function onLoad({ inputs }) {
+    initSnippet();
+    let userProperties = {};
+    for (const [key, value] of Object.entries(inputs.userProperties)) {
+        if (value) {
+            userProperties[key] = value;
+        }
+    };
+    snaptr('init', inputs.pixelId, userProperties);
+}
+export function onEvent({ inputs }) {
+    let eventProperties = {};
+    for (const [key, value] of Object.entries(inputs.eventProperties)) {
+        if (value) {
+            eventProperties[key] = value;
+        }
+    };
+    snaptr('track', inputs.eventType, eventProperties);
+}
+""".strip(),
+    inputs_schema=[
+        {
+            "key": "pixelId",
+            "type": "string",
+            "label": "Pixel ID",
+            "description": "You must obtain a Pixel ID to use the Snapchat Pixel. If you've already set up a Pixel for your website, we recommend that you use the same Pixel ID for your browser and server events.",
+            "default": "",
+            "secret": False,
+            "required": True,
+        },
+        {
+            "key": "userProperties",
+            "type": "dictionary",
+            "description": "Map of Snapchat user parameters and their values. Check out this page for more details: https://businesshelp.snapchat.com/s/article/pixel-direct-implementation",
+            "label": "User parameters",
+            "default": {
+                "user_email": "{person.properties.email}",
+                "user_phone_number": "{person.properties.phone}",
+            },
+            "secret": False,
+            "required": False,
+        },
+    ],
+    mapping_templates=[
+        HogFunctionMappingTemplate(
+            name="Page Viewed",
+            include_by_default=True,
+            filters={"events": [{"id": "$pageview", "name": "Pageview", "type": "events"}]},
+            inputs_schema=[
+                {
+                    "key": "eventType",
+                    "type": "string",
+                    "label": "Event Type",
+                    "description": "Check out this page for possible event types: https://businesshelp.snapchat.com/s/article/pixel-direct-implementation",
+                    "default": "PAGE_VIEW",
+                    "required": True,
+                },
+                *common_inputs,
+            ],
+        ),
+        HogFunctionMappingTemplate(
+            name="Order Completed",
+            include_by_default=True,
+            filters={"events": [{"id": "Order Completed", "type": "events"}]},
+            inputs_schema=[
+                {
+                    "key": "eventType",
+                    "type": "string",
+                    "label": "Event Type",
+                    "description": "Check out this page for possible event types: https://businesshelp.snapchat.com/s/article/pixel-direct-implementation",
+                    "default": "PURCHASE",
+                    "required": True,
+                },
+                *common_inputs,
+            ],
+        ),
+        HogFunctionMappingTemplate(
+            name="Checkout Started",
+            include_by_default=True,
+            filters={"events": [{"id": "Checkout Started", "type": "events"}]},
+            inputs_schema=[
+                {
+                    "key": "eventType",
+                    "type": "string",
+                    "label": "Event Type",
+                    "description": "Check out this page for possible event types: https://businesshelp.snapchat.com/s/article/pixel-direct-implementation",
+                    "default": "START_CHECKOUT",
+                    "required": True,
+                },
+                *common_inputs,
+            ],
+        ),
+        HogFunctionMappingTemplate(
+            name="Product Added",
+            include_by_default=True,
+            filters={"events": [{"id": "Product Added", "type": "events"}]},
+            inputs_schema=[
+                {
+                    "key": "eventType",
+                    "type": "string",
+                    "label": "Event Type",
+                    "description": "Check out this page for possible event types: https://businesshelp.snapchat.com/s/article/pixel-direct-implementation",
+                    "default": "ADD_CART",
+                    "required": True,
+                },
+                *common_inputs,
+            ],
+        ),
+        HogFunctionMappingTemplate(
+            name="Payment Info Entered",
+            include_by_default=True,
+            filters={"events": [{"id": "Payment Info Entered", "type": "events"}]},
+            inputs_schema=[
+                {
+                    "key": "eventType",
+                    "type": "string",
+                    "label": "Event Type",
+                    "description": "Check out this page for possible event types: https://businesshelp.snapchat.com/s/article/pixel-direct-implementation",
+                    "default": "ADD_BILLING",
+                    "required": True,
+                },
+                *common_inputs,
+            ],
+        ),
+        HogFunctionMappingTemplate(
+            name="Promotion Clicked",
+            include_by_default=True,
+            filters={"events": [{"id": "Promotion Clicked", "type": "events"}]},
+            inputs_schema=[
+                {
+                    "key": "eventType",
+                    "type": "string",
+                    "label": "Event Type",
+                    "description": "Check out this page for possible event types: https://businesshelp.snapchat.com/s/article/pixel-direct-implementation",
+                    "default": "AD_CLICK",
+                    "required": True,
+                },
+                *common_inputs,
+            ],
+        ),
+        HogFunctionMappingTemplate(
+            name="Promotion Viewed",
+            include_by_default=True,
+            filters={"events": [{"id": "Promotion Viewed", "type": "events"}]},
+            inputs_schema=[
+                {
+                    "key": "eventType",
+                    "type": "string",
+                    "label": "Event Type",
+                    "description": "Check out this page for possible event types: https://businesshelp.snapchat.com/s/article/pixel-direct-implementation",
+                    "default": "AD_VIEW",
+                    "required": True,
+                },
+                *common_inputs,
+            ],
+        ),
+        HogFunctionMappingTemplate(
+            name="Product Added to Wishlist",
+            include_by_default=True,
+            filters={"events": [{"id": "Product Added to Wishlist", "type": "events"}]},
+            inputs_schema=[
+                {
+                    "key": "eventType",
+                    "type": "string",
+                    "label": "Event Type",
+                    "description": "Check out this page for possible event types: https://businesshelp.snapchat.com/s/article/pixel-direct-implementation",
+                    "default": "ADD_TO_WISHLIST",
+                    "required": True,
+                },
+                *common_inputs,
+            ],
+        ),
+        HogFunctionMappingTemplate(
+            name="Product Viewed",
+            include_by_default=True,
+            filters={"events": [{"id": "Product Viewed", "type": "events"}]},
+            inputs_schema=[
+                {
+                    "key": "eventType",
+                    "type": "string",
+                    "label": "Event Type",
+                    "description": "Check out this page for possible event types: https://businesshelp.snapchat.com/s/article/pixel-direct-implementation",
+                    "default": "VIEW_CONTENT",
+                    "required": True,
+                },
+                *common_inputs,
+            ],
+        ),
+        HogFunctionMappingTemplate(
+            name="Product List Viewed",
+            include_by_default=True,
+            filters={"events": [{"id": "Product List Viewed", "type": "events"}]},
+            inputs_schema=[
+                {
+                    "key": "eventType",
+                    "type": "string",
+                    "label": "Event Type",
+                    "description": "Check out this page for possible event types: https://businesshelp.snapchat.com/s/article/pixel-direct-implementation",
+                    "default": "VIEW_CONTENT",
+                    "required": True,
+                },
+                *common_inputs,
+            ],
+        ),
+        HogFunctionMappingTemplate(
+            name="Products Searched",
+            include_by_default=True,
+            filters={"events": [{"id": "Products Searched", "type": "events"}]},
+            inputs_schema=[
+                {
+                    "key": "eventType",
+                    "type": "string",
+                    "label": "Event Type",
+                    "description": "Check out this page for possible event types: https://businesshelp.snapchat.com/s/article/pixel-direct-implementation",
+                    "default": "SEARCH",
+                    "required": True,
+                },
+                *common_inputs,
+            ],
+        ),
+    ],
+)
diff --git a/posthog/cdp/templates/snapchat_ads/template_snapchat_ads.py b/posthog/cdp/templates/snapchat_ads/template_snapchat_ads.py
new file mode 100644
index 0000000000000..be7d394c41dae
--- /dev/null
+++ b/posthog/cdp/templates/snapchat_ads/template_snapchat_ads.py
@@ -0,0 +1,368 @@
+from posthog.cdp.templates.hog_function_template import HogFunctionTemplate
+
+common_inputs = [
+    {
+        "key": "eventId",
+        "type": "string",
+        "label": "Event ID",
+        "description": "This field represents a unique identifier chosen to represent an event",
+        "default": "{event.uuid}",
+        "secret": False,
+        "required": True,
+    },
+    {
+        "key": "eventTime",
+        "type": "string",
+        "label": "Event time",
+        "description": "A Unix timestamp in seconds indicating when the actual event occurred. You must send this date in GMT time zone.",
+        "default": "{toUnixTimestampMilli(event.timestamp)}",
+        "secret": False,
+        "required": True,
+    },
+    {
+        "key": "eventSourceUrl",
+        "type": "string",
+        "label": "Event source URL",
+        "description": "The URL of the web page where the event took place.",
+        "default": "{event.properties.$current_url}",
+        "secret": False,
+        "required": True,
+    },
+    {
+        "key": "actionSource",
+        "label": "Action source",
+        "type": "choice",
+        "choices": [
+            {
+                "label": "WEB - Conversion was made on your website.",
+                "value": "WEB",
+            },
+            {
+                "label": "MOBILE_APP - Conversion was made on your mobile app.",
+                "value": "MOBILE_APP",
+            },
+            {
+                "label": "OFFLINE - Conversion happened in a way that is not listed.",
+                "value": "OFFLINE",
+            },
+        ],
+        "description": "This field allows you to specify where your conversions occurred. Knowing where your events took place helps ensure your ads go to the right people.",
+        "default": "WEB",
+        "secret": False,
+        "required": True,
+    },
+    {
+        "key": "customData",
+        "type": "dictionary",
+        "label": "Custom data",
+        "description": "A map that contains custom data. See this page for options: https://developers.snap.com/api/marketing-api/Conversions-API/Parameters#custom-data-parameters",
+        "default": {
+            "value": "{toFloat(event.properties.price ?? event.properties.value ?? event.properties.revenue)}",
+            "currency": "{event.properties.currency}",
+            "content_ids": "{event.properties.item_ids}",
+            "content_category": "{event.properties.category}",
+            "search_string": "{event.properties.search_string ?? event.properties.query}",
+            "num_items": "{toInt(event.properties.number_items ?? event.properties.quantity)}",
+            "order_id": "{event.properties.orderId ?? event.properties.transactionId ?? event.properties.transaction_id}",
+            "event_id": "{event.uuid}",
+        },
+        "secret": False,
+        "required": True,
+    },
+]
+
+template: HogFunctionTemplate = HogFunctionTemplate(
+    status="alpha",
+    type="destination",
+    id="template-snapchat-ads",
+    name="Snapchat Ads Conversions",
+    description="Send conversion events to Snapchat Ads",
+    icon_url="/static/services/snapchat.png",
+    category=["Advertisement"],
+    hog="""
+let body := {
+    'data': [
+        {
+            'event_name': inputs.eventType,
+            'action_source': inputs.actionSource,
+            'event_time': inputs.eventTime,
+            'event_source_url': inputs.eventSourceUrl,
+            'user_data': {},
+            'custom_data': {}
+        }
+    ]
+}
+
+for (let key, value in inputs.userData) {
+    if (not empty(value)) {
+        body.data.1.user_data[key] := value
+    }
+}
+
+for (let key, value in inputs.customData) {
+    if (not empty(value)) {
+        body.data.1.custom_data[key] := value
+    }
+}
+
+let res := fetch(f'https://tr.snapchat.com/v3/{inputs.pixelId}/events?access_token={inputs.oauth.access_token}', {
+    'method': 'POST',
+    'headers': {
+        'Content-Type': 'application/json',
+    },
+    'body': body
+})
+if (res.status >= 400) {
+    throw Error(f'Error from tr.snapchat.com (status {res.status}): {res.body}')
+}
+""".strip(),
+    inputs_schema=[
+        {
+            "key": "oauth",
+            "type": "integration",
+            "integration": "snapchat",
+            "label": "Snapchat account",
+            "requiredScopes": "snapchat-offline-conversions-api snapchat-marketing-api",
+            "secret": False,
+            "required": True,
+        },
+        {
+            "key": "pixelId",
+            "type": "string",
+            "label": "Pixel ID",
+            "description": "You must obtain a Pixel ID to use the Conversions API. If you’ve already set up a Pixel for your website, we recommend that you use the same Pixel ID for your browser and server events.",
+            "secret": False,
+            "required": True,
+        },
+        {
+            "key": "userData",
+            "type": "dictionary",
+            "label": "User data",
+            "description": "A map that contains customer information data. See this page for options: https://developers.snap.com/api/marketing-api/Conversions-API/Parameters#user-data-parameters",
+            "default": {
+                "em": "{sha256Hex(person.properties.email)}",
+                "ph": "{sha256Hex(person.properties.phone)}",
+                "sc_click_id": "{person.properties.sccid ?? person.properties.$initial_sccid}",
+            },
+            "secret": False,
+            "required": True,
+        },
+        {
+            "key": "eventType",
+            "type": "string",
+            "label": "Event Type",
+            "description": "Check out this page for possible event types: https://businesshelp.snapchat.com/s/article/pixel-direct-implementation",
+            "default": "{"
+            "event.event == '$pageview' ? 'PAGE_VIEW'"
+            ": event.event == 'Order Completed' ? 'PURCHASE'"
+            ": event.event == 'Checkout Started' ? 'START_CHECKOUT'"
+            ": event.event == 'Product Added' ? 'ADD_CART'"
+            ": event.event == 'Payment Info Entered' ? 'ADD_BILLING'"
+            ": event.event == 'Promotion Clicked' ? 'AD_CLICK'"
+            ": event.event == 'Promotion Viewed' ? 'AD_VIEW'"
+            ": event.event == 'Product Added to Wishlist' ? 'ADD_TO_WISHLIST'"
+            ": event.event == 'Product Viewed' ? 'VIEW_CONTENT'"
+            ": event.event == 'Product List Viewed' ? 'VIEW_CONTENT'"
+            ": event.event == 'Products Searched' ? 'SEARCH'"
+            ": event.event"
+            "}",
+            "required": True,
+        },
+        *common_inputs,
+    ],
+    # mapping_templates=[
+    #     HogFunctionMappingTemplate(
+    #         name="Page viewed",
+    #         include_by_default=True,
+    #         filters={"events": [{"id": "$pageview", "name": "Pageview", "type": "events"}]},
+    #         inputs_schema=[
+    #             {
+    #                 "key": "eventType",
+    #                 "type": "string",
+    #                 "label": "Event Type",
+    #                 "description": "Check out this page for possible event types: https://businesshelp.snapchat.com/s/article/pixel-direct-implementation",
+    #                 "default": "PAGE_VIEW",
+    #                 "required": True,
+    #             },
+    #             *common_inputs
+    #         ],
+    #     ),
+    #     HogFunctionMappingTemplate(
+    #         name="Order Completed",
+    #         include_by_default=True,
+    #         filters={"events": [{"id": "Order Completed", "type": "events"}]},
+    #         inputs_schema=[
+    #             {
+    #                 "key": "eventType",
+    #                 "type": "string",
+    #                 "label": "Event Type",
+    #                 "description": "Check out this page for possible event types: https://businesshelp.snapchat.com/s/article/pixel-direct-implementation",
+    #                 "default": "PURCHASE",
+    #                 "required": True,
+    #             },
+    #             *common_inputs
+    #         ],
+    #     ),
+    #     HogFunctionMappingTemplate(
+    #         name="Checkout Started",
+    #         include_by_default=True,
+    #         filters={"events": [{"id": "Checkout Started", "type": "events"}]},
+    #         inputs_schema=[
+    #             {
+    #                 "key": "eventType",
+    #                 "type": "string",
+    #                 "label": "Event Type",
+    #                 "description": "Check out this page for possible event types: https://businesshelp.snapchat.com/s/article/pixel-direct-implementation",
+    #                 "default": "START_CHECKOUT",
+    #                 "required": True,
+    #             },
+    #             *common_inputs
+    #         ],
+    #     ),
+    #     HogFunctionMappingTemplate(
+    #         name="Product Added",
+    #         include_by_default=True,
+    #         filters={"events": [{"id": "Product Added", "type": "events"}]},
+    #         inputs_schema=[
+    #             {
+    #                 "key": "eventType",
+    #                 "type": "string",
+    #                 "label": "Event Type",
+    #                 "description": "Check out this page for possible event types: https://businesshelp.snapchat.com/s/article/pixel-direct-implementation",
+    #                 "default": "ADD_CART",
+    #                 "required": True,
+    #             },
+    #             *common_inputs
+    #         ],
+    #     ),
+    #     HogFunctionMappingTemplate(
+    #         name="Payment Info Entered",
+    #         include_by_default=True,
+    #         filters={"events": [{"id": "Payment Info Entered", "type": "events"}]},
+    #         inputs_schema=[
+    #             {
+    #                 "key": "eventType",
+    #                 "type": "string",
+    #                 "label": "Event Type",
+    #                 "description": "Check out this page for possible event types: https://businesshelp.snapchat.com/s/article/pixel-direct-implementation",
+    #                 "default": "ADD_BILLING",
+    #                 "required": True,
+    #             },
+    #             *common_inputs
+    #         ],
+    #     ),
+    #     HogFunctionMappingTemplate(
+    #         name="Promotion Clicked",
+    #         include_by_default=True,
+    #         filters={"events": [{"id": "Promotion Clicked", "type": "events"}]},
+    #         inputs_schema=[
+    #             {
+    #                 "key": "eventType",
+    #                 "type": "string",
+    #                 "label": "Event Type",
+    #                 "description": "Check out this page for possible event types: https://businesshelp.snapchat.com/s/article/pixel-direct-implementation",
+    #                 "default": "AD_CLICK",
+    #                 "required": True,
+    #             },
+    #             *common_inputs
+    #         ],
+    #     ),
+    #     HogFunctionMappingTemplate(
+    #         name="Promotion Viewed",
+    #         include_by_default=True,
+    #         filters={"events": [{"id": "Promotion Viewed", "type": "events"}]},
+    #         inputs_schema=[
+    #             {
+    #                 "key": "eventType",
+    #                 "type": "string",
+    #                 "label": "Event Type",
+    #                 "description": "Check out this page for possible event types: https://businesshelp.snapchat.com/s/article/pixel-direct-implementation",
+    #                 "default": "AD_VIEW",
+    #                 "required": True,
+    #             },
+    #             *common_inputs
+    #         ],
+    #     ),
+    #     HogFunctionMappingTemplate(
+    #         name="Product Added to Wishlist",
+    #         include_by_default=True,
+    #         filters={"events": [{"id": "Product Added to Wishlist", "type": "events"}]},
+    #         inputs_schema=[
+    #             {
+    #                 "key": "eventType",
+    #                 "type": "string",
+    #                 "label": "Event Type",
+    #                 "description": "Check out this page for possible event types: https://businesshelp.snapchat.com/s/article/pixel-direct-implementation",
+    #                 "default": "ADD_TO_WISHLIST",
+    #                 "required": True,
+    #             },
+    #             *common_inputs
+    #         ],
+    #     ),
+    #     HogFunctionMappingTemplate(
+    #         name="Product Viewed",
+    #         include_by_default=True,
+    #         filters={"events": [{"id": "Product Viewed", "type": "events"}]},
+    #         inputs_schema=[
+    #             {
+    #                 "key": "eventType",
+    #                 "type": "string",
+    #                 "label": "Event Type",
+    #                 "description": "Check out this page for possible event types: https://businesshelp.snapchat.com/s/article/pixel-direct-implementation",
+    #                 "default": "VIEW_CONTENT",
+    #                 "required": True,
+    #             },
+    #             *common_inputs
+    #         ],
+    #     ),
+    #     HogFunctionMappingTemplate(
+    #         name="Product List Viewed",
+    #         include_by_default=True,
+    #         filters={"events": [{"id": "Product List Viewed", "type": "events"}]},
+    #         inputs_schema=[
+    #             {
+    #                 "key": "eventType",
+    #                 "type": "string",
+    #                 "label": "Event Type",
+    #                 "description": "Check out this page for possible event types: https://businesshelp.snapchat.com/s/article/pixel-direct-implementation",
+    #                 "default": "VIEW_CONTENT",
+    #                 "required": True,
+    #             },
+    #             *common_inputs
+    #         ],
+    #     ),
+    #     HogFunctionMappingTemplate(
+    #         name="Products Searched",
+    #         include_by_default=True,
+    #         filters={"events": [{"id": "Products Searched", "type": "events"}]},
+    #         inputs_schema=[
+    #             {
+    #                 "key": "eventType",
+    #                 "type": "string",
+    #                 "label": "Event Type",
+    #                 "description": "Check out this page for possible event types: https://businesshelp.snapchat.com/s/article/pixel-direct-implementation",
+    #                 "default": "SEARCH",
+    #                 "required": True,
+    #             },
+    #             *common_inputs
+    #         ],
+    #     ),
+    # ],
+    filters={
+        "events": [
+            {"id": "$pageview", "name": "Pageview", "type": "events"},
+            {"id": "Order Completed", "type": "events"},
+            {"id": "Checkout Started", "type": "events"},
+            {"id": "Product Added", "type": "events"},
+            {"id": "Payment Info Entered", "type": "events"},
+            {"id": "Promotion Clicked", "type": "events"},
+            {"id": "Promotion Viewed", "type": "events"},
+            {"id": "Product Added to Wishlist", "type": "events"},
+            {"id": "Product Viewed", "type": "events"},
+            {"id": "Product List Viewed", "type": "events"},
+            {"id": "Products Searched", "type": "events"},
+        ],
+        "actions": [],
+        "filter_test_accounts": True,
+    },
+)
diff --git a/posthog/cdp/templates/snapchat_ads/test_template_snapchat_ads.py b/posthog/cdp/templates/snapchat_ads/test_template_snapchat_ads.py
new file mode 100644
index 0000000000000..373e784e91228
--- /dev/null
+++ b/posthog/cdp/templates/snapchat_ads/test_template_snapchat_ads.py
@@ -0,0 +1,73 @@
+from inline_snapshot import snapshot
+from posthog.cdp.templates.helpers import BaseHogFunctionTemplateTest
+from posthog.cdp.templates.snapchat_ads.template_snapchat_ads import (
+    template as template_snapchat_ads,
+)
+
+
+class TestTemplateSnapchatAds(BaseHogFunctionTemplateTest):
+    template = template_snapchat_ads
+
+    def _inputs(self, **kwargs):
+        inputs = {
+            "oauth": {
+                "access_token": "oauth-1234",
+            },
+            "pixelId": "pixel12345",
+            "eventType": "PAGE_VIEW",
+            "eventSourceUrl": "https://posthog.com/cdp",
+            "eventTime": "1728812163",
+            "actionSource": "WEB",
+            "userData": {
+                "em": "3edfaed7454eedb3c72bad566901af8bfbed1181816dde6db91dfff0f0cffa98",
+            },
+            "customData": {
+                "currency": "USD",
+                "price": "1500",
+                "event_id": "49ff3d7c-359d-4f45-960e-6cda29f1beea",
+            },
+        }
+        inputs.update(kwargs)
+        return inputs
+
+    def test_function_works(self):
+        self.run_function(
+            self._inputs(),
+            globals={
+                "event": {
+                    "uuid": "49ff3d7c-359d-4f45-960e-6cda29f1beea",
+                    "properties": {
+                        "$current_url": "https://posthog.com/cdp",
+                    },
+                    "event": "$pageview",
+                },
+            },
+        )
+
+        assert self.get_mock_fetch_calls()[0] == snapshot(
+            (
+                "https://tr.snapchat.com/v3/pixel12345/events?access_token=oauth-1234",
+                {
+                    "method": "POST",
+                    "headers": {
+                        "Content-Type": "application/json",
+                    },
+                    "body": {
+                        "data": [
+                            {
+                                "event_name": "PAGE_VIEW",
+                                "action_source": "WEB",
+                                "event_time": "1728812163",
+                                "event_source_url": "https://posthog.com/cdp",
+                                "user_data": {"em": "3edfaed7454eedb3c72bad566901af8bfbed1181816dde6db91dfff0f0cffa98"},
+                                "custom_data": {
+                                    "currency": "USD",
+                                    "price": "1500",
+                                    "event_id": "49ff3d7c-359d-4f45-960e-6cda29f1beea",
+                                },
+                            }
+                        ]
+                    },
+                },
+            )
+        )
diff --git a/posthog/migrations/0489_alter_integration_kind.py b/posthog/migrations/0489_alter_integration_kind.py
index 94b9c06391db8..53fb81bf2234a 100644
--- a/posthog/migrations/0489_alter_integration_kind.py
+++ b/posthog/migrations/0489_alter_integration_kind.py
@@ -20,6 +20,7 @@ class Migration(migrations.Migration):
                     ("google-pubsub", "Google Pubsub"),
                     ("google-cloud-storage", "Google Cloud Storage"),
                     ("google-ads", "Google Ads"),
+                    ("snapchat", "Snapchat"),
                 ],
                 max_length=20,
             ),
diff --git a/posthog/models/integration.py b/posthog/models/integration.py
index f42f70da332d9..3aaccba1875fe 100644
--- a/posthog/models/integration.py
+++ b/posthog/models/integration.py
@@ -28,6 +28,8 @@
 
 
 def dot_get(d: Any, path: str, default: Any = None) -> Any:
+    if path in d and d[path] is not None:
+        return d[path]
     for key in path.split("."):
         if not isinstance(d, dict):
             return default
@@ -46,6 +48,7 @@ class IntegrationKind(models.TextChoices):
         GOOGLE_PUBSUB = "google-pubsub"
         GOOGLE_CLOUD_STORAGE = "google-cloud-storage"
         GOOGLE_ADS = "google-ads"
+        SNAPCHAT = "snapchat"
 
     team = models.ForeignKey("Team", on_delete=models.CASCADE)
 
@@ -112,7 +115,7 @@ class OauthConfig:
 
 
 class OauthIntegration:
-    supported_kinds = ["slack", "salesforce", "hubspot", "google-ads"]
+    supported_kinds = ["slack", "salesforce", "hubspot", "google-ads", "snapchat"]
     integration: Integration
 
     def __init__(self, integration: Integration) -> None:
@@ -191,6 +194,21 @@ def oauth_config_for_kind(cls, kind: str) -> OauthConfig:
                 id_path="sub",
                 name_path="email",
             )
+        elif kind == "snapchat":
+            if not settings.SNAPCHAT_APP_CLIENT_ID or not settings.SNAPCHAT_APP_CLIENT_SECRET:
+                raise NotImplementedError("Snapchat app not configured")
+
+            return OauthConfig(
+                authorize_url="https://accounts.snapchat.com/accounts/oauth2/auth",
+                token_url="https://accounts.snapchat.com/accounts/oauth2/token",
+                token_info_url="https://adsapi.snapchat.com/v1/me",
+                token_info_config_fields=["me.id", "me.email"],
+                client_id=settings.SNAPCHAT_APP_CLIENT_ID,
+                client_secret=settings.SNAPCHAT_APP_CLIENT_SECRET,
+                scope="snapchat-offline-conversions-api snapchat-marketing-api",
+                id_path="me.id",
+                name_path="me.email",
+            )
 
         raise NotImplementedError(f"Oauth config for kind {kind} not implemented")
 
diff --git a/posthog/settings/integrations.py b/posthog/settings/integrations.py
index 1a24e7d6e01df..2afb819ef91c5 100644
--- a/posthog/settings/integrations.py
+++ b/posthog/settings/integrations.py
@@ -3,5 +3,8 @@
 HUBSPOT_APP_CLIENT_ID = get_from_env("HUBSPOT_APP_CLIENT_ID", "")
 HUBSPOT_APP_CLIENT_SECRET = get_from_env("HUBSPOT_APP_CLIENT_SECRET", "")
 
+SNAPCHAT_APP_CLIENT_ID = get_from_env("SNAPCHAT_APP_CLIENT_ID", "")
+SNAPCHAT_APP_CLIENT_SECRET = get_from_env("SNAPCHAT_APP_CLIENT_SECRET", "")
+
 SALESFORCE_CONSUMER_KEY = get_from_env("SALESFORCE_CONSUMER_KEY", "")
 SALESFORCE_CONSUMER_SECRET = get_from_env("SALESFORCE_CONSUMER_SECRET", "")

From e310359677c0c7acab5712bab1a37a512e6a1122 Mon Sep 17 00:00:00 2001
From: Adam Leith <adamleithp@users.noreply.github.com>
Date: Mon, 23 Dec 2024 08:31:13 +0000
Subject: [PATCH 02/15] fix: removed border radius 0 on LemonInput--type-search
 (#27117)

Co-authored-by: Cory Watilo <corywatilo@gmail.com>
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
---
 .../lemon-ui-lemon-input--search--dark.png    | Bin 1274 -> 1496 bytes
 .../lemon-ui-lemon-input--search--light.png   | Bin 1239 -> 1460 bytes
 .../lib/lemon-ui/LemonInput/LemonInput.scss   |   1 -
 3 files changed, 1 deletion(-)

diff --git a/frontend/__snapshots__/lemon-ui-lemon-input--search--dark.png b/frontend/__snapshots__/lemon-ui-lemon-input--search--dark.png
index 8dd6e08c842af4bb69d1bcbe052f78fd931b3093..4c1c7548872013dbac5921df999f561315138229 100644
GIT binary patch
delta 1466
zcmV;r1x5P$3D^seFn<M-Nkl<Zc%1FsdrVVT90%}oU%mIXPyt_vbHxXb4QCK61v7Lr
z#+ezn%=wpFd<`_tIR8-paBQ-XCEFkVv-!_nCQIB%RF>hEI5VSj#7v|x5h*aC6{b9-
zP_d=Ay}hsfag$00ZEvd^>*e?Pr?=;vo_m^nb8_#wr+_W8<bNTA5JC(?vn)%J6hYt!
zfMg&^vM3517vOnbEg{txvpE$ZEXebs->)djv<?ygtuPEDNs?h`18wkmeF!03O|zmX
zT!0e<0n!YTh@vQhAow{BA(U!PMF`<EZNM-r5DZTD*Z@deAP~TCoM9N;Xf%cdVY<fy
zz~d4_A(mxul7FN`QJn6<0Pwg(Ng_!SCkPy_n}H6<vP{4V9ncvFG|&|YG|&|YG|&|?
zuGSb*R%LU=mVhsSx7}kqh8Ri4{<X0I5Vtr2y*}T2_$Bw#8G^@;yM1KUrr}XP{`r+T
z-!-Kp1hEDQDkyj+#D}_joKf23EL%!ZR7Yo5%-*yH`hUoV`#Z`!XPVRYH>Eq>3_{4v
zNE?@X53F;S=lBnvUdW3vu3mC;mR&esKe430f1vz@4H^dk^ePw#T1$!%LXk3^pO;&>
za)rIAMN4m*0=>0pY<rn!+eu5?J!81g8zjy&r=P!NKDE2AYSYlMb6HxtDk)nVK9*%!
z%SV8|Ie%Su5JJ|HVuB#L{=EH<+HjiHW--MMG>Iz**AJh#Ja=N6!^U~yP~F1%eXeh>
zW!xTSV)iyNGOA@*U`7dN8X+_>)A@P1g@tjXS<@<qZHa%jNj}w>5vhU8O<#AJURyb)
z@syM8-0|j>OFwtExBPVO?7A1%YODf!;&k1yH-EJh7Ou$8%T-I%G&f$iYfrPL8QPLA
z^gkd2LbT|2yXk_g1o!JzR_uCf*Y=}T)!jYLveJ?hpB}H+v;SISQ}imJKTg*jNtR1(
zR)i2qk;@C7ZM<&p?d^-Jlh}b~4Dwijh~8$5BT{Ki7sTy1?cw8^k3O#ZzJ71z?)Q$>
z{C|3-0U>m@?uUh0S#R&#bFHxn$MHy2T22I#ks4n$(+Q+mQ=spA$((sSh7=|8+FX8S
zu-9YIa=uNQw}g*JJ)Q*%GBYyL?e<4Eu)j52-MQlpgiw?!03wMU==OfbK%&=+9@hPl
zHf4iMv#>UI{M~v@s~mlQ-JSS$)~s2R+kZsa{0I92^({NwQfjl_y44<@r{kTZW8W0^
zd1!ktdw9eBG<NE3(>1RSjf|6*I#c61v1)K|$m4miYE@CVq`Z7}yQ3p|70{)nOBR>f
ztgWqWj*c!zM^|fWTdB>Ooo$J$6HV*T)jwv|R`k_Y^c||p>KtUl<teoE!REo|mw)*`
zyF5os=oz>y%U^tX^26$?P$+b}yJvNoZBNDS%DwxeR{{N5x@57nq`37)TX@+{J&1Rn
z))eU8QF`0gmYP?FPFMC`?MWGUNOC;!REDr}5jVyW$A6jo&N{bq*l@AaoWM8v>f|?q
zC|19JbpHH#Jx<qwgNMSmeNn1_o_|bEvnrfv0>?Ej-eFeTnvqeh4?EW6_+Ea_TeK*U
zW|VH;WiNK6o^4K35Vo<v`^lDpBXwDcWg5(6k<uKd{bAvp*|X!@ZP(D9+R#14wekgr
z86k9h>%hKR{C8(cTz!HWj$xUW<{MEqC#gZFX<AEf@dY}H3l1|E!bZoRSbv9LhHyAK
zW44Jjc~ABv^Ec(>4Zwd1ez5{{1p*Cp1p*Cp1(zfl!{7&0AnD;aE=dwDiULW((ga9)
zBteLxh;tlgps48{3;>VIU@&l80O$FTtSBtYYWN5M|5Gf>N|MC$JdP0Zd3_i{CX<Px
zD7c;mNd&_%ilR&=6H<`RH#7d|!HU=GqiNb`WJyyB`~^plEY$z8;`ei*P)IHL8}mVb
U%L~%+RsaA107*qoM6N<$f<8&lwg3PC

delta 1242
zcmV<01SR{}3;GF=Fn<KJNkl<Zc%1FrZ%i9y9Ki9X*Mqhj6ew(C#aYIGWiI?Hg+)Ng
zf{SDt=Uz=SHUt(VlNW3+COVXu=nLNH-uREiWJ<D8BhzFOmrW##KnsomrATRM-GD-A
z#|pI2!qpc|PBQ5AIf4=&exFyzJx`xIl5Z~UT|uB!6(RsgL4PBJX6^RvJ`Di2KumNr
zwcY0cz*d5w0Z|}mKokfX5Cwt;M1i0IQ6OkQ6bKp+1%d`dp?S>~AYV?rD_h~7cT)oo
zCBs(nDkJ#U&J6(Gcm#bk&3WM^+tV_yW0A7W)Agk@_C@ORj+pN>Q3yfSV3X3*pYbev
z3}Z%)Imt<hA%7tu!}^h+tKkNHv1Ga|-*LS+vPKhSw22WyQt|4sL(cQXwu0ov+G}yk
zD?#49q$DS`-)vjEXJTTq;Dr**69A-IaxW=!vk^jpnodhi$;dpc)%4-4h86V5thv+q
zj#JHwfrq=;oz5lU_1>tPgVL+zmikib<r{LGrE>F&*ne$?VQ^jo$YwN+BZQQ>*+QXk
z<j>J3M%kME(}D^fG)?(xkIr1VvuAD1tc7J^ojR_q+VpLgY;;B(bhX)8_+}q?65BLF
zXl>JJsVNy5JZi?e%b`kGjNZ*$?Un_aV6usNOuJvpoWnfidS}Ys?7022eyH!K8?D7J
z7GVwnl7ARY<62E$M#kZ^)D-_7f6d)JTKt-^uF#4o@5Ce8?d3|}U=yXwm++6eR%ON6
zx6YovRNr72Gv?>zUiq}CqN=8=Tf;pB$YV5(uQE)YN{JAnL+C^4&vy4{&1MU)MS=${
z4rS)tLhd<pE@8L`>kaYHeJ#7)_|eDe@7vB*mVdu@x$)PIPJ~da`iD5V{O#(hu5JxQ
zQGteV4g~&>{Q3Hu-bBq<K~FpB<h{!R<nsl-H<uQ>WOjt&9Iy2F33l7=aO~e7E0aZO
zwf}s8{jKxvnX)$!LL5T?1QI;xp$Ty)jb6`sto|c%!wIocZ&Av^yKPu^IV^uYSo>o{
zM1REkIX+*&mvamO0>sBF@>I&f!6EiK&G#Z5{6nF|A<~*97fPlhB`X_FXnfT=yFlO8
zhx0nH-_(@V;dqpjlf~{SC^#~t8|EGYL`qCJn5R<q_YdfXM|8s@{rv-ZDrJ1Ug4ZHg
z_n{kpjBTl~v{YE?)N=ilgxwz|TK(Yo)PM6yi=W+zS=rPxaE4*N__F!KhI)_3Gin$+
zlCP?&D6c$M!#xDZlbCQ&nVa2zZ-BjR=ilIaoyH2<Y!{vSTG9B5^;)I*?pWC5W7@SW
zd`jlcJm8vh37dY|^G>nNI1_qHFWtm%@>TOU-j$Vx_b=_+w|C5FI$vAIe(d8I0)He~
zU$Y<Ew2-1OZ{7)%szUsKV^Ekp|MGLrtOM@IU90yWNN$aUxAsQ*kl<Ll^OF;k7uE93
zH4S#MKsB@Q9~Q<$NAvr(U8f<u)3CvN<#wGEA=Gqovbu%(-5ADeO|Zj>CE~u`dmLX*
z@`o-GiEviq7c_@<oz&$K*cY~JK~u0p=ydv^a{^tw*W1eeHoSNP@Lz(zSOG+VpaD@J
zXh0MQ8W07721J3N0Z|}mKokfX5QX+X0pIS^0AOqU4VbSAT8VPxEdT%j07*qoM6N<$
Ef>1PfL;wH)

diff --git a/frontend/__snapshots__/lemon-ui-lemon-input--search--light.png b/frontend/__snapshots__/lemon-ui-lemon-input--search--light.png
index 42f6a48d5f2a9455b0ea50a229f14429dbf02ede..fb3bd457d261ecd1e76aa203560c827c861949e1 100644
GIT binary patch
delta 1430
zcmV;H1!?-%3A784Fn<MZNkl<Zc%1FsZ)h8390%~{o+p>frAgMc(XF-`D6XBG>5NpH
z7ItHf)G$$G2%8lY#>QTZT0z?hGQs&`I-$C3xRpsA=+^C(AVac63|yHl7zr*e1ve&G
z#wu&qE^Y6U`xjqi#LhM8lXf%o_WQiL-t+W%euZxza!)Q7W`BBS5+Q^TlBC&mT2fWj
zFmwdKa)2>mS(fMRJYSJJ!{h>;N=;!*oX$$lYO`3_a@Pp}6-`q!N_sjqX=DwTtMX2u
zQ>iH{Yje9-m%BUw7HNE9Oi|J<S0$EZiC_z)87yn=>eU#ta$3T&JnL|-D0e*oES1aY
zk|hbNs>)ey<$o>)fTiL%UR4!r7&=@90uvy_Vi-CucNqZOPY`HeDiCO3DiCO3Dwfi^
z8-{UN)RTiuMI~<Z<9Z(=C5`~VgH%Es^`Y;Slik^|Ysgv6RMlipbRn19y5mF3*1d>f
z9%PZg%!Y=BY&M(E=PS}D9*--E($dnh;ApfjIh3!vGk>4HMxF`qM}N0}dy@}cvY(o;
zzVWeg=0N7aOGuFy93h!ZR^6?ssfluSU}6r3BN~my<MBcrVzF2>8nxT)G^0_i(AtF)
z+V`K^4*iT9=KPB|R$794EW+#Z`x}+MPHX2^G((MyjO33AAvC`N%+2fdB7`E5h_36+
z&CUO5jeo^rq9_Iefn2u*Q3P63m2W;^I}Y5H<~+O0)_q2PyNP|Ji}5Tx<*HSyXvzW)
zm3*cVLUS`+YMQBDa_E<SLaA}~<*q^<n8%+YO)sdCe#$BDb^Q2opU+oQQ?qH)rt{~|
zQ#JuJ@p`?1KtL45SS*%1lS^|j7^F`#)e4=xaetM0)PrmlMfxzFr;V$>($6|qC=@z&
z?AYPMhZ`Fk2L}gt?%X*rFdzs*@g`tCUayxB5)OwELW-gc4-W@}!FB7_l{5%Npfj_K
zqpElx##xPKr)cJ@tE<Z&A3S)lqoX4f3ibB(wzsz<gghS4=;&x~Z?7N-x~>;$qL~OR
zM}N8a<}$sAG*bl{SJ$b3T}Fn1aKYCn#-G12wGA}$iK3W4cDvozuV24)>sD)PYyRYx
zEnE8f`Vc}zngA$-BG7A|Lz<%f*l%gyHE)OP_^AHNIqsd4H1pNh*U$ZNYHFT!ohiJl
zU8D(^Kr)#Ohr?}cZTWS&)J1yXi$dnHHGg=$pq%VR(-ZS{P>$|qR<0&3ua-1%PHk;%
zRaMpS@NoW2G#cHoVMFmIU`mNZA{-72g5dZ2{eHh72;p!znM{^62-Q9`x3^F3X_I@}
zxb8E!e$G2OQY!Q19zA}6?f3{S>ZWQ!NLN=^PfriWackGE6-DvLkt3&1pDx}6%zr15
zNJJtLK@jrWcDaL6*J-LiGqsKUp`pytUFmn9C(pjfJmO(^r}6hSW8@-oR<mz?qMq81
zpIA>?w=Lo?>Fn%eS$5yPePd%|4Gj(b{r&mNz9LP)Ozur{PCnDRu2XK_F@IdSwB||L
zeLg+*gC-6bBNwyN<D{{bv~IJs?|()Z>w{-AU%bh^H?X)&gNIq6H0RO3y>jJhqO^PE
zNb^?Gymg-Q8@F=^Wj@=%?LS9+?In!~9&$4?Gn+SWE^>2HF6fdZ(TsNAZvG@2w{yIc
zSqYCr0Hv9`Gh0ZZ#rt0O^KRyO7jFRmPw<HqU@8!3U@8!3U@916qG@Wm%YOi1sdQb#
zm|&J=GfKML#Q?BWnT*V`R?PGERBE!^#Q?BWw^NgLyB+g<MK){P9KTWSdH`6w@rki4
z%Gzx9{1g0dV~m}SN{)jk_=9Cb)6`5RotmCRDC=~t`1dO*5JKs+B+HVbDDWLCV7b7U
kSglr`x7%!Y9&+#xb#5#JPY<*J4FCWD07*qoM6N<$g38UiTmS$7

delta 1207
zcmV;o1W5a|3)cydFn<J*Nkl<Zc%1FraY!3i90%}s_YxCRQ)+axPPc$e<LnZb;btOu
z;v`vcY>YB!=U@YA=^w>qu&IO5!Q3Bi9b_}gR5~(Yt8sq~Mj2;Q7C7k)EF;XU5vp`B
zkvV2XT5Fawm+X(gk<KK(lXSA@@AKDr@A-Q#@Xh1$?h@wa(tiR1fEFr*Q2pcPgPsNe
zMX<CSWe<7|02C7h8c+oS4X6Tv22_DS1FArv0aYN-fGQAZKotlypo&Ua_f#r%Ly%%~
z%#mZP$;Q@M5ms0MfCouI9Hseh#i{=E+AXB7U<}piOKx<uvgGvps_yfMVIJfp0nO&;
z=e1g`)oLx!Cw~%&h@#lq+PY^o(n}8U%l^d2ui&Q~rDMP9zW%G!yP&&#yX3VG#hIbR
z&<jY6?^z)hiy7``u~-O42NWwSD+>mLkw_$8hj2I?3<h;N9Z5B!6*_tKQu4b`wHJS6
z8?xRaW#uZ@ITiP6{M~kOvah7?3zAZci;MCx#+c+^0Ds-gW-~%45C}+;)Y8)Ouhwul
zEC_<b;mCB`6G5PpJK|UGse6X*OS4RORNFrjf77CV$;}w|9<r*ciey^gP?0l@5X#Q9
z(lirYa!3n5pgZg87v1?fFpoZgEzj))e1t>pHZd__wOXsIt2;V6W@l#!n*dGBX0yZL
z5CkC{4u5CPWYX+%xyaK@v_hx<SY{qJBJGg^eHi1DspX%^N6qH-ddJ7dM@B|WCez&9
zTyJl$-|y!*u5c5ekJ)U-81p=j5E4Z(6biXquBN6YMMVe#ow&!884CAd^cCpdCdqiU
zwYBo`@bGX?PmkB@^>{o^rxPJ$G#Xb{Ry-aL$A58>B;{)&83_CzW#XI3^ghx|6lk`h
zcIWpSD3wBN-s_XpZ@(}#4J6|Uf*>DPR#vXAu5N5>*zI=tWLH<$<m4nms6Z0{`49xU
z{uz`Mlh=GI=b4-x((5bIPggW=O_7XOS67$)=jLXPb)Ct-t6iW8P#_kI@jTzw)+Vph
zN`DvWy+0H(kJPg#IB}{U-MyW&gE)4UDL;-|Usg15MomqP!C(l5Lh_klFxcGOT(}8P
zDH@IPJkN2Q&1SRNY#hh&JRgh26cr)bht`~*j1RQM2ii3KGi+Vf9i8nviO<hTk*n&S
z50FZ&_!S_8F?PG%0|NsZji#}&Q4oaD(SOnD>FL5vfIiV^G!O`I94BwvWe$|C(?o%0
zYD}dU=M!UR{(k#e{Pgq8Lq?`lpZfDwYVkVKSE%3kXy@_;_OTP#esUkLq_3|}tyT{X
z4z8`OH8eE%d_MVOUx6k-lig{~kTWew65-|@b8~5d{AUcL@b^i<pIW@0zPpZ1c7JR?
zsdAo0EGx}@llbg)%{%`6Wf~l2`O+*SzrC`w998zL9B%2xE!{cJx1Z7=l=$Sd=E4<h
zbt<X}4!NzZt<KKQ0uLu;g1)`IO;W9B4}aqJQ<_peQ+~Wy1;HVay)&CnzQudDVm{5B
zbMXe?zXab{0aSrN1FArv0aYN-fG{c$Xh0PRG@uFu8c+oS4XC2Z+yOu6X#h|h{{W%p
Vv)_F!j?e%A002ovPDHLkV1gy&Nn8K`

diff --git a/frontend/src/lib/lemon-ui/LemonInput/LemonInput.scss b/frontend/src/lib/lemon-ui/LemonInput/LemonInput.scss
index fa2ddaea8d2fd..9f0ecf27a7c4a 100644
--- a/frontend/src/lib/lemon-ui/LemonInput/LemonInput.scss
+++ b/frontend/src/lib/lemon-ui/LemonInput/LemonInput.scss
@@ -97,7 +97,6 @@
     &.LemonInput--type-search {
         // NOTE Design: Search inputs are given a specific small width
         max-width: 240px;
-        border-radius: 0;
     }
 
     &.LemonInput--type-number {

From 1ec1c14a9317d35bbe239d987296d7806728f52b Mon Sep 17 00:00:00 2001
From: Ross <rossagray@gmail.com>
Date: Mon, 23 Dec 2024 09:18:15 +0000
Subject: [PATCH 03/15] fix(batch-exports): Set queries to cancel after
 disconnect (#27104)

---
 posthog/temporal/common/clickhouse.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/posthog/temporal/common/clickhouse.py b/posthog/temporal/common/clickhouse.py
index f9c9516da907d..a326e29d9fccd 100644
--- a/posthog/temporal/common/clickhouse.py
+++ b/posthog/temporal/common/clickhouse.py
@@ -510,6 +510,7 @@ async def get_client(
         max_execution_time=settings.CLICKHOUSE_MAX_EXECUTION_TIME,
         max_memory_usage=settings.CLICKHOUSE_MAX_MEMORY_USAGE,
         max_block_size=max_block_size,
+        cancel_http_readonly_queries_on_client_close=1,
         output_format_arrow_string_as_string="true",
         http_send_timeout=0,
         **kwargs,

From b22f2f7b0a3d48904de952a05e981fab7683560f Mon Sep 17 00:00:00 2001
From: Juraj Majerik <juro.majerik@gmail.com>
Date: Mon, 23 Dec 2024 11:19:46 +0100
Subject: [PATCH 04/15] feat(experiments): define custom Trends exposure in the
 modal (#27097)

Co-authored-by: Daniel Bachhuber <daniel.b@posthog.com>
---
 cypress/e2e/experiments.cy.ts                 |  85 -----
 .../experiments/Metrics/PrimaryGoalTrends.tsx | 312 ++++++++++++++----
 2 files changed, 246 insertions(+), 151 deletions(-)

diff --git a/cypress/e2e/experiments.cy.ts b/cypress/e2e/experiments.cy.ts
index e0e8339920bee..bd94cbf57d545 100644
--- a/cypress/e2e/experiments.cy.ts
+++ b/cypress/e2e/experiments.cy.ts
@@ -43,89 +43,4 @@ describe('Experiments', () => {
         // Save experiment
         cy.get('[data-attr="save-experiment"]').first().click()
     })
-
-    const createExperimentInNewUi = (): void => {
-        cy.visit('/experiments')
-
-        // Name, flag key, description
-        cy.get('[data-attr=create-experiment]').first().click()
-        cy.get('[data-attr=experiment-name]').click().type(`${experimentName}`).should('have.value', experimentName)
-        cy.get('[data-attr=experiment-feature-flag-key]')
-            .click()
-            .type(`${featureFlagKey}`)
-            .should('have.value', featureFlagKey)
-        cy.get('[data-attr=experiment-description]')
-            .click()
-            .type('This is the description of the experiment')
-            .should('have.value', 'This is the description of the experiment')
-
-        // Edit variants
-        cy.get('[data-attr="add-test-variant"]').click()
-        cy.get('input[data-attr="experiment-variant-key"][data-key-index="1"]')
-            .clear()
-            .type('test-variant-1')
-            .should('have.value', 'test-variant-1')
-        cy.get('input[data-attr="experiment-variant-key"][data-key-index="2"]')
-            .clear()
-            .type('test-variant-2')
-            .should('have.value', 'test-variant-2')
-
-        // Save experiment
-        cy.get('[data-attr="save-experiment"]').first().click()
-
-        // Set the experiment goal once the experiment is drafted
-        cy.get('[data-attr="add-experiment-goal"]').click()
-
-        // Wait for the goal modal to open and click the confirmation button
-        cy.get('.LemonModal__layout').should('be.visible')
-        cy.contains('Change experiment goal').should('be.visible')
-        cy.get('.LemonModal__content').contains('button', 'Add funnel step').click()
-        cy.get('.LemonModal__footer').contains('button', 'Save').click()
-    }
-
-    it('create, launch and stop experiment with new ui', () => {
-        createExperimentInNewUi()
-        cy.get('[data-attr="experiment-status"]').contains('draft').should('be.visible')
-
-        cy.get('[data-attr="experiment-creation-date"]').contains('a few seconds ago').should('be.visible')
-        cy.get('[data-attr="experiment-start-date"]').should('not.exist')
-
-        cy.wait(1000)
-        cy.get('[data-attr="launch-experiment"]').first().click()
-        cy.get('[data-attr="experiment-creation-date"]').should('not.exist')
-        cy.get('[data-attr="experiment-start-date"]').contains('a few seconds ago').should('be.visible')
-
-        cy.get('[data-attr="stop-experiment"]').first().click()
-        // Wait for the dialog to appear and click the confirmation button
-        cy.get('.LemonModal__layout').should('be.visible')
-        cy.contains('Stop this experiment?').should('be.visible')
-        cy.get('.LemonModal__footer').contains('button', 'Stop').click()
-        // Wait for the dialog to disappear
-        cy.get('[data-attr="experiment-creation-date"]').should('not.exist')
-        cy.get('[data-attr="experiment-start-date"]').contains('a few seconds ago').should('be.visible')
-        cy.get('[data-attr="experiment-end-date"]').contains('a few seconds ago').should('be.visible')
-    })
-
-    it('move start date', () => {
-        createExperimentInNewUi()
-
-        cy.wait(1000)
-        cy.get('[data-attr="launch-experiment"]').first().click()
-
-        cy.get('[data-attr="move-experiment-start-date"]').first().click()
-        cy.get('[data-attr="experiment-start-date-picker"]').should('exist')
-        cy.get('[data-attr="lemon-calendar-month-previous"]').first().click()
-        cy.get('[data-attr="lemon-calendar-day"]').first().click()
-        cy.get('[data-attr="lemon-calendar-select-apply"]').first().click()
-        cy.get('[data-attr="experiment-start-date"]')
-            .contains(/months? ago/)
-            .should('be.visible')
-
-        cy.reload()
-
-        // Check that the start date persists
-        cy.get('[data-attr="experiment-start-date"]')
-            .contains(/months? ago/)
-            .should('be.visible')
-    })
 })
diff --git a/frontend/src/scenes/experiments/Metrics/PrimaryGoalTrends.tsx b/frontend/src/scenes/experiments/Metrics/PrimaryGoalTrends.tsx
index 8f7f5fe17df4b..7ab7bc0880b5a 100644
--- a/frontend/src/scenes/experiments/Metrics/PrimaryGoalTrends.tsx
+++ b/frontend/src/scenes/experiments/Metrics/PrimaryGoalTrends.tsx
@@ -1,8 +1,11 @@
-import { LemonInput, LemonLabel } from '@posthog/lemon-ui'
+import { IconCheckCircle } from '@posthog/icons'
+import { LemonInput, LemonLabel, LemonTabs, LemonTag } from '@posthog/lemon-ui'
 import { useActions, useValues } from 'kea'
 import { TestAccountFilterSwitch } from 'lib/components/TestAccountFiltersSwitch'
 import { EXPERIMENT_DEFAULT_DURATION } from 'lib/constants'
+import { dayjs } from 'lib/dayjs'
 import { LemonBanner } from 'lib/lemon-ui/LemonBanner'
+import { useState } from 'react'
 import { ActionFilter } from 'scenes/insights/filters/ActionFilter/ActionFilter'
 import { MathAvailability } from 'scenes/insights/filters/ActionFilter/ActionFilterRow/ActionFilterRow'
 import { teamLogic } from 'scenes/teamLogic'
@@ -10,17 +13,18 @@ import { teamLogic } from 'scenes/teamLogic'
 import { actionsAndEventsToSeries } from '~/queries/nodes/InsightQuery/utils/filtersToQueryNode'
 import { queryNodeToFilter } from '~/queries/nodes/InsightQuery/utils/queryNodeToFilter'
 import { Query } from '~/queries/Query/Query'
-import { ExperimentTrendsQuery, NodeKind } from '~/queries/schema'
-import { FilterType } from '~/types'
+import { ExperimentTrendsQuery, InsightQueryNode, NodeKind } from '~/queries/schema'
+import { BaseMathType, ChartDisplayType, FilterType } from '~/types'
 
 import { experimentLogic } from '../experimentLogic'
 import { commonActionFilterProps } from './Selectors'
 
 export function PrimaryGoalTrends(): JSX.Element {
     const { experiment, isExperimentRunning, editingPrimaryMetricIndex } = useValues(experimentLogic)
-    const { setTrendsMetric } = useActions(experimentLogic)
+    const { setTrendsMetric, setTrendsExposureMetric, setExperiment } = useActions(experimentLogic)
     const { currentTeam } = useValues(teamLogic)
     const hasFilters = (currentTeam?.test_account_filters || []).length > 0
+    const [activeTab, setActiveTab] = useState('main')
 
     if (!editingPrimaryMetricIndex && editingPrimaryMetricIndex !== 0) {
         return <></>
@@ -31,70 +35,246 @@ export function PrimaryGoalTrends(): JSX.Element {
 
     return (
         <>
-            <div className="mb-4">
-                <LemonLabel>Name (optional)</LemonLabel>
-                <LemonInput
-                    value={currentMetric.name}
-                    onChange={(newName) => {
-                        setTrendsMetric({
-                            metricIdx,
-                            name: newName,
-                        })
-                    }}
-                />
-            </div>
-            <ActionFilter
-                bordered
-                filters={queryNodeToFilter(currentMetric.count_query)}
-                setFilters={({ actions, events, data_warehouse }: Partial<FilterType>): void => {
-                    const series = actionsAndEventsToSeries(
-                        { actions, events, data_warehouse } as any,
-                        true,
-                        MathAvailability.All
-                    )
+            <LemonTabs
+                activeKey={activeTab}
+                onChange={(newKey) => setActiveTab(newKey)}
+                tabs={[
+                    {
+                        key: 'main',
+                        label: 'Main metric',
+                        content: (
+                            <>
+                                <div className="mb-4">
+                                    <LemonLabel>Name (optional)</LemonLabel>
+                                    <LemonInput
+                                        value={currentMetric.name}
+                                        onChange={(newName) => {
+                                            setTrendsMetric({
+                                                metricIdx,
+                                                name: newName,
+                                            })
+                                        }}
+                                    />
+                                </div>
+                                <ActionFilter
+                                    bordered
+                                    filters={queryNodeToFilter(currentMetric.count_query)}
+                                    setFilters={({ actions, events, data_warehouse }: Partial<FilterType>): void => {
+                                        const series = actionsAndEventsToSeries(
+                                            { actions, events, data_warehouse } as any,
+                                            true,
+                                            MathAvailability.All
+                                        )
 
-                    setTrendsMetric({
-                        metricIdx,
-                        series,
-                    })
-                }}
-                typeKey="experiment-metric"
-                buttonCopy="Add graph series"
-                showSeriesIndicator={true}
-                entitiesLimit={1}
-                showNumericalPropsOnly={true}
-                {...commonActionFilterProps}
+                                        setTrendsMetric({
+                                            metricIdx,
+                                            series,
+                                        })
+                                    }}
+                                    typeKey="experiment-metric"
+                                    buttonCopy="Add graph series"
+                                    showSeriesIndicator={true}
+                                    entitiesLimit={1}
+                                    showNumericalPropsOnly={true}
+                                    {...commonActionFilterProps}
+                                />
+                                <div className="mt-4 space-y-4">
+                                    <TestAccountFilterSwitch
+                                        checked={hasFilters ? !!currentMetric.count_query?.filterTestAccounts : false}
+                                        onChange={(checked: boolean) => {
+                                            setTrendsMetric({
+                                                metricIdx,
+                                                filterTestAccounts: checked,
+                                            })
+                                        }}
+                                        fullWidth
+                                    />
+                                </div>
+                                {isExperimentRunning && (
+                                    <LemonBanner type="info" className="mt-3 mb-3">
+                                        Preview insights are generated based on {EXPERIMENT_DEFAULT_DURATION} days of
+                                        data. This can cause a mismatch between the preview and the actual results.
+                                    </LemonBanner>
+                                )}
+                                <div className="mt-4">
+                                    <Query
+                                        query={{
+                                            kind: NodeKind.InsightVizNode,
+                                            source: currentMetric.count_query,
+                                            showTable: false,
+                                            showLastComputation: true,
+                                            showLastComputationRefresh: false,
+                                        }}
+                                        readOnly
+                                    />
+                                </div>
+                            </>
+                        ),
+                    },
+                    {
+                        key: 'exposure',
+                        label: 'Exposure',
+                        content: (
+                            <>
+                                <div className="flex gap-4 mb-4">
+                                    <div
+                                        className={`flex-1 cursor-pointer p-4 rounded border ${
+                                            !currentMetric.exposure_query
+                                                ? 'border-primary bg-primary-highlight'
+                                                : 'border-border'
+                                        }`}
+                                        onClick={() => {
+                                            setExperiment({
+                                                ...experiment,
+                                                metrics: experiment.metrics.map((metric, idx) =>
+                                                    idx === metricIdx
+                                                        ? { ...metric, exposure_query: undefined }
+                                                        : metric
+                                                ),
+                                            })
+                                        }}
+                                    >
+                                        <div className="font-semibold flex justify-between items-center">
+                                            <span>Default</span>
+                                            {!currentMetric.exposure_query && (
+                                                <IconCheckCircle fontSize={18} color="var(--primary)" />
+                                            )}
+                                        </div>
+                                        <div className="text-muted text-sm leading-relaxed">
+                                            Uses the number of unique users who trigger the{' '}
+                                            <LemonTag>$feature_flag_called</LemonTag> event as your exposure count. This
+                                            is the recommended setting for most experiments, as it accurately tracks
+                                            variant exposure.
+                                        </div>
+                                    </div>
+                                    <div
+                                        className={`flex-1 cursor-pointer p-4 rounded border ${
+                                            currentMetric.exposure_query
+                                                ? 'border-primary bg-primary-highlight'
+                                                : 'border-border'
+                                        }`}
+                                        onClick={() => {
+                                            setExperiment({
+                                                ...experiment,
+                                                metrics: experiment.metrics.map((metric, idx) =>
+                                                    idx === metricIdx
+                                                        ? {
+                                                              ...metric,
+                                                              exposure_query: {
+                                                                  kind: NodeKind.TrendsQuery,
+                                                                  series: [
+                                                                      {
+                                                                          kind: NodeKind.EventsNode,
+                                                                          name: '$feature_flag_called',
+                                                                          event: '$feature_flag_called',
+                                                                          math: BaseMathType.UniqueUsers,
+                                                                      },
+                                                                  ],
+                                                                  interval: 'day',
+                                                                  dateRange: {
+                                                                      date_from: dayjs()
+                                                                          .subtract(EXPERIMENT_DEFAULT_DURATION, 'day')
+                                                                          .format('YYYY-MM-DDTHH:mm'),
+                                                                      date_to: dayjs()
+                                                                          .endOf('d')
+                                                                          .format('YYYY-MM-DDTHH:mm'),
+                                                                      explicitDate: true,
+                                                                  },
+                                                                  trendsFilter: {
+                                                                      display: ChartDisplayType.ActionsLineGraph,
+                                                                  },
+                                                                  filterTestAccounts: true,
+                                                              },
+                                                          }
+                                                        : metric
+                                                ),
+                                            })
+                                        }}
+                                    >
+                                        <div className="font-semibold flex justify-between items-center">
+                                            <span>Custom</span>
+                                            {currentMetric.exposure_query && (
+                                                <IconCheckCircle fontSize={18} color="var(--primary)" />
+                                            )}
+                                        </div>
+                                        <div className="text-muted text-sm leading-relaxed">
+                                            Define your own exposure metric for specific use cases, such as counting by
+                                            sessions instead of users. This gives you full control but requires careful
+                                            configuration.
+                                        </div>
+                                    </div>
+                                </div>
+                                {currentMetric.exposure_query && (
+                                    <>
+                                        <ActionFilter
+                                            bordered
+                                            filters={queryNodeToFilter(
+                                                currentMetric.exposure_query as InsightQueryNode
+                                            )}
+                                            setFilters={({
+                                                actions,
+                                                events,
+                                                data_warehouse,
+                                            }: Partial<FilterType>): void => {
+                                                const series = actionsAndEventsToSeries(
+                                                    { actions, events, data_warehouse } as any,
+                                                    true,
+                                                    MathAvailability.All
+                                                )
+
+                                                setTrendsExposureMetric({
+                                                    metricIdx,
+                                                    series,
+                                                })
+                                            }}
+                                            typeKey="experiment-metric"
+                                            buttonCopy="Add graph series"
+                                            showSeriesIndicator={true}
+                                            entitiesLimit={1}
+                                            showNumericalPropsOnly={true}
+                                            {...commonActionFilterProps}
+                                        />
+                                        <div className="mt-4 space-y-4">
+                                            <TestAccountFilterSwitch
+                                                checked={(() => {
+                                                    const val = currentMetric.exposure_query?.filterTestAccounts
+                                                    return hasFilters ? !!val : false
+                                                })()}
+                                                onChange={(checked: boolean) => {
+                                                    setTrendsExposureMetric({
+                                                        metricIdx,
+                                                        filterTestAccounts: checked,
+                                                    })
+                                                }}
+                                                fullWidth
+                                            />
+                                        </div>
+                                        {isExperimentRunning && (
+                                            <LemonBanner type="info" className="mt-3 mb-3">
+                                                Preview insights are generated based on {EXPERIMENT_DEFAULT_DURATION}{' '}
+                                                days of data. This can cause a mismatch between the preview and the
+                                                actual results.
+                                            </LemonBanner>
+                                        )}
+                                        <div className="mt-4">
+                                            <Query
+                                                query={{
+                                                    kind: NodeKind.InsightVizNode,
+                                                    source: currentMetric.exposure_query,
+                                                    showTable: false,
+                                                    showLastComputation: true,
+                                                    showLastComputationRefresh: false,
+                                                }}
+                                                readOnly
+                                            />
+                                        </div>
+                                    </>
+                                )}
+                            </>
+                        ),
+                    },
+                ]}
             />
-            <div className="mt-4 space-y-4">
-                <TestAccountFilterSwitch
-                    checked={hasFilters ? !!currentMetric.count_query?.filterTestAccounts : false}
-                    onChange={(checked: boolean) => {
-                        setTrendsMetric({
-                            metricIdx,
-                            filterTestAccounts: checked,
-                        })
-                    }}
-                    fullWidth
-                />
-            </div>
-            {isExperimentRunning && (
-                <LemonBanner type="info" className="mt-3 mb-3">
-                    Preview insights are generated based on {EXPERIMENT_DEFAULT_DURATION} days of data. This can cause a
-                    mismatch between the preview and the actual results.
-                </LemonBanner>
-            )}
-            <div className="mt-4">
-                <Query
-                    query={{
-                        kind: NodeKind.InsightVizNode,
-                        source: currentMetric.count_query,
-                        showTable: false,
-                        showLastComputation: true,
-                        showLastComputationRefresh: false,
-                    }}
-                    readOnly
-                />
-            </div>
         </>
     )
 }

From ca73fa20f5bec11c5bfd44b09983c1aaad1e53e8 Mon Sep 17 00:00:00 2001
From: Juraj Majerik <juro.majerik@gmail.com>
Date: Mon, 23 Dec 2024 13:23:46 +0100
Subject: [PATCH 05/15] feat(experiments): new secondary metrics view (#27123)

---
 .../ExperimentView/ExperimentView.tsx         |  21 ++-
 .../experiments/ExperimentView/Goal.tsx       |  19 +-
 .../experiments/ExperimentView/Overview.tsx   |  98 ++++++----
 .../ExperimentView/SecondaryMetricsTable.tsx  |  77 +-------
 .../ExperimentView/SummaryTable.tsx           |  14 +-
 .../experiments/ExperimentView/components.tsx |  88 +++------
 .../Metrics/PrimaryMetricModal.tsx            |   4 +-
 .../Metrics/PrimaryTrendsExposureModal.tsx    |  16 +-
 .../Metrics/SecondaryMetricModal.tsx          |  44 ++---
 .../experiments/MetricsView/DeltaChart.tsx    |  47 ++++-
 .../experiments/MetricsView/MetricsView.tsx   | 102 ++++++----
 .../scenes/experiments/MetricsView/const.tsx  |   1 +
 .../scenes/experiments/experimentLogic.tsx    | 175 +++++++++---------
 13 files changed, 342 insertions(+), 364 deletions(-)

diff --git a/frontend/src/scenes/experiments/ExperimentView/ExperimentView.tsx b/frontend/src/scenes/experiments/ExperimentView/ExperimentView.tsx
index c5dc5eb43cb4b..1d66bee399d04 100644
--- a/frontend/src/scenes/experiments/ExperimentView/ExperimentView.tsx
+++ b/frontend/src/scenes/experiments/ExperimentView/ExperimentView.tsx
@@ -7,6 +7,7 @@ import { WebExperimentImplementationDetails } from 'scenes/experiments/WebExperi
 import { ExperimentImplementationDetails } from '../ExperimentImplementationDetails'
 import { experimentLogic } from '../experimentLogic'
 import { PrimaryMetricModal } from '../Metrics/PrimaryMetricModal'
+import { SecondaryMetricModal } from '../Metrics/SecondaryMetricModal'
 import { MetricsView } from '../MetricsView/MetricsView'
 import {
     ExperimentLoadingAnimation,
@@ -52,7 +53,11 @@ const ResultsTab = (): JSX.Element => {
                     )}
                 </>
             )}
-            <SecondaryMetricsTable experimentId={experiment.id} />
+            {featureFlags[FEATURE_FLAGS.EXPERIMENTS_MULTIPLE_METRICS] ? (
+                <MetricsView isSecondary={true} />
+            ) : (
+                <SecondaryMetricsTable experimentId={experiment.id} />
+            )}
         </div>
     )
 }
@@ -70,8 +75,15 @@ const VariantsTab = (): JSX.Element => {
 }
 
 export function ExperimentView(): JSX.Element {
-    const { experimentLoading, metricResultsLoading, experimentId, metricResults, tabKey, featureFlags } =
-        useValues(experimentLogic)
+    const {
+        experimentLoading,
+        metricResultsLoading,
+        secondaryMetricResultsLoading,
+        experimentId,
+        metricResults,
+        tabKey,
+        featureFlags,
+    } = useValues(experimentLogic)
 
     const { setTabKey } = useActions(experimentLogic)
     const result = metricResults?.[0]
@@ -86,7 +98,7 @@ export function ExperimentView(): JSX.Element {
                 ) : (
                     <>
                         <Info />
-                        {metricResultsLoading ? (
+                        {metricResultsLoading || secondaryMetricResultsLoading ? (
                             <ExperimentLoadingAnimation />
                         ) : (
                             <>
@@ -131,6 +143,7 @@ export function ExperimentView(): JSX.Element {
                             </>
                         )}
                         <PrimaryMetricModal experimentId={experimentId} />
+                        <SecondaryMetricModal experimentId={experimentId} />
                         <DistributionModal experimentId={experimentId} />
                         <ReleaseConditionsModal experimentId={experimentId} />
                     </>
diff --git a/frontend/src/scenes/experiments/ExperimentView/Goal.tsx b/frontend/src/scenes/experiments/ExperimentView/Goal.tsx
index ac41a2c663b4c..0438835528246 100644
--- a/frontend/src/scenes/experiments/ExperimentView/Goal.tsx
+++ b/frontend/src/scenes/experiments/ExperimentView/Goal.tsx
@@ -114,7 +114,7 @@ export function MetricDisplayOld({ filters }: { filters?: FilterType }): JSX.Ele
 
 export function ExposureMetric({ experimentId }: { experimentId: Experiment['id'] }): JSX.Element {
     const { experiment, featureFlags } = useValues(experimentLogic({ experimentId }))
-    const { updateExperimentExposure, loadExperiment, setExperiment } = useActions(experimentLogic({ experimentId }))
+    const { updateExperimentGoal, loadExperiment, setExperiment } = useActions(experimentLogic({ experimentId }))
     const [isModalOpen, setIsModalOpen] = useState(false)
 
     const metricIdx = 0
@@ -213,16 +213,13 @@ export function ExposureMetric({ experimentId }: { experimentId: Experiment['id'
                             status="danger"
                             size="xsmall"
                             onClick={() => {
-                                // :FLAG: CLEAN UP AFTER MIGRATION
-                                if (featureFlags[FEATURE_FLAGS.EXPERIMENTS_HOGQL]) {
-                                    setExperiment({
-                                        ...experiment,
-                                        metrics: experiment.metrics.map((metric, idx) =>
-                                            idx === metricIdx ? { ...metric, exposure_query: undefined } : metric
-                                        ),
-                                    })
-                                }
-                                updateExperimentExposure(null)
+                                setExperiment({
+                                    ...experiment,
+                                    metrics: experiment.metrics.map((metric, idx) =>
+                                        idx === metricIdx ? { ...metric, exposure_query: undefined } : metric
+                                    ),
+                                })
+                                updateExperimentGoal()
                             }}
                         >
                             Reset
diff --git a/frontend/src/scenes/experiments/ExperimentView/Overview.tsx b/frontend/src/scenes/experiments/ExperimentView/Overview.tsx
index c8c44c8ea5c04..351e58e946646 100644
--- a/frontend/src/scenes/experiments/ExperimentView/Overview.tsx
+++ b/frontend/src/scenes/experiments/ExperimentView/Overview.tsx
@@ -1,62 +1,80 @@
 import { useValues } from 'kea'
 
 import { CachedExperimentFunnelsQueryResponse, CachedExperimentTrendsQueryResponse } from '~/queries/schema'
+import { ExperimentIdType } from '~/types'
 
 import { experimentLogic } from '../experimentLogic'
 import { VariantTag } from './components'
 
-export function Overview(): JSX.Element {
-    const { experimentId, metricResults, getIndexForVariant, getHighestProbabilityVariant, areResultsSignificant } =
-        useValues(experimentLogic)
+export function WinningVariantText({
+    result,
+    experimentId,
+}: {
+    result: CachedExperimentFunnelsQueryResponse | CachedExperimentTrendsQueryResponse
+    experimentId: ExperimentIdType
+}): JSX.Element {
+    const { getIndexForVariant, getHighestProbabilityVariant } = useValues(experimentLogic)
 
-    const result = metricResults?.[0]
-    if (!result) {
-        return <></>
-    }
-
-    function WinningVariantText(): JSX.Element {
-        const highestProbabilityVariant = getHighestProbabilityVariant(
-            result as CachedExperimentFunnelsQueryResponse | CachedExperimentTrendsQueryResponse
-        )
-        const index = getIndexForVariant(
-            result as CachedExperimentFunnelsQueryResponse | CachedExperimentTrendsQueryResponse,
-            highestProbabilityVariant || ''
-        )
-        if (highestProbabilityVariant && index !== null && result) {
-            const { probability } = result
-
-            return (
-                <div className="items-center inline-flex flex-wrap">
-                    <VariantTag experimentId={experimentId} variantKey={highestProbabilityVariant} />
-                    <span>&nbsp;is winning with a&nbsp;</span>
-                    <span className="font-semibold text-success items-center">
-                        {`${(probability[highestProbabilityVariant] * 100).toFixed(2)}% probability`}&nbsp;
-                    </span>
-                    <span>of being best.&nbsp;</span>
-                </div>
-            )
-        }
+    const highestProbabilityVariant = getHighestProbabilityVariant(result)
+    const index = getIndexForVariant(result, highestProbabilityVariant || '')
+    if (highestProbabilityVariant && index !== null && result) {
+        const { probability } = result
 
-        return <></>
-    }
-
-    function SignificanceText(): JSX.Element {
         return (
-            <div className="flex-wrap">
-                <span>Your results are&nbsp;</span>
-                <span className="font-semibold">
-                    {`${areResultsSignificant(0) ? 'significant' : 'not significant'}`}.
+            <div className="items-center inline-flex flex-wrap">
+                <VariantTag experimentId={experimentId} variantKey={highestProbabilityVariant} />
+                <span>&nbsp;is winning with a&nbsp;</span>
+                <span className="font-semibold text-success items-center">
+                    {`${(probability[highestProbabilityVariant] * 100).toFixed(2)}% probability`}&nbsp;
                 </span>
+                <span>of being best.&nbsp;</span>
             </div>
         )
     }
 
+    return <></>
+}
+
+export function SignificanceText({
+    metricIndex,
+    isSecondary = false,
+}: {
+    metricIndex: number
+    isSecondary?: boolean
+}): JSX.Element {
+    const { isPrimaryMetricSignificant, isSecondaryMetricSignificant } = useValues(experimentLogic)
+
+    return (
+        <div className="flex-wrap">
+            <span>Your results are&nbsp;</span>
+            <span className="font-semibold">
+                {`${
+                    isSecondary
+                        ? isSecondaryMetricSignificant(metricIndex)
+                        : isPrimaryMetricSignificant(metricIndex)
+                        ? 'significant'
+                        : 'not significant'
+                }`}
+                .
+            </span>
+        </div>
+    )
+}
+
+export function Overview({ metricIndex = 0 }: { metricIndex?: number }): JSX.Element {
+    const { experimentId, metricResults } = useValues(experimentLogic)
+
+    const result = metricResults?.[metricIndex]
+    if (!result) {
+        return <></>
+    }
+
     return (
         <div>
             <h2 className="font-semibold text-lg">Summary</h2>
             <div className="items-center inline-flex flex-wrap">
-                <WinningVariantText />
-                <SignificanceText />
+                <WinningVariantText result={result} experimentId={experimentId} />
+                <SignificanceText metricIndex={metricIndex} />
             </div>
         </div>
     )
diff --git a/frontend/src/scenes/experiments/ExperimentView/SecondaryMetricsTable.tsx b/frontend/src/scenes/experiments/ExperimentView/SecondaryMetricsTable.tsx
index 7f5bcbabfa3a1..e8d5baf4eed0e 100644
--- a/frontend/src/scenes/experiments/ExperimentView/SecondaryMetricsTable.tsx
+++ b/frontend/src/scenes/experiments/ExperimentView/SecondaryMetricsTable.tsx
@@ -1,4 +1,4 @@
-import { IconInfo, IconPencil, IconPlus } from '@posthog/icons'
+import { IconInfo, IconPencil } from '@posthog/icons'
 import { LemonButton, LemonTable, LemonTableColumns, Tooltip } from '@posthog/lemon-ui'
 import { useActions, useValues } from 'kea'
 import { EntityFilterInfo } from 'lib/components/EntityFilterInfo'
@@ -8,15 +8,13 @@ import { useState } from 'react'
 
 import { Experiment, InsightType } from '~/types'
 
-import { experimentLogic, getDefaultFunnelsMetric, TabularSecondaryMetricResults } from '../experimentLogic'
+import { experimentLogic, TabularSecondaryMetricResults } from '../experimentLogic'
 import { SecondaryMetricChartModal } from '../Metrics/SecondaryMetricChartModal'
-import { SecondaryMetricModal } from '../Metrics/SecondaryMetricModal'
+import { MAX_SECONDARY_METRICS } from '../MetricsView/const'
+import { AddSecondaryMetric } from '../MetricsView/MetricsView'
 import { VariantTag } from './components'
 
-const MAX_SECONDARY_METRICS = 10
-
 export function SecondaryMetricsTable({ experimentId }: { experimentId: Experiment['id'] }): JSX.Element {
-    const [isEditModalOpen, setIsEditModalOpen] = useState(false)
     const [isChartModalOpen, setIsChartModalOpen] = useState(false)
     const [modalMetricIdx, setModalMetricIdx] = useState<number | null>(null)
 
@@ -34,18 +32,7 @@ export function SecondaryMetricsTable({ experimentId }: { experimentId: Experime
         experimentMathAggregationForTrends,
         getHighestProbabilityVariant,
     } = useValues(experimentLogic({ experimentId }))
-    const { loadExperiment } = useActions(experimentLogic({ experimentId }))
-
-    const openEditModal = (idx: number): void => {
-        setModalMetricIdx(idx)
-        setIsEditModalOpen(true)
-    }
-
-    const closeEditModal = (): void => {
-        setIsEditModalOpen(false)
-        setModalMetricIdx(null)
-        loadExperiment()
-    }
+    const { openSecondaryMetricModal } = useActions(experimentLogic({ experimentId }))
 
     const openChartModal = (idx: number): void => {
         setModalMetricIdx(idx)
@@ -107,7 +94,7 @@ export function SecondaryMetricsTable({ experimentId }: { experimentId: Experime
                                 type="secondary"
                                 size="xsmall"
                                 icon={<IconPencil />}
-                                onClick={() => openEditModal(idx)}
+                                onClick={() => openSecondaryMetricModal(idx)}
                             />
                         </div>
                     </div>
@@ -266,11 +253,7 @@ export function SecondaryMetricsTable({ experimentId }: { experimentId: Experime
                         <div className="ml-auto">
                             {metrics && metrics.length > 0 && (
                                 <div className="mb-2 mt-4 justify-end">
-                                    <AddSecondaryMetricButton
-                                        experimentId={experimentId}
-                                        metrics={metrics}
-                                        openEditModal={openEditModal}
-                                    />
+                                    <AddSecondaryMetric />
                                 </div>
                             )}
                         </div>
@@ -292,21 +275,11 @@ export function SecondaryMetricsTable({ experimentId }: { experimentId: Experime
                                 Add up to {MAX_SECONDARY_METRICS} secondary metrics to monitor side effects of your
                                 experiment.
                             </div>
-                            <AddSecondaryMetricButton
-                                experimentId={experimentId}
-                                metrics={metrics}
-                                openEditModal={openEditModal}
-                            />
+                            <AddSecondaryMetric />
                         </div>
                     </div>
                 )}
             </div>
-            <SecondaryMetricModal
-                metricIdx={modalMetricIdx ?? 0}
-                isOpen={isEditModalOpen}
-                onClose={closeEditModal}
-                experimentId={experimentId}
-            />
             <SecondaryMetricChartModal
                 experimentId={experimentId}
                 metricIdx={modalMetricIdx ?? 0}
@@ -316,37 +289,3 @@ export function SecondaryMetricsTable({ experimentId }: { experimentId: Experime
         </>
     )
 }
-
-const AddSecondaryMetricButton = ({
-    experimentId,
-    metrics,
-    openEditModal,
-}: {
-    experimentId: Experiment['id']
-    metrics: any
-    openEditModal: (metricIdx: number) => void
-}): JSX.Element => {
-    const { experiment } = useValues(experimentLogic({ experimentId }))
-    const { setExperiment } = useActions(experimentLogic({ experimentId }))
-    return (
-        <LemonButton
-            icon={<IconPlus />}
-            type="secondary"
-            size="xsmall"
-            onClick={() => {
-                const newMetricsSecondary = [...experiment.metrics_secondary, getDefaultFunnelsMetric()]
-                setExperiment({
-                    metrics_secondary: newMetricsSecondary,
-                })
-                openEditModal(newMetricsSecondary.length - 1)
-            }}
-            disabledReason={
-                metrics.length >= MAX_SECONDARY_METRICS
-                    ? `You can only add up to ${MAX_SECONDARY_METRICS} secondary metrics.`
-                    : undefined
-            }
-        >
-            Add metric
-        </LemonButton>
-    )
-}
diff --git a/frontend/src/scenes/experiments/ExperimentView/SummaryTable.tsx b/frontend/src/scenes/experiments/ExperimentView/SummaryTable.tsx
index adb1bc9d69616..14ee1d3cbcf7a 100644
--- a/frontend/src/scenes/experiments/ExperimentView/SummaryTable.tsx
+++ b/frontend/src/scenes/experiments/ExperimentView/SummaryTable.tsx
@@ -22,13 +22,21 @@ import {
 import { experimentLogic } from '../experimentLogic'
 import { VariantTag } from './components'
 
-export function SummaryTable(): JSX.Element {
+export function SummaryTable({
+    metricIndex = 0,
+    isSecondary = false,
+}: {
+    metricIndex?: number
+    isSecondary?: boolean
+}): JSX.Element {
     const {
         experimentId,
         experiment,
         metricResults,
+        secondaryMetricResults,
         tabularExperimentResults,
         getMetricType,
+        getSecondaryMetricType,
         exposureCountDataForVariant,
         conversionRateForVariant,
         experimentMathAggregationForTrends,
@@ -36,8 +44,8 @@ export function SummaryTable(): JSX.Element {
         getHighestProbabilityVariant,
         credibleIntervalForVariant,
     } = useValues(experimentLogic)
-    const metricType = getMetricType(0)
-    const result = metricResults?.[0]
+    const metricType = isSecondary ? getSecondaryMetricType(metricIndex) : getMetricType(metricIndex)
+    const result = isSecondary ? secondaryMetricResults?.[metricIndex] : metricResults?.[metricIndex]
     if (!result) {
         return <></>
     }
diff --git a/frontend/src/scenes/experiments/ExperimentView/components.tsx b/frontend/src/scenes/experiments/ExperimentView/components.tsx
index 87885a3761b79..afa0e77054f99 100644
--- a/frontend/src/scenes/experiments/ExperimentView/components.tsx
+++ b/frontend/src/scenes/experiments/ExperimentView/components.tsx
@@ -42,7 +42,6 @@ import {
     Experiment as ExperimentType,
     ExperimentIdType,
     ExperimentResults,
-    FilterType,
     InsightShortId,
     InsightType,
 } from '~/types'
@@ -104,8 +103,8 @@ export function VariantTag({
 }
 
 export function ResultsTag({ metricIndex = 0 }: { metricIndex?: number }): JSX.Element {
-    const { areResultsSignificant, significanceDetails } = useValues(experimentLogic)
-    const result: { color: LemonTagType; label: string } = areResultsSignificant(metricIndex)
+    const { isPrimaryMetricSignificant, significanceDetails } = useValues(experimentLogic)
+    const result: { color: LemonTagType; label: string } = isPrimaryMetricSignificant(metricIndex)
         ? { color: 'success', label: 'Significant' }
         : { color: 'primary', label: 'Not significant' }
 
@@ -210,63 +209,24 @@ export function ResultsQuery({
 }
 
 export function ExploreButton({
-    icon = <IconAreaChart />,
     metricIndex = 0,
+    isSecondary = false,
 }: {
-    icon?: JSX.Element
     metricIndex?: number
+    isSecondary?: boolean
 }): JSX.Element {
-    const { metricResults, experiment, featureFlags } = useValues(experimentLogic)
-    const result = metricResults?.[metricIndex]
-
-    // keep in sync with https://github.com/PostHog/posthog/blob/master/ee/clickhouse/queries/experiments/funnel_experiment_result.py#L71
-    // :TRICKY: In the case of no results, we still want users to explore the query, so they can debug further.
-    // This generates a close enough query that the backend would use to compute results.
-    const filtersFromExperiment: Partial<FilterType> = {
-        ...experiment.filters,
-        date_from: experiment.start_date,
-        date_to: experiment.end_date,
-        explicit_date: true,
-        breakdown: `$feature/${experiment.feature_flag_key ?? experiment.feature_flag?.key}`,
-        breakdown_type: 'event',
-        properties: [],
-    }
-
-    let query: InsightVizNode
-    if (featureFlags[FEATURE_FLAGS.EXPERIMENTS_HOGQL]) {
-        const newQueryResults = result as unknown as
-            | CachedExperimentTrendsQueryResponse
-            | CachedExperimentFunnelsQueryResponse
-
-        const source =
-            newQueryResults.kind === NodeKind.ExperimentTrendsQuery
-                ? newQueryResults.count_query
-                : newQueryResults.funnels_query
+    const { metricResults, secondaryMetricResults } = useValues(experimentLogic)
+    const result = isSecondary ? secondaryMetricResults?.[metricIndex] : metricResults?.[metricIndex]
 
-        query = {
-            kind: NodeKind.InsightVizNode,
-            source: source as InsightQueryNode,
-        }
-    } else {
-        const oldQueryResults = result as unknown as ExperimentResults['result']
-
-        if (!oldQueryResults?.filters) {
-            return <></>
-        }
+    if (!result) {
+        return <></>
+    }
 
-        query = {
-            kind: NodeKind.InsightVizNode,
-            source: filtersToQueryNode(
-                transformResultFilters(
-                    oldQueryResults?.filters
-                        ? { ...oldQueryResults.filters, explicit_date: true }
-                        : filtersFromExperiment
-                )
-            ),
-            showTable: true,
-            showLastComputation: true,
-            showLastComputationRefresh: false,
-        }
+    const query: InsightVizNode = {
+        kind: NodeKind.InsightVizNode,
+        source: (result.kind === NodeKind.ExperimentTrendsQuery
+            ? result.count_query
+            : result.funnels_query) as InsightQueryNode,
     }
 
     return (
@@ -274,10 +234,10 @@ export function ExploreButton({
             className="ml-auto -translate-y-2"
             size="xsmall"
             type="primary"
-            icon={icon}
+            icon={<IconAreaChart />}
             to={urls.insightNew(undefined, undefined, query)}
         >
-            Explore results
+            Explore as Insight
         </LemonButton>
     )
 }
@@ -462,7 +422,7 @@ export function PageHeaderCustom(): JSX.Element {
         experiment,
         isExperimentRunning,
         isExperimentStopped,
-        areResultsSignificant,
+        isPrimaryMetricSignificant,
         isSingleVariantShipped,
         featureFlags,
         hasGoalSet,
@@ -516,7 +476,7 @@ export function PageHeaderCustom(): JSX.Element {
                                                 fullWidth
                                                 data-attr="refresh-experiment"
                                             >
-                                                Refresh experiment results
+                                                Refresh primary metrics
                                             </LemonButton>
                                             <LemonButton
                                                 onClick={() => loadSecondaryMetricResults(true)}
@@ -595,7 +555,7 @@ export function PageHeaderCustom(): JSX.Element {
                         </div>
                     )}
                     {featureFlags[FEATURE_FLAGS.EXPERIMENT_MAKE_DECISION] &&
-                        areResultsSignificant(0) &&
+                        isPrimaryMetricSignificant(0) &&
                         !isSingleVariantShipped && (
                             <>
                                 <Tooltip title="Choose a variant and roll it out to all users">
@@ -704,7 +664,7 @@ export function ActionBanner(): JSX.Element {
         experimentLoading,
         metricResultsLoading,
         isExperimentRunning,
-        areResultsSignificant,
+        isPrimaryMetricSignificant,
         isExperimentStopped,
         funnelResultsPersonsTotal,
         actualRunningTime,
@@ -774,7 +734,7 @@ export function ActionBanner(): JSX.Element {
     }
 
     // Running, results present, not significant
-    if (isExperimentRunning && result && !isExperimentStopped && !areResultsSignificant(0)) {
+    if (isExperimentRunning && result && !isExperimentStopped && !isPrimaryMetricSignificant(0)) {
         // Results insignificant, but a large enough sample/running time has been achieved
         // Further collection unlikely to change the result -> recommmend cutting the losses
         if (
@@ -808,7 +768,7 @@ export function ActionBanner(): JSX.Element {
     }
 
     // Running, results significant
-    if (isExperimentRunning && !isExperimentStopped && areResultsSignificant(0) && result) {
+    if (isExperimentRunning && !isExperimentStopped && isPrimaryMetricSignificant(0) && result) {
         const { probability } = result
         const winningVariant = getHighestProbabilityVariant(result)
         if (!winningVariant) {
@@ -856,7 +816,7 @@ export function ActionBanner(): JSX.Element {
     }
 
     // Stopped, results significant
-    if (isExperimentStopped && areResultsSignificant(0)) {
+    if (isExperimentStopped && isPrimaryMetricSignificant(0)) {
         return (
             <LemonBanner type="success" className="mt-4">
                 You have stopped this experiment, and it is no longer collecting data. With significant results in hand,
@@ -874,7 +834,7 @@ export function ActionBanner(): JSX.Element {
     }
 
     // Stopped, results not significant
-    if (isExperimentStopped && result && !areResultsSignificant(0)) {
+    if (isExperimentStopped && result && !isPrimaryMetricSignificant(0)) {
         return (
             <LemonBanner type="info" className="mt-4">
                 You have stopped this experiment, and it is no longer collecting data. Because your results are not
diff --git a/frontend/src/scenes/experiments/Metrics/PrimaryMetricModal.tsx b/frontend/src/scenes/experiments/Metrics/PrimaryMetricModal.tsx
index 1afce61899d6b..31d4eec71265b 100644
--- a/frontend/src/scenes/experiments/Metrics/PrimaryMetricModal.tsx
+++ b/frontend/src/scenes/experiments/Metrics/PrimaryMetricModal.tsx
@@ -53,7 +53,7 @@ export function PrimaryMetricModal({ experimentId }: { experimentId: Experiment[
                             setExperiment({
                                 metrics: newMetrics,
                             })
-                            updateExperimentGoal(experiment.filters)
+                            updateExperimentGoal()
                         }}
                     >
                         Delete
@@ -74,7 +74,7 @@ export function PrimaryMetricModal({ experimentId }: { experimentId: Experiment[
                             }
                             form="edit-experiment-goal-form"
                             onClick={() => {
-                                updateExperimentGoal(experiment.filters)
+                                updateExperimentGoal()
                             }}
                             type="primary"
                             loading={experimentLoading}
diff --git a/frontend/src/scenes/experiments/Metrics/PrimaryTrendsExposureModal.tsx b/frontend/src/scenes/experiments/Metrics/PrimaryTrendsExposureModal.tsx
index 7c4f49c114a73..a7d410258d662 100644
--- a/frontend/src/scenes/experiments/Metrics/PrimaryTrendsExposureModal.tsx
+++ b/frontend/src/scenes/experiments/Metrics/PrimaryTrendsExposureModal.tsx
@@ -1,6 +1,5 @@
 import { LemonButton, LemonModal } from '@posthog/lemon-ui'
 import { useActions, useValues } from 'kea'
-import { FEATURE_FLAGS } from 'lib/constants'
 
 import { Experiment } from '~/types'
 
@@ -16,8 +15,8 @@ export function PrimaryTrendsExposureModal({
     isOpen: boolean
     onClose: () => void
 }): JSX.Element {
-    const { experiment, experimentLoading, featureFlags } = useValues(experimentLogic({ experimentId }))
-    const { updateExperimentExposure, updateExperiment } = useActions(experimentLogic({ experimentId }))
+    const { experiment, experimentLoading } = useValues(experimentLogic({ experimentId }))
+    const { updateExperiment } = useActions(experimentLogic({ experimentId }))
 
     return (
         <LemonModal
@@ -33,14 +32,9 @@ export function PrimaryTrendsExposureModal({
                     <LemonButton
                         form="edit-experiment-exposure-form"
                         onClick={() => {
-                            // :FLAG: CLEAN UP AFTER MIGRATION
-                            if (featureFlags[FEATURE_FLAGS.EXPERIMENTS_HOGQL]) {
-                                updateExperiment({
-                                    metrics: experiment.metrics,
-                                })
-                            } else {
-                                updateExperimentExposure(experiment.parameters.custom_exposure_filter ?? null)
-                            }
+                            updateExperiment({
+                                metrics: experiment.metrics,
+                            })
                         }}
                         type="primary"
                         loading={experimentLoading}
diff --git a/frontend/src/scenes/experiments/Metrics/SecondaryMetricModal.tsx b/frontend/src/scenes/experiments/Metrics/SecondaryMetricModal.tsx
index 423fb1c48d5c1..b61af3fff9c7e 100644
--- a/frontend/src/scenes/experiments/Metrics/SecondaryMetricModal.tsx
+++ b/frontend/src/scenes/experiments/Metrics/SecondaryMetricModal.tsx
@@ -7,25 +7,29 @@ import { experimentLogic, getDefaultFunnelsMetric, getDefaultTrendsMetric } from
 import { SecondaryGoalFunnels } from './SecondaryGoalFunnels'
 import { SecondaryGoalTrends } from './SecondaryGoalTrends'
 
-export function SecondaryMetricModal({
-    experimentId,
-    metricIdx,
-    isOpen,
-    onClose,
-}: {
-    experimentId: Experiment['id']
-    metricIdx: number
-    isOpen: boolean
-    onClose: () => void
-}): JSX.Element {
-    const { experiment, experimentLoading, getSecondaryMetricType } = useValues(experimentLogic({ experimentId }))
-    const { setExperiment, updateExperiment } = useActions(experimentLogic({ experimentId }))
+export function SecondaryMetricModal({ experimentId }: { experimentId: Experiment['id'] }): JSX.Element {
+    const {
+        experiment,
+        experimentLoading,
+        getSecondaryMetricType,
+        isSecondaryMetricModalOpen,
+        editingSecondaryMetricIndex,
+    } = useValues(experimentLogic({ experimentId }))
+    const { setExperiment, updateExperimentGoal, closeSecondaryMetricModal } = useActions(
+        experimentLogic({ experimentId })
+    )
+
+    if (!editingSecondaryMetricIndex && editingSecondaryMetricIndex !== 0) {
+        return <></>
+    }
+
+    const metricIdx = editingSecondaryMetricIndex
     const metricType = getSecondaryMetricType(metricIdx)
 
     return (
         <LemonModal
-            isOpen={isOpen}
-            onClose={onClose}
+            isOpen={isSecondaryMetricModalOpen}
+            onClose={closeSecondaryMetricModal}
             width={1000}
             title="Change secondary metric"
             footer={
@@ -40,22 +44,18 @@ export function SecondaryMetricModal({
                             setExperiment({
                                 metrics_secondary: newMetricsSecondary,
                             })
-                            updateExperiment({
-                                metrics_secondary: newMetricsSecondary,
-                            })
+                            updateExperimentGoal()
                         }}
                     >
                         Delete
                     </LemonButton>
                     <div className="flex items-center gap-2 ml-auto">
-                        <LemonButton type="secondary" onClick={onClose}>
+                        <LemonButton type="secondary" onClick={closeSecondaryMetricModal}>
                             Cancel
                         </LemonButton>
                         <LemonButton
                             onClick={() => {
-                                updateExperiment({
-                                    metrics_secondary: experiment.metrics_secondary,
-                                })
+                                updateExperimentGoal()
                             }}
                             type="primary"
                             loading={experimentLoading}
diff --git a/frontend/src/scenes/experiments/MetricsView/DeltaChart.tsx b/frontend/src/scenes/experiments/MetricsView/DeltaChart.tsx
index 08b475148375a..2f7455288b68f 100644
--- a/frontend/src/scenes/experiments/MetricsView/DeltaChart.tsx
+++ b/frontend/src/scenes/experiments/MetricsView/DeltaChart.tsx
@@ -1,5 +1,5 @@
 import { IconActivity, IconGraph, IconMinus, IconPencil, IconTrending } from '@posthog/icons'
-import { LemonButton, LemonModal, LemonTag, LemonTagType, Tooltip } from '@posthog/lemon-ui'
+import { LemonBanner, LemonButton, LemonModal, LemonTag, LemonTagType, Tooltip } from '@posthog/lemon-ui'
 import { useActions, useValues } from 'kea'
 import { humanFriendlyNumber } from 'lib/utils'
 import { useEffect, useRef, useState } from 'react'
@@ -8,7 +8,9 @@ import { themeLogic } from '~/layout/navigation-3000/themeLogic'
 import { InsightType, TrendExperimentVariant } from '~/types'
 
 import { experimentLogic } from '../experimentLogic'
-import { ResultsQuery, VariantTag } from '../ExperimentView/components'
+import { ExploreButton, ResultsQuery, VariantTag } from '../ExperimentView/components'
+import { SignificanceText, WinningVariantText } from '../ExperimentView/Overview'
+import { SummaryTable } from '../ExperimentView/SummaryTable'
 import { NoResultEmptyState } from './NoResultEmptyState'
 
 function formatTickValue(value: number): string {
@@ -34,6 +36,7 @@ function formatTickValue(value: number): string {
 }
 
 export function DeltaChart({
+    isSecondary,
     result,
     error,
     variants,
@@ -44,6 +47,7 @@ export function DeltaChart({
     tickValues,
     chartBound,
 }: {
+    isSecondary: boolean
     result: any
     error: any
     variants: any[]
@@ -64,7 +68,7 @@ export function DeltaChart({
     } = useValues(experimentLogic)
 
     const { experiment } = useValues(experimentLogic)
-    const { openPrimaryMetricModal } = useActions(experimentLogic)
+    const { openPrimaryMetricModal, openSecondaryMetricModal } = useActions(experimentLogic)
     const [tooltipData, setTooltipData] = useState<{ x: number; y: number; variant: string } | null>(null)
     const [emptyStateTooltipVisible, setEmptyStateTooltipVisible] = useState(true)
     const [tooltipPosition, setTooltipPosition] = useState({ x: 0, y: 0 })
@@ -182,7 +186,11 @@ export function DeltaChart({
                                     type="secondary"
                                     size="xsmall"
                                     icon={<IconPencil fontSize="12" />}
-                                    onClick={() => openPrimaryMetricModal(metricIndex)}
+                                    onClick={() =>
+                                        isSecondary
+                                            ? openSecondaryMetricModal(metricIndex)
+                                            : openPrimaryMetricModal(metricIndex)
+                                    }
                                 />
                             </div>
                             <LemonTag type="muted" size="small">
@@ -693,7 +701,7 @@ export function DeltaChart({
                             flexDirection: 'column',
                         }}
                     >
-                        <SignificanceHighlight metricIndex={metricIndex} />
+                        <SignificanceHighlight metricIndex={metricIndex} isSecondary={isSecondary} />
                         <div className="flex-1 flex items-center justify-center">
                             <LemonButton
                                 type="secondary"
@@ -712,7 +720,7 @@ export function DeltaChart({
                 isOpen={isModalOpen}
                 onClose={() => setIsModalOpen(false)}
                 width={1200}
-                title={`Results for ${metric.name || 'Untitled metric'}`}
+                title={`Metric results: ${metric.name || 'Untitled metric'}`}
                 footer={
                     <LemonButton
                         form="secondary-metric-modal-form"
@@ -723,19 +731,38 @@ export function DeltaChart({
                     </LemonButton>
                 }
             >
+                <div className="flex justify-end">
+                    <ExploreButton metricIndex={metricIndex} isSecondary={isSecondary} />
+                </div>
+                <LemonBanner type="info" className="mb-4">
+                    <div className="items-center inline-flex flex-wrap">
+                        <WinningVariantText result={result} experimentId={experimentId} />
+                        <SignificanceText metricIndex={metricIndex} />
+                    </div>
+                </LemonBanner>
+                <SummaryTable metricIndex={metricIndex} isSecondary={isSecondary} />
                 <ResultsQuery targetResults={result} showTable={true} />
             </LemonModal>
         </div>
     )
 }
 
-function SignificanceHighlight({ metricIndex = 0 }: { metricIndex?: number }): JSX.Element {
-    const { areResultsSignificant, significanceDetails } = useValues(experimentLogic)
-    const result: { color: LemonTagType; label: string } = areResultsSignificant(metricIndex)
+function SignificanceHighlight({
+    metricIndex = 0,
+    isSecondary = false,
+}: {
+    metricIndex?: number
+    isSecondary?: boolean
+}): JSX.Element {
+    const { isPrimaryMetricSignificant, isSecondaryMetricSignificant, significanceDetails } = useValues(experimentLogic)
+    const isSignificant = isSecondary
+        ? isSecondaryMetricSignificant(metricIndex)
+        : isPrimaryMetricSignificant(metricIndex)
+    const result: { color: LemonTagType; label: string } = isSignificant
         ? { color: 'success', label: 'Significant' }
         : { color: 'primary', label: 'Not significant' }
 
-    const inner = areResultsSignificant(metricIndex) ? (
+    const inner = isSignificant ? (
         <div className="bg-success-highlight text-success p-1 flex items-center gap-1">
             <IconTrending fontSize={20} fontWeight={600} />
             <span className="text-xs font-semibold">{result.label}</span>
diff --git a/frontend/src/scenes/experiments/MetricsView/MetricsView.tsx b/frontend/src/scenes/experiments/MetricsView/MetricsView.tsx
index 1e50c3d5369f3..2628f353942f5 100644
--- a/frontend/src/scenes/experiments/MetricsView/MetricsView.tsx
+++ b/frontend/src/scenes/experiments/MetricsView/MetricsView.tsx
@@ -4,7 +4,7 @@ import { useActions, useValues } from 'kea'
 import { IconAreaChart } from 'lib/lemon-ui/icons'
 
 import { experimentLogic, getDefaultFunnelsMetric } from '../experimentLogic'
-import { MAX_PRIMARY_METRICS } from './const'
+import { MAX_PRIMARY_METRICS, MAX_SECONDARY_METRICS } from './const'
 import { DeltaChart } from './DeltaChart'
 
 // Helper function to find nice round numbers for ticks
@@ -42,61 +42,92 @@ export function getNiceTickValues(maxAbsValue: number): number[] {
     return ticks
 }
 
-function AddMetric({
-    metrics,
-    setExperiment,
-    openPrimaryMetricModal,
-}: {
-    metrics: any[]
-    setExperiment: (payload: { metrics: any[] }) => void
-    openPrimaryMetricModal: (index: number) => void
-}): JSX.Element {
+function AddPrimaryMetric(): JSX.Element {
+    const { experiment } = useValues(experimentLogic)
+    const { setExperiment, openPrimaryMetricModal } = useActions(experimentLogic)
+
     return (
         <LemonButton
             icon={<IconPlus />}
             type="secondary"
             size="xsmall"
             onClick={() => {
-                const newMetrics = [...metrics, getDefaultFunnelsMetric()]
+                const newMetrics = [...experiment.metrics, getDefaultFunnelsMetric()]
                 setExperiment({
                     metrics: newMetrics,
                 })
                 openPrimaryMetricModal(newMetrics.length - 1)
             }}
             disabledReason={
-                metrics.length >= MAX_PRIMARY_METRICS
+                experiment.metrics.length >= MAX_PRIMARY_METRICS
                     ? `You can only add up to ${MAX_PRIMARY_METRICS} primary metrics.`
                     : undefined
             }
         >
-            Add metric
+            Add primary metric
         </LemonButton>
     )
 }
 
-export function MetricsView(): JSX.Element {
-    const { experiment, getMetricType, metricResults, primaryMetricsResultErrors, credibleIntervalForVariant } =
-        useValues(experimentLogic)
-    const { setExperiment, openPrimaryMetricModal } = useActions(experimentLogic)
+export function AddSecondaryMetric(): JSX.Element {
+    const { experiment } = useValues(experimentLogic)
+    const { setExperiment, openSecondaryMetricModal } = useActions(experimentLogic)
+    return (
+        <LemonButton
+            icon={<IconPlus />}
+            type="secondary"
+            size="xsmall"
+            onClick={() => {
+                const newMetricsSecondary = [...experiment.metrics_secondary, getDefaultFunnelsMetric()]
+                setExperiment({
+                    metrics_secondary: newMetricsSecondary,
+                })
+                openSecondaryMetricModal(newMetricsSecondary.length - 1)
+            }}
+            disabledReason={
+                experiment.metrics_secondary.length >= MAX_SECONDARY_METRICS
+                    ? `You can only add up to ${MAX_SECONDARY_METRICS} secondary metrics.`
+                    : undefined
+            }
+        >
+            Add secondary metric
+        </LemonButton>
+    )
+}
+
+export function MetricsView({ isSecondary }: { isSecondary?: boolean }): JSX.Element {
+    const {
+        experiment,
+        getMetricType,
+        getSecondaryMetricType,
+        metricResults,
+        secondaryMetricResults,
+        primaryMetricsResultErrors,
+        secondaryMetricsResultErrors,
+        credibleIntervalForVariant,
+    } = useValues(experimentLogic)
 
     const variants = experiment.parameters.feature_flag_variants
-    const metrics = experiment.metrics || []
+    const metrics = isSecondary ? experiment.metrics_secondary : experiment.metrics
+    const results = isSecondary ? secondaryMetricResults : metricResults
+    const errors = isSecondary ? secondaryMetricsResultErrors : primaryMetricsResultErrors
 
     // Calculate the maximum absolute value across ALL metrics
     const maxAbsValue = Math.max(
         ...metrics.flatMap((_, metricIndex) => {
-            const result = metricResults?.[metricIndex]
+            const result = results?.[metricIndex]
             if (!result) {
                 return []
             }
             return variants.flatMap((variant) => {
-                const interval = credibleIntervalForVariant(result, variant.key, getMetricType(metricIndex))
+                const metricType = isSecondary ? getSecondaryMetricType(metricIndex) : getMetricType(metricIndex)
+                const interval = credibleIntervalForVariant(result, variant.key, metricType)
                 return interval ? [Math.abs(interval[0] / 100), Math.abs(interval[1] / 100)] : []
             })
         })
     )
 
-    const padding = Math.max(maxAbsValue * 0.05, 0.02)
+    const padding = Math.max(maxAbsValue * 0.05, 0.1)
     const chartBound = maxAbsValue + padding
 
     const commonTickValues = getNiceTickValues(chartBound)
@@ -106,7 +137,9 @@ export function MetricsView(): JSX.Element {
             <div className="flex">
                 <div className="w-1/2 pt-5">
                     <div className="inline-flex space-x-2 mb-0">
-                        <h2 className="mb-1 font-semibold text-lg">Primary metrics</h2>
+                        <h2 className="mb-1 font-semibold text-lg">
+                            {isSecondary ? 'Secondary metrics' : 'Primary metrics'}
+                        </h2>
                     </div>
                 </div>
 
@@ -114,11 +147,7 @@ export function MetricsView(): JSX.Element {
                     <div className="ml-auto">
                         {metrics.length > 0 && (
                             <div className="mb-2 mt-4 justify-end">
-                                <AddMetric
-                                    metrics={metrics}
-                                    setExperiment={setExperiment}
-                                    openPrimaryMetricModal={openPrimaryMetricModal}
-                                />
+                                {isSecondary ? <AddSecondaryMetric /> : <AddPrimaryMetric />}
                             </div>
                         )}
                     </div>
@@ -128,7 +157,7 @@ export function MetricsView(): JSX.Element {
                 <div className="w-full overflow-x-auto">
                     <div className="min-w-[1000px]">
                         {metrics.map((metric, metricIndex) => {
-                            const result = metricResults?.[metricIndex]
+                            const result = results?.[metricIndex]
                             const isFirstMetric = metricIndex === 0
 
                             return (
@@ -145,10 +174,15 @@ export function MetricsView(): JSX.Element {
                                     }`}
                                 >
                                     <DeltaChart
+                                        isSecondary={!!isSecondary}
                                         result={result}
-                                        error={primaryMetricsResultErrors?.[metricIndex]}
+                                        error={errors?.[metricIndex]}
                                         variants={variants}
-                                        metricType={getMetricType(metricIndex)}
+                                        metricType={
+                                            isSecondary
+                                                ? getSecondaryMetricType(metricIndex)
+                                                : getMetricType(metricIndex)
+                                        }
                                         metricIndex={metricIndex}
                                         isFirstMetric={isFirstMetric}
                                         metric={metric}
@@ -165,13 +199,9 @@ export function MetricsView(): JSX.Element {
                     <div className="flex flex-col items-center mx-auto space-y-3">
                         <IconAreaChart fontSize="30" />
                         <div className="text-sm text-center text-balance">
-                            Add up to {MAX_PRIMARY_METRICS} primary metrics.
+                            Add up to {MAX_PRIMARY_METRICS} {isSecondary ? 'secondary' : 'primary'} metrics.
                         </div>
-                        <AddMetric
-                            metrics={metrics}
-                            setExperiment={setExperiment}
-                            openPrimaryMetricModal={openPrimaryMetricModal}
-                        />
+                        {isSecondary ? <AddSecondaryMetric /> : <AddPrimaryMetric />}
                     </div>
                 </div>
             )}
diff --git a/frontend/src/scenes/experiments/MetricsView/const.tsx b/frontend/src/scenes/experiments/MetricsView/const.tsx
index d1f720a7b256a..7df3e2c0aef17 100644
--- a/frontend/src/scenes/experiments/MetricsView/const.tsx
+++ b/frontend/src/scenes/experiments/MetricsView/const.tsx
@@ -1 +1,2 @@
 export const MAX_PRIMARY_METRICS = 10
+export const MAX_SECONDARY_METRICS = 10
diff --git a/frontend/src/scenes/experiments/experimentLogic.tsx b/frontend/src/scenes/experiments/experimentLogic.tsx
index c8325ab3b7cf5..44753c32582a8 100644
--- a/frontend/src/scenes/experiments/experimentLogic.tsx
+++ b/frontend/src/scenes/experiments/experimentLogic.tsx
@@ -57,7 +57,6 @@ import {
     MultivariateFlagVariant,
     ProductKey,
     PropertyMathType,
-    SecondaryMetricResults,
     TrendExperimentVariant,
     TrendResult,
     TrendsFilterType,
@@ -183,9 +182,8 @@ export const experimentLogic = kea<experimentLogicType>([
         setEditExperiment: (editing: boolean) => ({ editing }),
         setFlagImplementationWarning: (warning: boolean) => ({ warning }),
         setExposureAndSampleSize: (exposure: number, sampleSize: number) => ({ exposure, sampleSize }),
-        updateExperimentGoal: (filters: Partial<FilterType>) => ({ filters }),
+        updateExperimentGoal: true,
         updateExperimentCollectionGoal: true,
-        updateExperimentExposure: (filters: Partial<FilterType> | null) => ({ filters }),
         changeExperimentStartDate: (startDate: string) => ({ startDate }),
         launchExperiment: true,
         endExperiment: true,
@@ -270,6 +268,9 @@ export const experimentLogic = kea<experimentLogicType>([
         closePrimaryMetricModal: true,
         setPrimaryMetricsResultErrors: (errors: any[]) => ({ errors }),
         updateDistributionModal: (featureFlag: FeatureFlagType) => ({ featureFlag }),
+        openSecondaryMetricModal: (index: number) => ({ index }),
+        closeSecondaryMetricModal: true,
+        setSecondaryMetricsResultErrors: (errors: any[]) => ({ errors }),
     }),
     reducers({
         experiment: [
@@ -491,9 +492,30 @@ export const experimentLogic = kea<experimentLogicType>([
             [] as any[],
             {
                 setPrimaryMetricsResultErrors: (_, { errors }) => errors,
-                // Reset errors when loading new results
                 loadMetricResults: () => [],
-                // Reset errors when loading a new experiment
+                loadExperiment: () => [],
+            },
+        ],
+        isSecondaryMetricModalOpen: [
+            false,
+            {
+                openSecondaryMetricModal: () => true,
+                closeSecondaryMetricModal: () => false,
+            },
+        ],
+        editingSecondaryMetricIndex: [
+            null as number | null,
+            {
+                openSecondaryMetricModal: (_, { index }) => index,
+                closeSecondaryMetricModal: () => null,
+                updateExperimentGoal: () => null,
+            },
+        ],
+        secondaryMetricsResultErrors: [
+            [] as any[],
+            {
+                setSecondaryMetricsResultErrors: (_, { errors }) => errors,
+                loadSecondaryMetricResults: () => [],
                 loadExperiment: () => [],
             },
         ],
@@ -613,13 +635,18 @@ export const experimentLogic = kea<experimentLogicType>([
             actions.updateExperiment({ end_date: endDate.toISOString() })
             const duration = endDate.diff(values.experiment?.start_date, 'second')
             values.experiment &&
-                actions.reportExperimentCompleted(values.experiment, endDate, duration, values.areResultsSignificant(0))
+                actions.reportExperimentCompleted(
+                    values.experiment,
+                    endDate,
+                    duration,
+                    values.isPrimaryMetricSignificant(0)
+                )
         },
         archiveExperiment: async () => {
             actions.updateExperiment({ archived: true })
             values.experiment && actions.reportExperimentArchived(values.experiment)
         },
-        updateExperimentGoal: async ({ filters }) => {
+        updateExperimentGoal: async () => {
             // Reset MDE to the recommended setting
             actions.setExperiment({
                 parameters: {
@@ -630,12 +657,9 @@ export const experimentLogic = kea<experimentLogicType>([
 
             const { recommendedRunningTime, recommendedSampleSize, minimumDetectableEffect } = values
 
-            const filtersToUpdate = { ...filters }
-            delete filtersToUpdate.properties
-
             actions.updateExperiment({
-                filters: filtersToUpdate,
                 metrics: values.experiment.metrics,
+                metrics_secondary: values.experiment.metrics_secondary,
                 parameters: {
                     ...values.experiment?.parameters,
                     recommended_running_time: recommendedRunningTime,
@@ -644,6 +668,7 @@ export const experimentLogic = kea<experimentLogicType>([
                 },
             })
             actions.closePrimaryMetricModal()
+            actions.closeSecondaryMetricModal()
         },
         updateExperimentCollectionGoal: async () => {
             const { recommendedRunningTime, recommendedSampleSize, minimumDetectableEffect } = values
@@ -658,15 +683,6 @@ export const experimentLogic = kea<experimentLogicType>([
             })
             actions.closeExperimentCollectionGoalModal()
         },
-        updateExperimentExposure: async ({ filters }) => {
-            actions.updateExperiment({
-                metrics: values.experiment.metrics,
-                parameters: {
-                    custom_exposure_filter: filters ?? undefined,
-                    feature_flag_variants: values.experiment?.parameters?.feature_flag_variants,
-                },
-            })
-        },
         closeExperimentCollectionGoalModal: () => {
             if (values.experimentValuesChangedLocally) {
                 actions.loadExperiment()
@@ -675,6 +691,9 @@ export const experimentLogic = kea<experimentLogicType>([
         closePrimaryMetricModal: () => {
             actions.loadExperiment()
         },
+        closeSecondaryMetricModal: () => {
+            actions.loadExperiment()
+        },
         resetRunningExperiment: async () => {
             actions.updateExperiment({ start_date: null, end_date: null, archived: false })
             values.experiment && actions.reportExperimentReset(values.experiment)
@@ -871,7 +890,6 @@ export const experimentLogic = kea<experimentLogicType>([
                                 const errorDetailMatch = error.detail.match(/\{.*\}/)
                                 const errorDetail = errorDetailMatch ? JSON.parse(errorDetailMatch[0]) : error.detail
 
-                                // Store the error in primaryMetricsResultErrors
                                 const currentErrors = [...(values.primaryMetricsResultErrors || [])]
                                 currentErrors[index] = {
                                     detail: errorDetail,
@@ -887,71 +905,39 @@ export const experimentLogic = kea<experimentLogicType>([
             },
         ],
         secondaryMetricResults: [
-            null as
-                | SecondaryMetricResults[]
-                | (CachedExperimentTrendsQueryResponse | CachedExperimentFunnelsQueryResponse)[]
-                | null,
+            null as (CachedExperimentTrendsQueryResponse | CachedExperimentFunnelsQueryResponse | null)[] | null,
             {
                 loadSecondaryMetricResults: async (
                     refresh?: boolean
-                ): Promise<
-                    | SecondaryMetricResults[]
-                    | (CachedExperimentTrendsQueryResponse | CachedExperimentFunnelsQueryResponse)[]
-                    | null
-                > => {
-                    if (values.featureFlags[FEATURE_FLAGS.EXPERIMENTS_HOGQL]) {
-                        return (await Promise.all(
-                            values.experiment?.metrics_secondary.map(async (metric) => {
-                                try {
-                                    // Queries are shareable, so we need to set the experiment_id for the backend to correctly associate the query with the experiment
-                                    const queryWithExperimentId = {
-                                        ...metric,
-                                        experiment_id: values.experimentId,
-                                    }
-                                    const response: ExperimentResults = await api.create(
-                                        `api/projects/${values.currentProjectId}/query`,
-                                        { query: queryWithExperimentId, refresh: 'lazy_async' }
-                                    )
-
-                                    return {
-                                        ...response,
-                                        fakeInsightId: Math.random().toString(36).substring(2, 15),
-                                        last_refresh: response.last_refresh || '',
-                                    }
-                                } catch (error) {
-                                    return {}
-                                }
-                            })
-                        )) as unknown as (CachedExperimentTrendsQueryResponse | CachedExperimentFunnelsQueryResponse)[]
-                    }
-
-                    const refreshParam = refresh ? '&refresh=true' : ''
-
-                    return await Promise.all(
-                        (values.experiment?.secondary_metrics || []).map(async (_, index) => {
+                ): Promise<(CachedExperimentTrendsQueryResponse | CachedExperimentFunnelsQueryResponse | null)[]> => {
+                    return (await Promise.all(
+                        values.experiment?.metrics_secondary.map(async (metric, index) => {
                             try {
-                                const secResults = await api.get(
-                                    `api/projects/${values.currentProjectId}/experiments/${values.experimentId}/secondary_results?id=${index}${refreshParam}`
-                                )
-                                // :TRICKY: Maintain backwards compatibility for cached responses, remove after cache period has expired
-                                if (secResults && secResults.result && !secResults.result.hasOwnProperty('result')) {
-                                    return {
-                                        result: { ...secResults.result },
-                                        fakeInsightId: Math.random().toString(36).substring(2, 15),
-                                        last_refresh: secResults.last_refresh,
-                                    }
+                                const queryWithExperimentId = {
+                                    ...metric,
+                                    experiment_id: values.experimentId,
                                 }
+                                const response = await performQuery(queryWithExperimentId, undefined, refresh)
 
                                 return {
-                                    ...secResults.result,
+                                    ...response,
                                     fakeInsightId: Math.random().toString(36).substring(2, 15),
-                                    last_refresh: secResults.last_refresh,
                                 }
-                            } catch (error) {
-                                return {}
+                            } catch (error: any) {
+                                const errorDetailMatch = error.detail.match(/\{.*\}/)
+                                const errorDetail = errorDetailMatch ? JSON.parse(errorDetailMatch[0]) : error.detail
+
+                                const currentErrors = [...(values.secondaryMetricsResultErrors || [])]
+                                currentErrors[index] = {
+                                    detail: errorDetail,
+                                    statusCode: error.status,
+                                    hasDiagnostics: !!errorDetailMatch,
+                                }
+                                actions.setSecondaryMetricsResultErrors(currentErrors)
+                                return null
                             }
                         })
-                    )
+                    )) as (CachedExperimentTrendsQueryResponse | CachedExperimentFunnelsQueryResponse | null)[]
                 },
             },
         ],
@@ -1004,27 +990,19 @@ export const experimentLogic = kea<experimentLogicType>([
             (experimentId): Experiment['id'] => experimentId,
         ],
         getMetricType: [
-            (s) => [s.experiment, s.featureFlags],
-            (experiment, featureFlags) =>
+            (s) => [s.experiment],
+            (experiment) =>
                 (metricIdx: number = 0) => {
-                    if (featureFlags[FEATURE_FLAGS.EXPERIMENTS_HOGQL]) {
-                        const query = experiment?.metrics?.[metricIdx]
-                        return query?.kind === NodeKind.ExperimentTrendsQuery ? InsightType.TRENDS : InsightType.FUNNELS
-                    }
-
-                    return experiment?.filters?.insight || InsightType.FUNNELS
+                    const query = experiment?.metrics?.[metricIdx]
+                    return query?.kind === NodeKind.ExperimentTrendsQuery ? InsightType.TRENDS : InsightType.FUNNELS
                 },
         ],
         getSecondaryMetricType: [
-            (s) => [s.experiment, s.featureFlags],
-            (experiment, featureFlags) =>
+            (s) => [s.experiment],
+            (experiment) =>
                 (metricIdx: number = 0) => {
-                    if (featureFlags[FEATURE_FLAGS.EXPERIMENTS_HOGQL]) {
-                        const query = experiment?.metrics_secondary?.[metricIdx]
-                        return query?.kind === NodeKind.ExperimentTrendsQuery ? InsightType.TRENDS : InsightType.FUNNELS
-                    }
-
-                    return experiment?.secondary_metrics?.[metricIdx]?.filters?.insight || InsightType.FUNNELS
+                    const query = experiment?.metrics_secondary?.[metricIdx]
+                    return query?.kind === NodeKind.ExperimentTrendsQuery ? InsightType.TRENDS : InsightType.FUNNELS
                 },
         ],
         isExperimentRunning: [
@@ -1133,13 +1111,26 @@ export const experimentLogic = kea<experimentLogicType>([
                 return Math.ceil((1600 * conversionRate * (1 - conversionRate / 100)) / (mde * mde))
             },
         ],
-        areResultsSignificant: [
+        isPrimaryMetricSignificant: [
             (s) => [s.metricResults],
             (metricResults: (CachedExperimentFunnelsQueryResponse | CachedExperimentTrendsQueryResponse | null)[]) =>
                 (metricIndex: number = 0): boolean => {
                     return metricResults?.[metricIndex]?.significant || false
                 },
         ],
+        isSecondaryMetricSignificant: [
+            (s) => [s.secondaryMetricResults],
+            (
+                    secondaryMetricResults: (
+                        | CachedExperimentFunnelsQueryResponse
+                        | CachedExperimentTrendsQueryResponse
+                        | null
+                    )[]
+                ) =>
+                (metricIndex: number = 0): boolean => {
+                    return secondaryMetricResults?.[metricIndex]?.significant || false
+                },
+        ],
         significanceDetails: [
             (s) => [s.metricResults],
             (metricResults: (CachedExperimentFunnelsQueryResponse | CachedExperimentTrendsQueryResponse | null)[]) =>

From c2b47986e32428517f407f64808af3c3de2222d8 Mon Sep 17 00:00:00 2001
From: Daniel Bachhuber <daniel.b@posthog.com>
Date: Mon, 23 Dec 2024 04:37:45 -0800
Subject: [PATCH 06/15] chore(experiments): Test cleanup (#27090)

Co-authored-by: Juraj Majerik <juro.majerik@gmail.com>
---
 .../test_experiment_trends_query_runner.py    | 34 ++++++++++---------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/posthog/hogql_queries/experiments/test/test_experiment_trends_query_runner.py b/posthog/hogql_queries/experiments/test/test_experiment_trends_query_runner.py
index fef6608fb62ef..69cfc5720e009 100644
--- a/posthog/hogql_queries/experiments/test/test_experiment_trends_query_runner.py
+++ b/posthog/hogql_queries/experiments/test/test_experiment_trends_query_runner.py
@@ -91,8 +91,12 @@ def create_experiment(
             feature_flag = self.create_feature_flag(name)
         if start_date is None:
             start_date = timezone.now()
+        else:
+            start_date = timezone.make_aware(start_date)  # Make naive datetime timezone-aware
         if end_date is None:
             end_date = timezone.now() + timedelta(days=14)
+        elif end_date is not None:
+            end_date = timezone.make_aware(end_date)  # Make naive datetime timezone-aware
         return Experiment.objects.create(
             name=name,
             team=self.team,
@@ -147,7 +151,6 @@ def create_data_warehouse_table_with_payments(self):
             filesystem=fs,
             use_dictionary=True,
             compression="snappy",
-            version="2.0",
         )
 
         table_name = "payments"
@@ -212,7 +215,6 @@ def create_data_warehouse_table_with_usage(self):
             filesystem=fs,
             use_dictionary=True,
             compression="snappy",
-            version="2.0",
         )
 
         table_name = "usage"
@@ -1491,15 +1493,15 @@ def test_query_runner_standard_flow(self):
         self.assertEqual(control_variant.absolute_exposure, 2)
         self.assertEqual(test_variant.absolute_exposure, 2)
 
-        self.assertAlmostEqual(result.credible_intervals["control"][0], 0.5449, places=3)
-        self.assertAlmostEqual(result.credible_intervals["control"][1], 4.3836, places=3)
-        self.assertAlmostEqual(result.credible_intervals["test"][0], 1.1009, places=3)
-        self.assertAlmostEqual(result.credible_intervals["test"][1], 5.8342, places=3)
+        self.assertAlmostEqual(result.credible_intervals["control"][0], 0.5449, delta=0.1)
+        self.assertAlmostEqual(result.credible_intervals["control"][1], 4.3836, delta=0.1)
+        self.assertAlmostEqual(result.credible_intervals["test"][0], 1.1009, delta=0.1)
+        self.assertAlmostEqual(result.credible_intervals["test"][1], 5.8342, delta=0.1)
 
-        self.assertAlmostEqual(result.p_value, 1.0, places=3)
+        self.assertAlmostEqual(result.p_value, 1.0, delta=0.1)
 
-        self.assertAlmostEqual(result.probability["control"], 0.2549, places=2)
-        self.assertAlmostEqual(result.probability["test"], 0.7453, places=2)
+        self.assertAlmostEqual(result.probability["control"], 0.2549, delta=0.1)
+        self.assertAlmostEqual(result.probability["test"], 0.7453, delta=0.1)
 
         self.assertEqual(result.significance_code, ExperimentSignificanceCode.NOT_ENOUGH_EXPOSURE)
 
@@ -1614,15 +1616,15 @@ def test_query_runner_standard_flow_v2_stats(self):
         self.assertEqual(control_variant.absolute_exposure, 2)
         self.assertEqual(test_variant.absolute_exposure, 2)
 
-        self.assertAlmostEqual(result.credible_intervals["control"][0], 0.3633, places=3)
-        self.assertAlmostEqual(result.credible_intervals["control"][1], 2.9224, places=3)
-        self.assertAlmostEqual(result.credible_intervals["test"][0], 0.7339, places=3)
-        self.assertAlmostEqual(result.credible_intervals["test"][1], 3.8894, places=3)
+        self.assertAlmostEqual(result.credible_intervals["control"][0], 0.3633, delta=0.1)
+        self.assertAlmostEqual(result.credible_intervals["control"][1], 2.9224, delta=0.1)
+        self.assertAlmostEqual(result.credible_intervals["test"][0], 0.7339, delta=0.1)
+        self.assertAlmostEqual(result.credible_intervals["test"][1], 3.8894, delta=0.1)
 
-        self.assertAlmostEqual(result.p_value, 1.0, places=3)
+        self.assertAlmostEqual(result.p_value, 1.0, delta=0.1)
 
-        self.assertAlmostEqual(result.probability["control"], 0.2549, places=2)
-        self.assertAlmostEqual(result.probability["test"], 0.7453, places=2)
+        self.assertAlmostEqual(result.probability["control"], 0.2549, delta=0.1)
+        self.assertAlmostEqual(result.probability["test"], 0.7453, delta=0.1)
 
         self.assertEqual(result.significance_code, ExperimentSignificanceCode.NOT_ENOUGH_EXPOSURE)
 

From 584eae0bcdc13fe1e7cbf89bb2302e6b313f4944 Mon Sep 17 00:00:00 2001
From: Juraj Majerik <juro.majerik@gmail.com>
Date: Mon, 23 Dec 2024 15:06:09 +0100
Subject: [PATCH 07/15] chore(experiments): refactor metric modals (#27129)

---
 .../ExperimentView/ExperimentView.tsx         |   8 +-
 ...yGoalFunnels.tsx => FunnelsMetricForm.tsx} |  43 ++-
 ...condaryMetricModal.tsx => MetricModal.tsx} |  63 ++--
 .../Metrics/PrimaryGoalFunnels.tsx            | 320 ------------------
 .../Metrics/PrimaryMetricModal.tsx            | 122 -------
 .../Metrics/SecondaryGoalTrends.tsx           | 204 -----------
 .../experiments/Metrics/TrendsMetricForm.tsx  | 290 ++++++++++++++++
 .../scenes/experiments/experimentLogic.tsx    |  11 +-
 8 files changed, 374 insertions(+), 687 deletions(-)
 rename frontend/src/scenes/experiments/Metrics/{SecondaryGoalFunnels.tsx => FunnelsMetricForm.tsx} (83%)
 rename frontend/src/scenes/experiments/Metrics/{SecondaryMetricModal.tsx => MetricModal.tsx} (54%)
 delete mode 100644 frontend/src/scenes/experiments/Metrics/PrimaryGoalFunnels.tsx
 delete mode 100644 frontend/src/scenes/experiments/Metrics/PrimaryMetricModal.tsx
 delete mode 100644 frontend/src/scenes/experiments/Metrics/SecondaryGoalTrends.tsx
 create mode 100644 frontend/src/scenes/experiments/Metrics/TrendsMetricForm.tsx

diff --git a/frontend/src/scenes/experiments/ExperimentView/ExperimentView.tsx b/frontend/src/scenes/experiments/ExperimentView/ExperimentView.tsx
index 1d66bee399d04..b8e2ce7a0eab8 100644
--- a/frontend/src/scenes/experiments/ExperimentView/ExperimentView.tsx
+++ b/frontend/src/scenes/experiments/ExperimentView/ExperimentView.tsx
@@ -6,8 +6,7 @@ import { WebExperimentImplementationDetails } from 'scenes/experiments/WebExperi
 
 import { ExperimentImplementationDetails } from '../ExperimentImplementationDetails'
 import { experimentLogic } from '../experimentLogic'
-import { PrimaryMetricModal } from '../Metrics/PrimaryMetricModal'
-import { SecondaryMetricModal } from '../Metrics/SecondaryMetricModal'
+import { MetricModal } from '../Metrics/MetricModal'
 import { MetricsView } from '../MetricsView/MetricsView'
 import {
     ExperimentLoadingAnimation,
@@ -142,8 +141,9 @@ export function ExperimentView(): JSX.Element {
                                 />
                             </>
                         )}
-                        <PrimaryMetricModal experimentId={experimentId} />
-                        <SecondaryMetricModal experimentId={experimentId} />
+                        <MetricModal experimentId={experimentId} isSecondary={true} />
+                        <MetricModal experimentId={experimentId} isSecondary={false} />
+
                         <DistributionModal experimentId={experimentId} />
                         <ReleaseConditionsModal experimentId={experimentId} />
                     </>
diff --git a/frontend/src/scenes/experiments/Metrics/SecondaryGoalFunnels.tsx b/frontend/src/scenes/experiments/Metrics/FunnelsMetricForm.tsx
similarity index 83%
rename from frontend/src/scenes/experiments/Metrics/SecondaryGoalFunnels.tsx
rename to frontend/src/scenes/experiments/Metrics/FunnelsMetricForm.tsx
index fe704d9f7a953..46d6cccce4c5e 100644
--- a/frontend/src/scenes/experiments/Metrics/SecondaryGoalFunnels.tsx
+++ b/frontend/src/scenes/experiments/Metrics/FunnelsMetricForm.tsx
@@ -1,6 +1,7 @@
 import { LemonLabel } from '@posthog/lemon-ui'
 import { LemonInput } from '@posthog/lemon-ui'
 import { useActions, useValues } from 'kea'
+import { TaxonomicFilterGroupType } from 'lib/components/TaxonomicFilter/types'
 import { TestAccountFilterSwitch } from 'lib/components/TestAccountFiltersSwitch'
 import { EXPERIMENT_DEFAULT_DURATION } from 'lib/constants'
 import { LemonBanner } from 'lib/lemon-ui/LemonBanner'
@@ -22,13 +23,26 @@ import {
     FunnelAttributionSelect,
     FunnelConversionWindowFilter,
 } from './Selectors'
-
-export function SecondaryGoalFunnels({ metricIdx }: { metricIdx: number }): JSX.Element {
+export function FunnelsMetricForm({ isSecondary = false }: { isSecondary?: boolean }): JSX.Element {
     const { currentTeam } = useValues(teamLogic)
-    const { experiment, isExperimentRunning } = useValues(experimentLogic)
+    const { experiment, isExperimentRunning, editingPrimaryMetricIndex, editingSecondaryMetricIndex } =
+        useValues(experimentLogic)
     const { setFunnelsMetric } = useActions(experimentLogic)
     const hasFilters = (currentTeam?.test_account_filters || []).length > 0
-    const currentMetric = experiment.metrics_secondary[metricIdx] as ExperimentFunnelsQuery
+
+    const metrics = isSecondary ? experiment.metrics_secondary : experiment.metrics
+    const metricIdx = isSecondary ? editingSecondaryMetricIndex : editingPrimaryMetricIndex
+
+    if (!metricIdx && metricIdx !== 0) {
+        return <></>
+    }
+
+    const currentMetric = metrics[metricIdx] as ExperimentFunnelsQuery
+
+    const actionFilterProps = {
+        ...commonActionFilterProps,
+        actionsTaxonomicGroupTypes: [TaxonomicFilterGroupType.Events, TaxonomicFilterGroupType.Actions],
+    }
 
     return (
         <>
@@ -40,7 +54,7 @@ export function SecondaryGoalFunnels({ metricIdx }: { metricIdx: number }): JSX.
                         setFunnelsMetric({
                             metricIdx,
                             name: newName,
-                            isSecondary: true,
+                            isSecondary,
                         })
                     }}
                 />
@@ -58,7 +72,7 @@ export function SecondaryGoalFunnels({ metricIdx }: { metricIdx: number }): JSX.
                     setFunnelsMetric({
                         metricIdx,
                         series,
-                        isSecondary: true,
+                        isSecondary,
                     })
                 }}
                 typeKey="experiment-metric"
@@ -68,7 +82,7 @@ export function SecondaryGoalFunnels({ metricIdx }: { metricIdx: number }): JSX.
                 seriesIndicatorType="numeric"
                 sortable={true}
                 showNestedArrow={true}
-                {...commonActionFilterProps}
+                {...actionFilterProps}
             />
             <div className="mt-4 space-y-4">
                 <FunnelAggregationSelect
@@ -80,7 +94,7 @@ export function SecondaryGoalFunnels({ metricIdx }: { metricIdx: number }): JSX.
                         setFunnelsMetric({
                             metricIdx,
                             funnelAggregateByHogQL: value,
-                            isSecondary: true,
+                            isSecondary,
                         })
                     }}
                 />
@@ -91,14 +105,14 @@ export function SecondaryGoalFunnels({ metricIdx }: { metricIdx: number }): JSX.
                         setFunnelsMetric({
                             metricIdx,
                             funnelWindowInterval: funnelWindowInterval,
-                            isSecondary: true,
+                            isSecondary,
                         })
                     }}
                     onFunnelWindowIntervalUnitChange={(funnelWindowIntervalUnit) => {
                         setFunnelsMetric({
                             metricIdx,
                             funnelWindowIntervalUnit: funnelWindowIntervalUnit || undefined,
-                            isSecondary: true,
+                            isSecondary,
                         })
                     }}
                 />
@@ -126,18 +140,21 @@ export function SecondaryGoalFunnels({ metricIdx }: { metricIdx: number }): JSX.
                             breakdownAttributionValue: breakdownAttributionValue
                                 ? parseInt(breakdownAttributionValue)
                                 : undefined,
-                            isSecondary: true,
+                            isSecondary,
                         })
                     }}
                     stepsLength={currentMetric.funnels_query?.series?.length}
                 />
                 <TestAccountFilterSwitch
-                    checked={hasFilters ? !!currentMetric.funnels_query?.filterTestAccounts : false}
+                    checked={(() => {
+                        const val = currentMetric.funnels_query?.filterTestAccounts
+                        return hasFilters ? !!val : false
+                    })()}
                     onChange={(checked: boolean) => {
                         setFunnelsMetric({
                             metricIdx,
                             filterTestAccounts: checked,
-                            isSecondary: true,
+                            isSecondary,
                         })
                     }}
                     fullWidth
diff --git a/frontend/src/scenes/experiments/Metrics/SecondaryMetricModal.tsx b/frontend/src/scenes/experiments/Metrics/MetricModal.tsx
similarity index 54%
rename from frontend/src/scenes/experiments/Metrics/SecondaryMetricModal.tsx
rename to frontend/src/scenes/experiments/Metrics/MetricModal.tsx
index b61af3fff9c7e..dde6c2e1b6d00 100644
--- a/frontend/src/scenes/experiments/Metrics/SecondaryMetricModal.tsx
+++ b/frontend/src/scenes/experiments/Metrics/MetricModal.tsx
@@ -1,48 +1,61 @@
 import { LemonButton, LemonModal, LemonSelect } from '@posthog/lemon-ui'
 import { useActions, useValues } from 'kea'
 
+import { ExperimentFunnelsQuery } from '~/queries/schema'
 import { Experiment, InsightType } from '~/types'
 
 import { experimentLogic, getDefaultFunnelsMetric, getDefaultTrendsMetric } from '../experimentLogic'
-import { SecondaryGoalFunnels } from './SecondaryGoalFunnels'
-import { SecondaryGoalTrends } from './SecondaryGoalTrends'
+import { FunnelsMetricForm } from './FunnelsMetricForm'
+import { TrendsMetricForm } from './TrendsMetricForm'
 
-export function SecondaryMetricModal({ experimentId }: { experimentId: Experiment['id'] }): JSX.Element {
+export function MetricModal({
+    experimentId,
+    isSecondary,
+}: {
+    experimentId: Experiment['id']
+    isSecondary?: boolean
+}): JSX.Element {
     const {
         experiment,
         experimentLoading,
+        getMetricType,
         getSecondaryMetricType,
+        isPrimaryMetricModalOpen,
         isSecondaryMetricModalOpen,
+        editingPrimaryMetricIndex,
         editingSecondaryMetricIndex,
     } = useValues(experimentLogic({ experimentId }))
-    const { setExperiment, updateExperimentGoal, closeSecondaryMetricModal } = useActions(
+    const { updateExperimentGoal, setExperiment, closePrimaryMetricModal, closeSecondaryMetricModal } = useActions(
         experimentLogic({ experimentId })
     )
 
-    if (!editingSecondaryMetricIndex && editingSecondaryMetricIndex !== 0) {
+    const metricIdx = isSecondary ? editingSecondaryMetricIndex : editingPrimaryMetricIndex
+    const metricsField = isSecondary ? 'metrics_secondary' : 'metrics'
+
+    if (!metricIdx && metricIdx !== 0) {
         return <></>
     }
 
-    const metricIdx = editingSecondaryMetricIndex
-    const metricType = getSecondaryMetricType(metricIdx)
+    const metricType = isSecondary ? getSecondaryMetricType(metricIdx) : getMetricType(metricIdx)
+    const metrics = experiment[metricsField]
+    const metric = metrics[metricIdx]
+    const funnelStepsLength = (metric as ExperimentFunnelsQuery)?.funnels_query?.series?.length || 0
 
     return (
         <LemonModal
-            isOpen={isSecondaryMetricModalOpen}
-            onClose={closeSecondaryMetricModal}
+            isOpen={isSecondary ? isSecondaryMetricModalOpen : isPrimaryMetricModalOpen}
+            onClose={isSecondary ? closeSecondaryMetricModal : closePrimaryMetricModal}
             width={1000}
-            title="Change secondary metric"
+            title="Edit experiment metric"
             footer={
                 <div className="flex items-center w-full">
                     <LemonButton
                         type="secondary"
                         status="danger"
                         onClick={() => {
-                            const newMetricsSecondary = experiment.metrics_secondary.filter(
-                                (_, idx) => idx !== metricIdx
-                            )
+                            const newMetrics = metrics.filter((_, idx) => idx !== metricIdx)
                             setExperiment({
-                                metrics_secondary: newMetricsSecondary,
+                                [metricsField]: newMetrics,
                             })
                             updateExperimentGoal()
                         }}
@@ -50,10 +63,20 @@ export function SecondaryMetricModal({ experimentId }: { experimentId: Experimen
                         Delete
                     </LemonButton>
                     <div className="flex items-center gap-2 ml-auto">
-                        <LemonButton type="secondary" onClick={closeSecondaryMetricModal}>
+                        <LemonButton
+                            form="edit-experiment-goal-form"
+                            type="secondary"
+                            onClick={isSecondary ? closeSecondaryMetricModal : closePrimaryMetricModal}
+                        >
                             Cancel
                         </LemonButton>
                         <LemonButton
+                            disabledReason={
+                                metricType === InsightType.FUNNELS &&
+                                funnelStepsLength < 2 &&
+                                'The experiment needs at least two funnel steps.'
+                            }
+                            form="edit-experiment-goal-form"
                             onClick={() => {
                                 updateExperimentGoal()
                             }}
@@ -75,12 +98,12 @@ export function SecondaryMetricModal({ experimentId }: { experimentId: Experimen
                     onChange={(newMetricType) => {
                         setExperiment({
                             ...experiment,
-                            metrics_secondary: [
-                                ...experiment.metrics_secondary.slice(0, metricIdx),
+                            [metricsField]: [
+                                ...metrics.slice(0, metricIdx),
                                 newMetricType === InsightType.TRENDS
                                     ? getDefaultTrendsMetric()
                                     : getDefaultFunnelsMetric(),
-                                ...experiment.metrics_secondary.slice(metricIdx + 1),
+                                ...metrics.slice(metricIdx + 1),
                             ],
                         })
                     }}
@@ -91,9 +114,9 @@ export function SecondaryMetricModal({ experimentId }: { experimentId: Experimen
                 />
             </div>
             {metricType === InsightType.TRENDS ? (
-                <SecondaryGoalTrends metricIdx={metricIdx} />
+                <TrendsMetricForm isSecondary={isSecondary} />
             ) : (
-                <SecondaryGoalFunnels metricIdx={metricIdx} />
+                <FunnelsMetricForm isSecondary={isSecondary} />
             )}
         </LemonModal>
     )
diff --git a/frontend/src/scenes/experiments/Metrics/PrimaryGoalFunnels.tsx b/frontend/src/scenes/experiments/Metrics/PrimaryGoalFunnels.tsx
deleted file mode 100644
index 2c5fe6f2da780..0000000000000
--- a/frontend/src/scenes/experiments/Metrics/PrimaryGoalFunnels.tsx
+++ /dev/null
@@ -1,320 +0,0 @@
-import { LemonLabel } from '@posthog/lemon-ui'
-import { LemonInput } from '@posthog/lemon-ui'
-import { useActions, useValues } from 'kea'
-import { TaxonomicFilterGroupType } from 'lib/components/TaxonomicFilter/types'
-import { TestAccountFilterSwitch } from 'lib/components/TestAccountFiltersSwitch'
-import { EXPERIMENT_DEFAULT_DURATION, FEATURE_FLAGS } from 'lib/constants'
-import { LemonBanner } from 'lib/lemon-ui/LemonBanner'
-import { ActionFilter } from 'scenes/insights/filters/ActionFilter/ActionFilter'
-import { MathAvailability } from 'scenes/insights/filters/ActionFilter/ActionFilterRow/ActionFilterRow'
-import { getHogQLValue } from 'scenes/insights/filters/AggregationSelect'
-import { teamLogic } from 'scenes/teamLogic'
-
-import { actionsAndEventsToSeries, filtersToQueryNode } from '~/queries/nodes/InsightQuery/utils/filtersToQueryNode'
-import { queryNodeToFilter } from '~/queries/nodes/InsightQuery/utils/queryNodeToFilter'
-import { Query } from '~/queries/Query/Query'
-import { ExperimentFunnelsQuery, NodeKind } from '~/queries/schema'
-import { BreakdownAttributionType, FilterType, FunnelsFilterType } from '~/types'
-
-import { experimentLogic } from '../experimentLogic'
-import {
-    commonActionFilterProps,
-    FunnelAggregationSelect,
-    FunnelAttributionSelect,
-    FunnelConversionWindowFilter,
-} from './Selectors'
-export function PrimaryGoalFunnels(): JSX.Element {
-    const { currentTeam } = useValues(teamLogic)
-    const { experiment, isExperimentRunning, featureFlags, editingPrimaryMetricIndex } = useValues(experimentLogic)
-    const { setExperiment, setFunnelsMetric } = useActions(experimentLogic)
-    const hasFilters = (currentTeam?.test_account_filters || []).length > 0
-
-    if (!editingPrimaryMetricIndex && editingPrimaryMetricIndex !== 0) {
-        return <></>
-    }
-
-    const metricIdx = editingPrimaryMetricIndex
-    const currentMetric = experiment.metrics[metricIdx] as ExperimentFunnelsQuery
-
-    const actionFilterProps = {
-        ...commonActionFilterProps,
-        // Remove data warehouse from the list because it's not supported in experiments
-        actionsTaxonomicGroupTypes: [TaxonomicFilterGroupType.Events, TaxonomicFilterGroupType.Actions],
-    }
-
-    return (
-        <>
-            <div className="mb-4">
-                <LemonLabel>Name (optional)</LemonLabel>
-                {featureFlags[FEATURE_FLAGS.EXPERIMENTS_HOGQL] && (
-                    <LemonInput
-                        value={currentMetric.name}
-                        onChange={(newName) => {
-                            setFunnelsMetric({
-                                metricIdx,
-                                name: newName,
-                            })
-                        }}
-                    />
-                )}
-            </div>
-            <ActionFilter
-                bordered
-                filters={(() => {
-                    // :FLAG: CLEAN UP AFTER MIGRATION
-                    if (featureFlags[FEATURE_FLAGS.EXPERIMENTS_HOGQL]) {
-                        return queryNodeToFilter(currentMetric.funnels_query)
-                    }
-                    return experiment.filters
-                })()}
-                setFilters={({ actions, events, data_warehouse }: Partial<FilterType>): void => {
-                    // :FLAG: CLEAN UP AFTER MIGRATION
-                    if (featureFlags[FEATURE_FLAGS.EXPERIMENTS_HOGQL]) {
-                        const series = actionsAndEventsToSeries(
-                            { actions, events, data_warehouse } as any,
-                            true,
-                            MathAvailability.None
-                        )
-
-                        setFunnelsMetric({
-                            metricIdx,
-                            series,
-                        })
-                    } else {
-                        if (actions?.length) {
-                            setExperiment({
-                                filters: {
-                                    ...experiment.filters,
-                                    actions,
-                                    events: undefined,
-                                    data_warehouse: undefined,
-                                },
-                            })
-                        } else if (events?.length) {
-                            setExperiment({
-                                filters: {
-                                    ...experiment.filters,
-                                    events,
-                                    actions: undefined,
-                                    data_warehouse: undefined,
-                                },
-                            })
-                        } else if (data_warehouse?.length) {
-                            setExperiment({
-                                filters: {
-                                    ...experiment.filters,
-                                    data_warehouse,
-                                    actions: undefined,
-                                    events: undefined,
-                                },
-                            })
-                        }
-                    }
-                }}
-                typeKey="experiment-metric"
-                mathAvailability={MathAvailability.None}
-                buttonCopy="Add funnel step"
-                showSeriesIndicator={true}
-                seriesIndicatorType="numeric"
-                sortable={true}
-                showNestedArrow={true}
-                {...actionFilterProps}
-            />
-            <div className="mt-4 space-y-4">
-                <FunnelAggregationSelect
-                    value={(() => {
-                        // :FLAG: CLEAN UP AFTER MIGRATION
-                        if (featureFlags[FEATURE_FLAGS.EXPERIMENTS_HOGQL]) {
-                            return getHogQLValue(
-                                currentMetric.funnels_query.aggregation_group_type_index ?? undefined,
-                                currentMetric.funnels_query.funnelsFilter?.funnelAggregateByHogQL ?? undefined
-                            )
-                        }
-                        return getHogQLValue(
-                            experiment.filters.aggregation_group_type_index,
-                            (experiment.filters as FunnelsFilterType).funnel_aggregate_by_hogql
-                        )
-                    })()}
-                    onChange={(value) => {
-                        // :FLAG: CLEAN UP AFTER MIGRATION
-                        if (featureFlags[FEATURE_FLAGS.EXPERIMENTS_HOGQL]) {
-                            setFunnelsMetric({
-                                metricIdx,
-                                funnelAggregateByHogQL: value,
-                            })
-                        } else {
-                            setExperiment({
-                                filters: {
-                                    ...experiment.filters,
-                                    funnel_aggregate_by_hogql: value,
-                                },
-                            })
-                        }
-                    }}
-                />
-                <FunnelConversionWindowFilter
-                    funnelWindowInterval={(() => {
-                        // :FLAG: CLEAN UP AFTER MIGRATION
-                        if (featureFlags[FEATURE_FLAGS.EXPERIMENTS_HOGQL]) {
-                            return currentMetric.funnels_query?.funnelsFilter?.funnelWindowInterval
-                        }
-                        return (experiment.filters as FunnelsFilterType).funnel_window_interval
-                    })()}
-                    funnelWindowIntervalUnit={(() => {
-                        // :FLAG: CLEAN UP AFTER MIGRATION
-                        if (featureFlags[FEATURE_FLAGS.EXPERIMENTS_HOGQL]) {
-                            return currentMetric.funnels_query?.funnelsFilter?.funnelWindowIntervalUnit
-                        }
-                        return (experiment.filters as FunnelsFilterType).funnel_window_interval_unit
-                    })()}
-                    onFunnelWindowIntervalChange={(funnelWindowInterval) => {
-                        // :FLAG: CLEAN UP AFTER MIGRATION
-                        if (featureFlags[FEATURE_FLAGS.EXPERIMENTS_HOGQL]) {
-                            setFunnelsMetric({
-                                metricIdx,
-                                funnelWindowInterval: funnelWindowInterval,
-                            })
-                        } else {
-                            setExperiment({
-                                filters: {
-                                    ...experiment.filters,
-                                    funnel_window_interval: funnelWindowInterval,
-                                },
-                            })
-                        }
-                    }}
-                    onFunnelWindowIntervalUnitChange={(funnelWindowIntervalUnit) => {
-                        // :FLAG: CLEAN UP AFTER MIGRATION
-                        if (featureFlags[FEATURE_FLAGS.EXPERIMENTS_HOGQL]) {
-                            setFunnelsMetric({
-                                metricIdx,
-                                funnelWindowIntervalUnit: funnelWindowIntervalUnit || undefined,
-                            })
-                        } else {
-                            setExperiment({
-                                filters: {
-                                    ...experiment.filters,
-                                    funnel_window_interval_unit: funnelWindowIntervalUnit || undefined,
-                                },
-                            })
-                        }
-                    }}
-                />
-                <FunnelAttributionSelect
-                    value={(() => {
-                        // :FLAG: CLEAN UP AFTER MIGRATION
-                        let breakdownAttributionType
-                        let breakdownAttributionValue
-                        if (featureFlags[FEATURE_FLAGS.EXPERIMENTS_HOGQL]) {
-                            breakdownAttributionType =
-                                currentMetric.funnels_query?.funnelsFilter?.breakdownAttributionType
-                            breakdownAttributionValue =
-                                currentMetric.funnels_query?.funnelsFilter?.breakdownAttributionValue
-                        } else {
-                            breakdownAttributionType = (experiment.filters as FunnelsFilterType)
-                                .breakdown_attribution_type
-                            breakdownAttributionValue = (experiment.filters as FunnelsFilterType)
-                                .breakdown_attribution_value
-                        }
-
-                        const currentValue: BreakdownAttributionType | `${BreakdownAttributionType.Step}/${number}` =
-                            !breakdownAttributionType
-                                ? BreakdownAttributionType.FirstTouch
-                                : breakdownAttributionType === BreakdownAttributionType.Step
-                                ? `${breakdownAttributionType}/${breakdownAttributionValue || 0}`
-                                : breakdownAttributionType
-
-                        return currentValue
-                    })()}
-                    onChange={(value) => {
-                        const [breakdownAttributionType, breakdownAttributionValue] = (value || '').split('/')
-                        // :FLAG: CLEAN UP AFTER MIGRATION
-                        if (featureFlags[FEATURE_FLAGS.EXPERIMENTS_HOGQL]) {
-                            setFunnelsMetric({
-                                metricIdx,
-                                breakdownAttributionType: breakdownAttributionType as BreakdownAttributionType,
-                                breakdownAttributionValue: breakdownAttributionValue
-                                    ? parseInt(breakdownAttributionValue)
-                                    : undefined,
-                            })
-                        } else {
-                            setExperiment({
-                                filters: {
-                                    ...experiment.filters,
-                                    breakdown_attribution_type: breakdownAttributionType as BreakdownAttributionType,
-                                    breakdown_attribution_value: breakdownAttributionValue
-                                        ? parseInt(breakdownAttributionValue)
-                                        : 0,
-                                },
-                            })
-                        }
-                    }}
-                    stepsLength={(() => {
-                        // :FLAG: CLEAN UP AFTER MIGRATION
-                        if (featureFlags[FEATURE_FLAGS.EXPERIMENTS_HOGQL]) {
-                            return currentMetric.funnels_query?.series?.length
-                        }
-                        return Math.max(
-                            experiment.filters.actions?.length ?? 0,
-                            experiment.filters.events?.length ?? 0,
-                            experiment.filters.data_warehouse?.length ?? 0
-                        )
-                    })()}
-                />
-                <TestAccountFilterSwitch
-                    checked={(() => {
-                        // :FLAG: CLEAN UP AFTER MIGRATION
-                        if (featureFlags[FEATURE_FLAGS.EXPERIMENTS_HOGQL]) {
-                            const val = (experiment.metrics[metricIdx] as ExperimentFunnelsQuery).funnels_query
-                                ?.filterTestAccounts
-                            return hasFilters ? !!val : false
-                        }
-                        return hasFilters ? !!experiment.filters.filter_test_accounts : false
-                    })()}
-                    onChange={(checked: boolean) => {
-                        // :FLAG: CLEAN UP AFTER MIGRATION
-                        if (featureFlags[FEATURE_FLAGS.EXPERIMENTS_HOGQL]) {
-                            setFunnelsMetric({
-                                metricIdx,
-                                filterTestAccounts: checked,
-                            })
-                        } else {
-                            setExperiment({
-                                filters: {
-                                    ...experiment.filters,
-                                    filter_test_accounts: checked,
-                                },
-                            })
-                        }
-                    }}
-                    fullWidth
-                />
-            </div>
-            {isExperimentRunning && (
-                <LemonBanner type="info" className="mt-3 mb-3">
-                    Preview insights are generated based on {EXPERIMENT_DEFAULT_DURATION} days of data. This can cause a
-                    mismatch between the preview and the actual results.
-                </LemonBanner>
-            )}
-            <div className="mt-4">
-                {/* :FLAG: CLEAN UP AFTER MIGRATION */}
-                <Query
-                    query={{
-                        kind: NodeKind.InsightVizNode,
-                        source: (() => {
-                            // :FLAG: CLEAN UP AFTER MIGRATION
-                            if (featureFlags[FEATURE_FLAGS.EXPERIMENTS_HOGQL]) {
-                                return currentMetric.funnels_query
-                            }
-                            return filtersToQueryNode(experiment.filters)
-                        })(),
-                        showTable: false,
-                        showLastComputation: true,
-                        showLastComputationRefresh: false,
-                    }}
-                    readOnly
-                />
-            </div>
-        </>
-    )
-}
diff --git a/frontend/src/scenes/experiments/Metrics/PrimaryMetricModal.tsx b/frontend/src/scenes/experiments/Metrics/PrimaryMetricModal.tsx
deleted file mode 100644
index 31d4eec71265b..0000000000000
--- a/frontend/src/scenes/experiments/Metrics/PrimaryMetricModal.tsx
+++ /dev/null
@@ -1,122 +0,0 @@
-import { LemonButton, LemonModal, LemonSelect } from '@posthog/lemon-ui'
-import { useActions, useValues } from 'kea'
-import { FEATURE_FLAGS } from 'lib/constants'
-
-import { ExperimentFunnelsQuery } from '~/queries/schema'
-import { Experiment, InsightType } from '~/types'
-
-import { experimentLogic, getDefaultFilters, getDefaultFunnelsMetric, getDefaultTrendsMetric } from '../experimentLogic'
-import { PrimaryGoalFunnels } from '../Metrics/PrimaryGoalFunnels'
-import { PrimaryGoalTrends } from '../Metrics/PrimaryGoalTrends'
-
-export function PrimaryMetricModal({ experimentId }: { experimentId: Experiment['id'] }): JSX.Element {
-    const {
-        experiment,
-        experimentLoading,
-        getMetricType,
-        featureFlags,
-        isPrimaryMetricModalOpen,
-        editingPrimaryMetricIndex,
-    } = useValues(experimentLogic({ experimentId }))
-    const { updateExperimentGoal, setExperiment, closePrimaryMetricModal } = useActions(
-        experimentLogic({ experimentId })
-    )
-
-    if (!editingPrimaryMetricIndex && editingPrimaryMetricIndex !== 0) {
-        return <></>
-    }
-
-    const metricIdx = editingPrimaryMetricIndex
-    const metricType = getMetricType(metricIdx)
-
-    let funnelStepsLength = 0
-    if (featureFlags[FEATURE_FLAGS.EXPERIMENTS_HOGQL] && metricType === InsightType.FUNNELS) {
-        const metric = experiment.metrics[metricIdx] as ExperimentFunnelsQuery
-        funnelStepsLength = metric?.funnels_query?.series?.length || 0
-    } else {
-        funnelStepsLength = (experiment.filters?.events?.length || 0) + (experiment.filters?.actions?.length || 0)
-    }
-
-    return (
-        <LemonModal
-            isOpen={isPrimaryMetricModalOpen}
-            onClose={closePrimaryMetricModal}
-            width={1000}
-            title="Change experiment goal"
-            footer={
-                <div className="flex items-center w-full">
-                    <LemonButton
-                        type="secondary"
-                        status="danger"
-                        onClick={() => {
-                            const newMetrics = experiment.metrics.filter((_, idx) => idx !== metricIdx)
-                            setExperiment({
-                                metrics: newMetrics,
-                            })
-                            updateExperimentGoal()
-                        }}
-                    >
-                        Delete
-                    </LemonButton>
-                    <div className="flex items-center gap-2 ml-auto">
-                        <LemonButton
-                            form="edit-experiment-goal-form"
-                            type="secondary"
-                            onClick={closePrimaryMetricModal}
-                        >
-                            Cancel
-                        </LemonButton>
-                        <LemonButton
-                            disabledReason={
-                                metricType === InsightType.FUNNELS &&
-                                funnelStepsLength < 2 &&
-                                'The experiment needs at least two funnel steps.'
-                            }
-                            form="edit-experiment-goal-form"
-                            onClick={() => {
-                                updateExperimentGoal()
-                            }}
-                            type="primary"
-                            loading={experimentLoading}
-                            data-attr="create-annotation-submit"
-                        >
-                            Save
-                        </LemonButton>
-                    </div>
-                </div>
-            }
-        >
-            <div className="flex items-center w-full gap-2 mb-4">
-                <span>Metric type</span>
-                <LemonSelect
-                    data-attr="metrics-selector"
-                    value={metricType}
-                    onChange={(newMetricType) => {
-                        if (featureFlags[FEATURE_FLAGS.EXPERIMENTS_HOGQL]) {
-                            setExperiment({
-                                ...experiment,
-                                metrics: [
-                                    ...experiment.metrics.slice(0, metricIdx),
-                                    newMetricType === InsightType.TRENDS
-                                        ? getDefaultTrendsMetric()
-                                        : getDefaultFunnelsMetric(),
-                                    ...experiment.metrics.slice(metricIdx + 1),
-                                ],
-                            })
-                        } else {
-                            setExperiment({
-                                ...experiment,
-                                filters: getDefaultFilters(newMetricType, undefined),
-                            })
-                        }
-                    }}
-                    options={[
-                        { value: InsightType.TRENDS, label: <b>Trends</b> },
-                        { value: InsightType.FUNNELS, label: <b>Funnels</b> },
-                    ]}
-                />
-            </div>
-            {metricType === InsightType.TRENDS ? <PrimaryGoalTrends /> : <PrimaryGoalFunnels />}
-        </LemonModal>
-    )
-}
diff --git a/frontend/src/scenes/experiments/Metrics/SecondaryGoalTrends.tsx b/frontend/src/scenes/experiments/Metrics/SecondaryGoalTrends.tsx
deleted file mode 100644
index 20aae645e6e1e..0000000000000
--- a/frontend/src/scenes/experiments/Metrics/SecondaryGoalTrends.tsx
+++ /dev/null
@@ -1,204 +0,0 @@
-import { LemonLabel } from '@posthog/lemon-ui'
-import { LemonInput } from '@posthog/lemon-ui'
-import { useActions, useValues } from 'kea'
-import { TestAccountFilterSwitch } from 'lib/components/TestAccountFiltersSwitch'
-import { EXPERIMENT_DEFAULT_DURATION, FEATURE_FLAGS } from 'lib/constants'
-import { LemonBanner } from 'lib/lemon-ui/LemonBanner'
-import { ActionFilter } from 'scenes/insights/filters/ActionFilter/ActionFilter'
-import { MathAvailability } from 'scenes/insights/filters/ActionFilter/ActionFilterRow/ActionFilterRow'
-import { teamLogic } from 'scenes/teamLogic'
-
-import { actionsAndEventsToSeries, filtersToQueryNode } from '~/queries/nodes/InsightQuery/utils/filtersToQueryNode'
-import { queryNodeToFilter } from '~/queries/nodes/InsightQuery/utils/queryNodeToFilter'
-import { Query } from '~/queries/Query/Query'
-import { ExperimentTrendsQuery, NodeKind } from '~/queries/schema'
-import { FilterType } from '~/types'
-
-import { experimentLogic } from '../experimentLogic'
-import { commonActionFilterProps } from './Selectors'
-
-export function SecondaryGoalTrends({ metricIdx }: { metricIdx: number }): JSX.Element {
-    const { experiment, isExperimentRunning, featureFlags } = useValues(experimentLogic)
-    const { setExperiment, setTrendsMetric } = useActions(experimentLogic)
-    const { currentTeam } = useValues(teamLogic)
-    const hasFilters = (currentTeam?.test_account_filters || []).length > 0
-    const currentMetric = experiment.metrics_secondary[metricIdx] as ExperimentTrendsQuery
-
-    return (
-        <>
-            <div className="mb-4">
-                <LemonLabel>Name (optional)</LemonLabel>
-                <LemonInput
-                    value={(() => {
-                        // :FLAG: CLEAN UP AFTER MIGRATION
-                        if (featureFlags[FEATURE_FLAGS.EXPERIMENTS_HOGQL]) {
-                            return currentMetric.name
-                        }
-                        return experiment.secondary_metrics[metricIdx].name
-                    })()}
-                    onChange={(newName) => {
-                        if (featureFlags[FEATURE_FLAGS.EXPERIMENTS_HOGQL]) {
-                            setTrendsMetric({
-                                metricIdx,
-                                name: newName,
-                                isSecondary: true,
-                            })
-                        } else {
-                            setExperiment({
-                                secondary_metrics: experiment.secondary_metrics.map((metric, idx) =>
-                                    idx === metricIdx ? { ...metric, name: newName } : metric
-                                ),
-                            })
-                        }
-                    }}
-                />
-            </div>
-            <ActionFilter
-                bordered
-                filters={(() => {
-                    // :FLAG: CLEAN UP AFTER MIGRATION
-                    if (featureFlags[FEATURE_FLAGS.EXPERIMENTS_HOGQL]) {
-                        return queryNodeToFilter(currentMetric.count_query)
-                    }
-                    return experiment.secondary_metrics[metricIdx].filters
-                })()}
-                setFilters={({ actions, events, data_warehouse }: Partial<FilterType>): void => {
-                    // :FLAG: CLEAN UP AFTER MIGRATION
-                    if (featureFlags[FEATURE_FLAGS.EXPERIMENTS_HOGQL]) {
-                        const series = actionsAndEventsToSeries(
-                            { actions, events, data_warehouse } as any,
-                            true,
-                            MathAvailability.All
-                        )
-
-                        setTrendsMetric({
-                            metricIdx,
-                            series,
-                            isSecondary: true,
-                        })
-                    } else {
-                        if (actions?.length) {
-                            setExperiment({
-                                secondary_metrics: experiment.secondary_metrics.map((metric, idx) =>
-                                    idx === metricIdx
-                                        ? {
-                                              ...metric,
-                                              filters: {
-                                                  ...metric.filters,
-                                                  actions,
-                                                  events: undefined,
-                                                  data_warehouse: undefined,
-                                              },
-                                          }
-                                        : metric
-                                ),
-                            })
-                        } else if (events?.length) {
-                            setExperiment({
-                                secondary_metrics: experiment.secondary_metrics.map((metric, idx) =>
-                                    idx === metricIdx
-                                        ? {
-                                              ...metric,
-                                              filters: {
-                                                  ...metric.filters,
-                                                  events,
-                                                  actions: undefined,
-                                                  data_warehouse: undefined,
-                                              },
-                                          }
-                                        : metric
-                                ),
-                            })
-                        } else if (data_warehouse?.length) {
-                            setExperiment({
-                                secondary_metrics: experiment.secondary_metrics.map((metric, idx) =>
-                                    idx === metricIdx
-                                        ? {
-                                              ...metric,
-                                              filters: {
-                                                  ...metric.filters,
-                                                  data_warehouse,
-                                                  actions: undefined,
-                                                  events: undefined,
-                                              },
-                                          }
-                                        : metric
-                                ),
-                            })
-                        }
-                    }
-                }}
-                typeKey="experiment-metric"
-                buttonCopy="Add graph series"
-                showSeriesIndicator={true}
-                entitiesLimit={1}
-                showNumericalPropsOnly={true}
-                {...commonActionFilterProps}
-            />
-            <div className="mt-4 space-y-4">
-                <TestAccountFilterSwitch
-                    checked={(() => {
-                        // :FLAG: CLEAN UP AFTER MIGRATION
-                        if (featureFlags[FEATURE_FLAGS.EXPERIMENTS_HOGQL]) {
-                            const val = currentMetric.count_query?.filterTestAccounts
-                            return hasFilters ? !!val : false
-                        }
-                        return hasFilters
-                            ? !!experiment.secondary_metrics[metricIdx].filters.filter_test_accounts
-                            : false
-                    })()}
-                    onChange={(checked: boolean) => {
-                        // :FLAG: CLEAN UP AFTER MIGRATION
-                        if (featureFlags[FEATURE_FLAGS.EXPERIMENTS_HOGQL]) {
-                            setTrendsMetric({
-                                metricIdx,
-                                filterTestAccounts: checked,
-                                isSecondary: true,
-                            })
-                        } else {
-                            setExperiment({
-                                secondary_metrics: experiment.secondary_metrics.map((metric, idx) =>
-                                    idx === metricIdx
-                                        ? {
-                                              ...metric,
-                                              filters: {
-                                                  ...metric.filters,
-                                                  filter_test_accounts: checked,
-                                              },
-                                          }
-                                        : metric
-                                ),
-                            })
-                        }
-                    }}
-                    fullWidth
-                />
-            </div>
-            {isExperimentRunning && (
-                <LemonBanner type="info" className="mt-3 mb-3">
-                    Preview insights are generated based on {EXPERIMENT_DEFAULT_DURATION} days of data. This can cause a
-                    mismatch between the preview and the actual results.
-                </LemonBanner>
-            )}
-            <div className="mt-4">
-                {/* :FLAG: CLEAN UP AFTER MIGRATION */}
-                <Query
-                    query={{
-                        kind: NodeKind.InsightVizNode,
-                        source: (() => {
-                            // :FLAG: CLEAN UP AFTER MIGRATION
-                            if (featureFlags[FEATURE_FLAGS.EXPERIMENTS_HOGQL]) {
-                                return currentMetric.count_query
-                            }
-                            return filtersToQueryNode(experiment.secondary_metrics[metricIdx].filters)
-                        })(),
-                        showTable: false,
-                        showLastComputation: true,
-                        showLastComputationRefresh: false,
-                    }}
-                    readOnly
-                />
-            </div>
-        </>
-    )
-}
diff --git a/frontend/src/scenes/experiments/Metrics/TrendsMetricForm.tsx b/frontend/src/scenes/experiments/Metrics/TrendsMetricForm.tsx
new file mode 100644
index 0000000000000..f76d69664f008
--- /dev/null
+++ b/frontend/src/scenes/experiments/Metrics/TrendsMetricForm.tsx
@@ -0,0 +1,290 @@
+import { IconCheckCircle } from '@posthog/icons'
+import { LemonInput, LemonLabel, LemonTabs, LemonTag } from '@posthog/lemon-ui'
+import { useActions, useValues } from 'kea'
+import { TestAccountFilterSwitch } from 'lib/components/TestAccountFiltersSwitch'
+import { EXPERIMENT_DEFAULT_DURATION } from 'lib/constants'
+import { dayjs } from 'lib/dayjs'
+import { LemonBanner } from 'lib/lemon-ui/LemonBanner'
+import { useState } from 'react'
+import { ActionFilter } from 'scenes/insights/filters/ActionFilter/ActionFilter'
+import { MathAvailability } from 'scenes/insights/filters/ActionFilter/ActionFilterRow/ActionFilterRow'
+import { teamLogic } from 'scenes/teamLogic'
+
+import { actionsAndEventsToSeries } from '~/queries/nodes/InsightQuery/utils/filtersToQueryNode'
+import { queryNodeToFilter } from '~/queries/nodes/InsightQuery/utils/queryNodeToFilter'
+import { Query } from '~/queries/Query/Query'
+import { ExperimentTrendsQuery, InsightQueryNode, NodeKind } from '~/queries/schema'
+import { BaseMathType, ChartDisplayType, FilterType } from '~/types'
+
+import { experimentLogic } from '../experimentLogic'
+import { commonActionFilterProps } from './Selectors'
+
+export function TrendsMetricForm({ isSecondary = false }: { isSecondary?: boolean }): JSX.Element {
+    const { experiment, isExperimentRunning, editingPrimaryMetricIndex, editingSecondaryMetricIndex } =
+        useValues(experimentLogic)
+    const { setTrendsMetric, setTrendsExposureMetric, setExperiment } = useActions(experimentLogic)
+    const { currentTeam } = useValues(teamLogic)
+    const hasFilters = (currentTeam?.test_account_filters || []).length > 0
+    const [activeTab, setActiveTab] = useState('main')
+
+    const metrics = isSecondary ? experiment.metrics_secondary : experiment.metrics
+    const metricIdx = isSecondary ? editingSecondaryMetricIndex : editingPrimaryMetricIndex
+
+    if (!metricIdx && metricIdx !== 0) {
+        return <></>
+    }
+
+    const currentMetric = metrics[metricIdx] as ExperimentTrendsQuery
+
+    return (
+        <>
+            <LemonTabs
+                activeKey={activeTab}
+                onChange={(newKey) => setActiveTab(newKey)}
+                tabs={[
+                    {
+                        key: 'main',
+                        label: 'Main metric',
+                        content: (
+                            <>
+                                <div className="mb-4">
+                                    <LemonLabel>Name (optional)</LemonLabel>
+                                    <LemonInput
+                                        value={currentMetric.name}
+                                        onChange={(newName) => {
+                                            setTrendsMetric({
+                                                metricIdx,
+                                                name: newName,
+                                                isSecondary,
+                                            })
+                                        }}
+                                    />
+                                </div>
+                                <ActionFilter
+                                    bordered
+                                    filters={queryNodeToFilter(currentMetric.count_query)}
+                                    setFilters={({ actions, events, data_warehouse }: Partial<FilterType>): void => {
+                                        const series = actionsAndEventsToSeries(
+                                            { actions, events, data_warehouse } as any,
+                                            true,
+                                            MathAvailability.All
+                                        )
+
+                                        setTrendsMetric({
+                                            metricIdx,
+                                            series,
+                                            isSecondary,
+                                        })
+                                    }}
+                                    typeKey="experiment-metric"
+                                    buttonCopy="Add graph series"
+                                    showSeriesIndicator={true}
+                                    entitiesLimit={1}
+                                    showNumericalPropsOnly={true}
+                                    {...commonActionFilterProps}
+                                />
+                                <div className="mt-4 space-y-4">
+                                    <TestAccountFilterSwitch
+                                        checked={hasFilters ? !!currentMetric.count_query?.filterTestAccounts : false}
+                                        onChange={(checked: boolean) => {
+                                            setTrendsMetric({
+                                                metricIdx,
+                                                filterTestAccounts: checked,
+                                                isSecondary,
+                                            })
+                                        }}
+                                        fullWidth
+                                    />
+                                </div>
+                                {isExperimentRunning && (
+                                    <LemonBanner type="info" className="mt-3 mb-3">
+                                        Preview insights are generated based on {EXPERIMENT_DEFAULT_DURATION} days of
+                                        data. This can cause a mismatch between the preview and the actual results.
+                                    </LemonBanner>
+                                )}
+                                <div className="mt-4">
+                                    <Query
+                                        query={{
+                                            kind: NodeKind.InsightVizNode,
+                                            source: currentMetric.count_query,
+                                            showTable: false,
+                                            showLastComputation: true,
+                                            showLastComputationRefresh: false,
+                                        }}
+                                        readOnly
+                                    />
+                                </div>
+                            </>
+                        ),
+                    },
+                    {
+                        key: 'exposure',
+                        label: 'Exposure',
+                        content: (
+                            <>
+                                <div className="flex gap-4 mb-4">
+                                    <div
+                                        className={`flex-1 cursor-pointer p-4 rounded border ${
+                                            !currentMetric.exposure_query
+                                                ? 'border-primary bg-primary-highlight'
+                                                : 'border-border'
+                                        }`}
+                                        onClick={() => {
+                                            const metricsField = isSecondary ? 'metrics_secondary' : 'metrics'
+                                            setExperiment({
+                                                ...experiment,
+                                                [metricsField]: metrics.map((metric, idx) =>
+                                                    idx === metricIdx
+                                                        ? { ...metric, exposure_query: undefined }
+                                                        : metric
+                                                ),
+                                            })
+                                        }}
+                                    >
+                                        <div className="font-semibold flex justify-between items-center">
+                                            <span>Default</span>
+                                            {!currentMetric.exposure_query && (
+                                                <IconCheckCircle fontSize={18} color="var(--primary)" />
+                                            )}
+                                        </div>
+                                        <div className="text-muted text-sm leading-relaxed">
+                                            Uses the number of unique users who trigger the{' '}
+                                            <LemonTag>$feature_flag_called</LemonTag> event as your exposure count. This
+                                            is the recommended setting for most experiments, as it accurately tracks
+                                            variant exposure.
+                                        </div>
+                                    </div>
+                                    <div
+                                        className={`flex-1 cursor-pointer p-4 rounded border ${
+                                            currentMetric.exposure_query
+                                                ? 'border-primary bg-primary-highlight'
+                                                : 'border-border'
+                                        }`}
+                                        onClick={() => {
+                                            const metricsField = isSecondary ? 'metrics_secondary' : 'metrics'
+                                            setExperiment({
+                                                ...experiment,
+                                                [metricsField]: metrics.map((metric, idx) =>
+                                                    idx === metricIdx
+                                                        ? {
+                                                              ...metric,
+                                                              exposure_query: {
+                                                                  kind: NodeKind.TrendsQuery,
+                                                                  series: [
+                                                                      {
+                                                                          kind: NodeKind.EventsNode,
+                                                                          name: '$feature_flag_called',
+                                                                          event: '$feature_flag_called',
+                                                                          math: BaseMathType.UniqueUsers,
+                                                                      },
+                                                                  ],
+                                                                  interval: 'day',
+                                                                  dateRange: {
+                                                                      date_from: dayjs()
+                                                                          .subtract(EXPERIMENT_DEFAULT_DURATION, 'day')
+                                                                          .format('YYYY-MM-DDTHH:mm'),
+                                                                      date_to: dayjs()
+                                                                          .endOf('d')
+                                                                          .format('YYYY-MM-DDTHH:mm'),
+                                                                      explicitDate: true,
+                                                                  },
+                                                                  trendsFilter: {
+                                                                      display: ChartDisplayType.ActionsLineGraph,
+                                                                  },
+                                                                  filterTestAccounts: true,
+                                                              },
+                                                          }
+                                                        : metric
+                                                ),
+                                            })
+                                        }}
+                                    >
+                                        <div className="font-semibold flex justify-between items-center">
+                                            <span>Custom</span>
+                                            {currentMetric.exposure_query && (
+                                                <IconCheckCircle fontSize={18} color="var(--primary)" />
+                                            )}
+                                        </div>
+                                        <div className="text-muted text-sm leading-relaxed">
+                                            Define your own exposure metric for specific use cases, such as counting by
+                                            sessions instead of users. This gives you full control but requires careful
+                                            configuration.
+                                        </div>
+                                    </div>
+                                </div>
+                                {currentMetric.exposure_query && (
+                                    <>
+                                        <ActionFilter
+                                            bordered
+                                            filters={queryNodeToFilter(
+                                                currentMetric.exposure_query as InsightQueryNode
+                                            )}
+                                            setFilters={({
+                                                actions,
+                                                events,
+                                                data_warehouse,
+                                            }: Partial<FilterType>): void => {
+                                                const series = actionsAndEventsToSeries(
+                                                    { actions, events, data_warehouse } as any,
+                                                    true,
+                                                    MathAvailability.All
+                                                )
+
+                                                setTrendsExposureMetric({
+                                                    metricIdx,
+                                                    series,
+                                                    isSecondary,
+                                                })
+                                            }}
+                                            typeKey="experiment-metric"
+                                            buttonCopy="Add graph series"
+                                            showSeriesIndicator={true}
+                                            entitiesLimit={1}
+                                            showNumericalPropsOnly={true}
+                                            {...commonActionFilterProps}
+                                        />
+                                        <div className="mt-4 space-y-4">
+                                            <TestAccountFilterSwitch
+                                                checked={(() => {
+                                                    const val = currentMetric.exposure_query?.filterTestAccounts
+                                                    return hasFilters ? !!val : false
+                                                })()}
+                                                onChange={(checked: boolean) => {
+                                                    setTrendsExposureMetric({
+                                                        metricIdx,
+                                                        filterTestAccounts: checked,
+                                                        isSecondary,
+                                                    })
+                                                }}
+                                                fullWidth
+                                            />
+                                        </div>
+                                        {isExperimentRunning && (
+                                            <LemonBanner type="info" className="mt-3 mb-3">
+                                                Preview insights are generated based on {EXPERIMENT_DEFAULT_DURATION}{' '}
+                                                days of data. This can cause a mismatch between the preview and the
+                                                actual results.
+                                            </LemonBanner>
+                                        )}
+                                        <div className="mt-4">
+                                            <Query
+                                                query={{
+                                                    kind: NodeKind.InsightVizNode,
+                                                    source: currentMetric.exposure_query,
+                                                    showTable: false,
+                                                    showLastComputation: true,
+                                                    showLastComputationRefresh: false,
+                                                }}
+                                                readOnly
+                                            />
+                                        </div>
+                                    </>
+                                )}
+                            </>
+                        ),
+                    },
+                ]}
+            />
+        </>
+    )
+}
diff --git a/frontend/src/scenes/experiments/experimentLogic.tsx b/frontend/src/scenes/experiments/experimentLogic.tsx
index 44753c32582a8..beb7356103c97 100644
--- a/frontend/src/scenes/experiments/experimentLogic.tsx
+++ b/frontend/src/scenes/experiments/experimentLogic.tsx
@@ -220,12 +220,14 @@ export const experimentLogic = kea<experimentLogicType>([
             name,
             series,
             filterTestAccounts,
+            isSecondary = false,
         }: {
             metricIdx: number
             name?: string
             series?: any[]
             filterTestAccounts?: boolean
-        }) => ({ metricIdx, name, series, filterTestAccounts }),
+            isSecondary?: boolean
+        }) => ({ metricIdx, name, series, filterTestAccounts, isSecondary }),
         setFunnelsMetric: ({
             metricIdx,
             name,
@@ -348,8 +350,9 @@ export const experimentLogic = kea<experimentLogicType>([
                         [metricsKey]: metrics,
                     }
                 },
-                setTrendsExposureMetric: (state, { metricIdx, name, series, filterTestAccounts }) => {
-                    const metrics = [...(state?.metrics || [])]
+                setTrendsExposureMetric: (state, { metricIdx, name, series, filterTestAccounts, isSecondary }) => {
+                    const metricsKey = isSecondary ? 'metrics_secondary' : 'metrics'
+                    const metrics = [...(state?.[metricsKey] || [])]
                     const metric = metrics[metricIdx]
 
                     metrics[metricIdx] = {
@@ -364,7 +367,7 @@ export const experimentLogic = kea<experimentLogicType>([
 
                     return {
                         ...state,
-                        metrics,
+                        [metricsKey]: metrics,
                     }
                 },
                 setFunnelsMetric: (

From d45d9ffffb9bcb50883c8bed6fdfd04c75c6e49e Mon Sep 17 00:00:00 2001
From: Eric Duong <eric@posthog.com>
Date: Mon, 23 Dec 2024 09:55:48 -0500
Subject: [PATCH 08/15] chore: add allowlist for pipeline v2 (#27110)

---
 posthog/settings/data_warehouse.py                 | 3 +++
 posthog/temporal/data_imports/external_data_job.py | 4 ++--
 posthog/temporal/data_imports/util.py              | 4 ++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/posthog/settings/data_warehouse.py b/posthog/settings/data_warehouse.py
index a0a78a9621e3a..884264c674915 100644
--- a/posthog/settings/data_warehouse.py
+++ b/posthog/settings/data_warehouse.py
@@ -1,4 +1,5 @@
 import os
+from posthog.settings.utils import get_list
 
 AIRBYTE_API_KEY = os.getenv("AIRBYTE_API_KEY", None)
 AIRBYTE_BUCKET_REGION = os.getenv("AIRBYTE_BUCKET_REGION", None)
@@ -9,3 +10,5 @@
 BUCKET_URL = os.getenv("BUCKET_URL", None)
 AIRBYTE_BUCKET_NAME = os.getenv("AIRBYTE_BUCKET_NAME", None)
 BUCKET = "test-pipeline"
+
+V2_PIPELINE_ENABLED_TEAM_IDS = get_list(os.getenv("V2_PIPELINE_ENABLED_TEAM_IDS", ""))
diff --git a/posthog/temporal/data_imports/external_data_job.py b/posthog/temporal/data_imports/external_data_job.py
index 59508a2ee6f25..9e0f9ca225a84 100644
--- a/posthog/temporal/data_imports/external_data_job.py
+++ b/posthog/temporal/data_imports/external_data_job.py
@@ -21,7 +21,7 @@
 from posthog.settings.base_variables import TEST
 from posthog.temporal.batch_exports.base import PostHogWorkflow
 from posthog.temporal.common.client import sync_connect
-from posthog.temporal.data_imports.util import is_posthog_team
+from posthog.temporal.data_imports.util import is_posthog_team, is_enabled_for_team
 from posthog.temporal.data_imports.workflow_activities.check_billing_limits import (
     CheckBillingLimitsActivityInputs,
     check_billing_limits_activity,
@@ -211,7 +211,7 @@ async def run(self, inputs: ExternalDataWorkflowInputs):
         if (
             settings.TEMPORAL_TASK_QUEUE != DATA_WAREHOUSE_TASK_QUEUE_V2
             and not TEST
-            and is_posthog_team(inputs.team_id)
+            and (is_posthog_team(inputs.team_id) or is_enabled_for_team(inputs.team_id))
         ):
             await workflow.execute_activity(
                 trigger_pipeline_v2,
diff --git a/posthog/temporal/data_imports/util.py b/posthog/temporal/data_imports/util.py
index 4a133ef336b42..1900c237c1c2a 100644
--- a/posthog/temporal/data_imports/util.py
+++ b/posthog/temporal/data_imports/util.py
@@ -44,3 +44,7 @@ def is_posthog_team(team_id: int) -> bool:
 
     region = get_from_env("CLOUD_DEPLOYMENT", optional=True)
     return (region == "EU" and team_id == 1) or (region == "US" and team_id == 2)
+
+
+def is_enabled_for_team(team_id: int) -> bool:
+    return str(team_id) in settings.V2_PIPELINE_ENABLED_TEAM_IDS

From e7d0a4c79bed087b4f9f7e22cfc4233ad81fd38e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1s=20Far=C3=ADas=20Santana?= <tomas@tomasfarias.dev>
Date: Mon, 23 Dec 2024 16:35:44 +0100
Subject: [PATCH 09/15] fix: Raise exception on missing primary key (#27126)

---
 .../batch_exports/postgres_batch_export.py    | 13 +++-
 .../test_postgres_batch_export_workflow.py    | 69 ++++++++++++++++++-
 2 files changed, 80 insertions(+), 2 deletions(-)

diff --git a/posthog/temporal/batch_exports/postgres_batch_export.py b/posthog/temporal/batch_exports/postgres_batch_export.py
index 5d9bc88f7bd29..458b4cb1a6f1b 100644
--- a/posthog/temporal/batch_exports/postgres_batch_export.py
+++ b/posthog/temporal/batch_exports/postgres_batch_export.py
@@ -55,6 +55,11 @@ class PostgreSQLConnectionError(Exception):
     pass
 
 
+class MissingPrimaryKeyError(Exception):
+    def __init__(self, table: sql.Identifier, primary_key: sql.Composed):
+        super().__init__(f"An operation could not be completed as '{table}' is missing a primary key on {primary_key}")
+
+
 @dataclasses.dataclass
 class PostgresInsertInputs:
     """Inputs for Postgres insert activity."""
@@ -346,7 +351,10 @@ async def amerge_person_tables(
                     await cursor.execute(sql.SQL("SET search_path TO {schema}").format(schema=sql.Identifier(schema)))
                 await cursor.execute("SET TRANSACTION READ WRITE")
 
-                await cursor.execute(merge_query)
+                try:
+                    await cursor.execute(merge_query)
+                except psycopg.errors.InvalidColumnReference:
+                    raise MissingPrimaryKeyError(final_table_identifier, conflict_fields)
 
     async def copy_tsv_to_postgres(
         self,
@@ -598,6 +606,7 @@ async def flush_to_postgres(
                         ("team_id", "INT"),
                         ("distinct_id", "TEXT"),
                     )
+
                     await pg_client.amerge_person_tables(
                         final_table_name=pg_table,
                         stage_table_name=pg_stage_table,
@@ -704,6 +713,8 @@ async def run(self, inputs: PostgresBatchExportInputs):
                 "DiskFull",
                 # Raised by our PostgreSQL client when failing to connect after several attempts.
                 "PostgreSQLConnectionError",
+                # Raised when merging without a primary key.
+                "MissingPrimaryKeyError",
             ],
             finish_inputs=finish_inputs,
         )
diff --git a/posthog/temporal/tests/batch_exports/test_postgres_batch_export_workflow.py b/posthog/temporal/tests/batch_exports/test_postgres_batch_export_workflow.py
index 19831d2d6d636..56e4c91464032 100644
--- a/posthog/temporal/tests/batch_exports/test_postgres_batch_export_workflow.py
+++ b/posthog/temporal/tests/batch_exports/test_postgres_batch_export_workflow.py
@@ -23,6 +23,7 @@
     start_batch_export_run,
 )
 from posthog.temporal.batch_exports.postgres_batch_export import (
+    MissingPrimaryKeyError,
     PostgresBatchExportInputs,
     PostgresBatchExportWorkflow,
     PostgresInsertInputs,
@@ -362,7 +363,73 @@ async def test_insert_into_postgres_activity_merges_data_in_follow_up_runs(
 
 @pytest.fixture
 def table_name(ateam, interval):
-    return f"test_workflow_table_{ateam.pk}_{interval}"
+    return f"test_table_{ateam.pk}_{interval}"
+
+
+@pytest_asyncio.fixture
+async def persons_table_without_primary_key(postgres_connection, postgres_config, table_name):
+    """Managed a table for a persons batch export without a primary key."""
+    self_managed_table_name = table_name + f"_self_managed_{uuid.uuid4().hex}"
+
+    async with postgres_connection.transaction():
+        async with postgres_connection.cursor() as cursor:
+            await cursor.execute(
+                sql.SQL(
+                    "CREATE TABLE {table} (team_id BIGINT, distinct_id TEXT, person_id TEXT, properties JSONB, person_distinct_id_version BIGINT, person_version BIGINT)"
+                ).format(table=sql.Identifier(postgres_config["schema"], self_managed_table_name))
+            )
+
+    yield self_managed_table_name
+
+    async with postgres_connection.transaction():
+        async with postgres_connection.cursor() as cursor:
+            await cursor.execute(
+                sql.SQL("DROP TABLE IF EXISTS {table}").format(
+                    table=sql.Identifier(postgres_config["schema"], self_managed_table_name)
+                )
+            )
+
+
+@pytest.mark.parametrize("model", [BatchExportModel(name="persons", schema=None)])
+async def test_insert_into_postgres_activity_inserts_fails_on_missing_primary_key(
+    activity_environment,
+    postgres_config,
+    exclude_events,
+    model: BatchExportModel | BatchExportSchema | None,
+    data_interval_start,
+    data_interval_end,
+    ateam,
+    generate_test_data,
+    persons_table_without_primary_key,
+):
+    """Test the insert_into_postgres_activity function fails when missing a primary key.
+
+    We use a self-managed, previously created postgresql table to export persons data to.
+    Since this table does not have a primary key, the merge query should fail.
+
+    This error should only occur if the table is created outside the batch export.
+    """
+    batch_export_schema: BatchExportSchema | None = None
+    batch_export_model: BatchExportModel | None = None
+    if isinstance(model, BatchExportModel):
+        batch_export_model = model
+    elif model is not None:
+        batch_export_schema = model
+
+    insert_inputs = PostgresInsertInputs(
+        team_id=ateam.pk,
+        table_name=persons_table_without_primary_key,
+        data_interval_start=data_interval_start.isoformat(),
+        data_interval_end=data_interval_end.isoformat(),
+        exclude_events=exclude_events,
+        batch_export_schema=batch_export_schema,
+        batch_export_model=batch_export_model,
+        **postgres_config,
+    )
+
+    with pytest.raises(MissingPrimaryKeyError):
+        with override_settings(BATCH_EXPORT_POSTGRES_UPLOAD_CHUNK_SIZE_BYTES=5 * 1024**2):
+            await activity_environment.run(insert_into_postgres_activity, insert_inputs)
 
 
 @pytest_asyncio.fixture

From 1323e66fd19ae8f8eb8b70235831d73b160dd315 Mon Sep 17 00:00:00 2001
From: Anirudh Pillai <anirudhx5@gmail.com>
Date: Mon, 23 Dec 2024 16:02:21 +0000
Subject: [PATCH 10/15] feat(alerts): advanced config (#27127)

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
---
 .../lib/components/Alerts/alertFormLogic.ts   |  27 +++-
 frontend/src/lib/components/Alerts/types.ts   |   1 +
 .../Alerts/views/EditAlertModal.tsx           |  55 ++++++++
 frontend/src/queries/schema.json              |   3 +
 frontend/src/queries/schema.ts                |   1 +
 posthog/api/alert.py                          |   1 +
 posthog/api/test/test_alert.py                |   1 +
 .../0536_alertconfiguration_skip_weekend.py   |  17 +++
 posthog/migrations/max_migration.txt          |   2 +-
 posthog/models/alert.py                       |   2 +
 posthog/schema.py                             |   1 +
 posthog/tasks/alerts/checks.py                |   8 ++
 .../tasks/alerts/test/test_alert_checks.py    |  29 ++++-
 .../test/test_trends_absolute_alerts.py       |  24 ++--
 .../test/test_trends_relative_alerts.py       |  37 +++---
 posthog/tasks/alerts/trends.py                | 123 +++++++++---------
 posthog/tasks/alerts/utils.py                 |  11 ++
 17 files changed, 247 insertions(+), 96 deletions(-)
 create mode 100644 posthog/migrations/0536_alertconfiguration_skip_weekend.py

diff --git a/frontend/src/lib/components/Alerts/alertFormLogic.ts b/frontend/src/lib/components/Alerts/alertFormLogic.ts
index 3c0ab234a8ae1..2727653f5f73c 100644
--- a/frontend/src/lib/components/Alerts/alertFormLogic.ts
+++ b/frontend/src/lib/components/Alerts/alertFormLogic.ts
@@ -11,7 +11,16 @@ import { AlertType, AlertTypeWrite } from './types'
 
 export type AlertFormType = Pick<
     AlertType,
-    'name' | 'enabled' | 'created_at' | 'threshold' | 'condition' | 'subscribed_users' | 'checks' | 'config'
+    | 'name'
+    | 'enabled'
+    | 'created_at'
+    | 'calculation_interval'
+    | 'threshold'
+    | 'condition'
+    | 'subscribed_users'
+    | 'checks'
+    | 'config'
+    | 'skip_weekend'
 > & {
     id?: AlertType['id']
     created_by?: AlertType['created_by'] | null
@@ -48,6 +57,7 @@ export const alertFormLogic = kea<alertFormLogicType>([
                     config: {
                         type: 'TrendsAlertConfig',
                         series_index: 0,
+                        check_ongoing_interval: false,
                     },
                     threshold: { configuration: { type: InsightThresholdType.ABSOLUTE, bounds: {} } },
                     condition: {
@@ -56,6 +66,7 @@ export const alertFormLogic = kea<alertFormLogicType>([
                     subscribed_users: [],
                     checks: [],
                     calculation_interval: AlertCalculationInterval.DAILY,
+                    skip_weekend: false,
                     insight: props.insightId,
                 } as AlertFormType),
             errors: ({ name }) => ({
@@ -66,6 +77,20 @@ export const alertFormLogic = kea<alertFormLogicType>([
                     ...alert,
                     subscribed_users: alert.subscribed_users?.map(({ id }) => id),
                     insight: props.insightId,
+                    // can only skip weekends for hourly/daily alerts
+                    skip_weekend:
+                        (alert.calculation_interval === AlertCalculationInterval.DAILY ||
+                            alert.calculation_interval === AlertCalculationInterval.HOURLY) &&
+                        alert.skip_weekend,
+                    // can only check ongoing interval for absolute value/increase alerts with upper threshold
+                    config: {
+                        ...alert.config,
+                        check_ongoing_interval:
+                            (alert.condition.type === AlertConditionType.ABSOLUTE_VALUE ||
+                                alert.condition.type === AlertConditionType.RELATIVE_INCREASE) &&
+                            alert.threshold.configuration.bounds?.upper != null &&
+                            alert.config.check_ongoing_interval,
+                    },
                 }
 
                 // absolute value alert can only have absolute threshold
diff --git a/frontend/src/lib/components/Alerts/types.ts b/frontend/src/lib/components/Alerts/types.ts
index 4641d7fe0728f..8e0787ea1ece0 100644
--- a/frontend/src/lib/components/Alerts/types.ts
+++ b/frontend/src/lib/components/Alerts/types.ts
@@ -16,6 +16,7 @@ export interface AlertTypeBase {
     enabled: boolean
     insight: QueryBasedInsightModel
     config: AlertConfig
+    skip_weekend?: boolean
 }
 
 export interface AlertTypeWrite extends Omit<AlertTypeBase, 'insight'> {
diff --git a/frontend/src/lib/components/Alerts/views/EditAlertModal.tsx b/frontend/src/lib/components/Alerts/views/EditAlertModal.tsx
index ae12fccdab37f..8a30608195013 100644
--- a/frontend/src/lib/components/Alerts/views/EditAlertModal.tsx
+++ b/frontend/src/lib/components/Alerts/views/EditAlertModal.tsx
@@ -1,3 +1,4 @@
+import { IconInfo } from '@posthog/icons'
 import {
     LemonBanner,
     LemonCheckbox,
@@ -5,6 +6,7 @@ import {
     LemonSegmentedButton,
     LemonSelect,
     SpinnerOverlay,
+    Tooltip,
 } from '@posthog/lemon-ui'
 import { useActions, useValues } from 'kea'
 import { Form, Group } from 'kea-forms'
@@ -97,6 +99,11 @@ export function EditAlertModal({
     const { alertSeries, isNonTimeSeriesDisplay, isBreakdownValid, formula } = useValues(trendsLogic)
 
     const creatingNewAlert = alertForm.id === undefined
+    // can only check ongoing interval for absolute value/increase alerts with upper threshold
+    const can_check_ongoing_interval =
+        (alertForm?.condition.type === AlertConditionType.ABSOLUTE_VALUE ||
+            alertForm?.condition.type === AlertConditionType.RELATIVE_INCREASE) &&
+        alertForm.threshold.configuration.bounds?.upper != null
 
     return (
         <LemonModal onClose={onClose} isOpen={isOpen} width={600} simple title="">
@@ -320,7 +327,55 @@ export function EditAlertModal({
                                     </div>
                                 </div>
                             </div>
+
+                            <div className="space-y-2">
+                                <h3 className="text-muted-alt">Advanced</h3>
+                                <Group name={['config']}>
+                                    <div className="flex gap-1">
+                                        <LemonField name="check_ongoing_interval">
+                                            <LemonCheckbox
+                                                checked={
+                                                    can_check_ongoing_interval &&
+                                                    alertForm?.config.check_ongoing_interval
+                                                }
+                                                data-attr="alertForm-check-ongoing-interval"
+                                                fullWidth
+                                                label="Check ongoing period"
+                                                disabledReason={
+                                                    !can_check_ongoing_interval &&
+                                                    'Can only alert for ongoing period when checking for absolute value/increase above threshold'
+                                                }
+                                            />
+                                        </LemonField>
+                                        <Tooltip
+                                            title={`Checks the insight value for the on going period (current week/month) that hasn't yet completed. Use this if you want to be alerted right away when the insight value rises/increases above threshold`}
+                                            placement="right"
+                                            delayMs={0}
+                                        >
+                                            <IconInfo />
+                                        </Tooltip>
+                                    </div>
+                                </Group>
+                                <LemonField name="skip_weekend">
+                                    <LemonCheckbox
+                                        checked={
+                                            (alertForm?.calculation_interval === AlertCalculationInterval.DAILY ||
+                                                alertForm?.calculation_interval === AlertCalculationInterval.HOURLY) &&
+                                            alertForm?.skip_weekend
+                                        }
+                                        data-attr="alertForm-skip-weekend"
+                                        fullWidth
+                                        label="Skip checking on weekends"
+                                        disabledReason={
+                                            alertForm?.calculation_interval !== AlertCalculationInterval.DAILY &&
+                                            alertForm?.calculation_interval !== AlertCalculationInterval.HOURLY &&
+                                            'Can only skip weekend checking for hourly/daily alerts'
+                                        }
+                                    />
+                                </LemonField>
+                            </div>
                         </div>
+
                         {alert && <AlertStateTable alert={alert} />}
                     </LemonModal.Content>
 
diff --git a/frontend/src/queries/schema.json b/frontend/src/queries/schema.json
index 005fb78c94497..6e9928d4801aa 100644
--- a/frontend/src/queries/schema.json
+++ b/frontend/src/queries/schema.json
@@ -12519,6 +12519,9 @@
         "TrendsAlertConfig": {
             "additionalProperties": false,
             "properties": {
+                "check_ongoing_interval": {
+                    "type": "boolean"
+                },
                 "series_index": {
                     "type": "integer"
                 },
diff --git a/frontend/src/queries/schema.ts b/frontend/src/queries/schema.ts
index 9e4252c989b38..131627a00b638 100644
--- a/frontend/src/queries/schema.ts
+++ b/frontend/src/queries/schema.ts
@@ -2379,6 +2379,7 @@ export enum AlertCalculationInterval {
 export interface TrendsAlertConfig {
     type: 'TrendsAlertConfig'
     series_index: integer
+    check_ongoing_interval?: boolean
 }
 
 export interface HogCompileResponse {
diff --git a/posthog/api/alert.py b/posthog/api/alert.py
index df4d2b9791ca9..6ff9bd1e49dad 100644
--- a/posthog/api/alert.py
+++ b/posthog/api/alert.py
@@ -115,6 +115,7 @@ class Meta:
             "config",
             "calculation_interval",
             "snoozed_until",
+            "skip_weekend",
         ]
         read_only_fields = [
             "id",
diff --git a/posthog/api/test/test_alert.py b/posthog/api/test/test_alert.py
index 707114e420cab..5f980f671d737 100644
--- a/posthog/api/test/test_alert.py
+++ b/posthog/api/test/test_alert.py
@@ -64,6 +64,7 @@ def test_create_and_delete_alert(self) -> None:
             "last_checked_at": None,
             "next_check_at": None,
             "snoozed_until": None,
+            "skip_weekend": False,
         }
         assert response.status_code == status.HTTP_201_CREATED, response.content
         assert response.json() == expected_alert_json
diff --git a/posthog/migrations/0536_alertconfiguration_skip_weekend.py b/posthog/migrations/0536_alertconfiguration_skip_weekend.py
new file mode 100644
index 0000000000000..58ebe511d8f63
--- /dev/null
+++ b/posthog/migrations/0536_alertconfiguration_skip_weekend.py
@@ -0,0 +1,17 @@
+# Generated by Django 4.2.15 on 2024-12-23 11:55
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("posthog", "0535_alter_hogfunction_type"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="alertconfiguration",
+            name="skip_weekend",
+            field=models.BooleanField(blank=True, default=False, null=True),
+        ),
+    ]
diff --git a/posthog/migrations/max_migration.txt b/posthog/migrations/max_migration.txt
index 4270a16eb7703..9920c6cf00577 100644
--- a/posthog/migrations/max_migration.txt
+++ b/posthog/migrations/max_migration.txt
@@ -1 +1 @@
-0535_alter_hogfunction_type
+0536_alertconfiguration_skip_weekend
diff --git a/posthog/models/alert.py b/posthog/models/alert.py
index 48e3bc49d3ddc..ad2f363151bf8 100644
--- a/posthog/models/alert.py
+++ b/posthog/models/alert.py
@@ -114,6 +114,8 @@ class AlertConfiguration(CreatedMetaFields, UUIDModel):
     # UTC time until when we shouldn't check alert/notify user
     snoozed_until = models.DateTimeField(null=True, blank=True)
 
+    skip_weekend = models.BooleanField(null=True, blank=True, default=False)
+
     def __str__(self):
         return f"{self.name} (Team: {self.team})"
 
diff --git a/posthog/schema.py b/posthog/schema.py
index a46596350f23f..c723f6dc021cb 100644
--- a/posthog/schema.py
+++ b/posthog/schema.py
@@ -1571,6 +1571,7 @@ class TrendsAlertConfig(BaseModel):
     model_config = ConfigDict(
         extra="forbid",
     )
+    check_ongoing_interval: Optional[bool] = None
     series_index: int
     type: Literal["TrendsAlertConfig"] = "TrendsAlertConfig"
 
diff --git a/posthog/tasks/alerts/checks.py b/posthog/tasks/alerts/checks.py
index 439305283b4cf..9bcb8925d1b5c 100644
--- a/posthog/tasks/alerts/checks.py
+++ b/posthog/tasks/alerts/checks.py
@@ -32,6 +32,7 @@
     next_check_time,
     send_notifications_for_breaches,
     send_notifications_for_errors,
+    skip_because_of_weekend,
     WRAPPER_NODE_KINDS,
 )
 from posthog.tasks.alerts.trends import check_trends_alert
@@ -216,6 +217,13 @@ def check_alert(alert_id: str, capture_ph_event: Callable = lambda *args, **kwar
         )
         return
 
+    if skip_because_of_weekend(alert):
+        logger.info(
+            "Skipping alert check because weekend checking is disabled",
+            alert=alert,
+        )
+        return
+
     if alert.snoozed_until:
         if alert.snoozed_until > now:
             logger.info(
diff --git a/posthog/tasks/alerts/test/test_alert_checks.py b/posthog/tasks/alerts/test/test_alert_checks.py
index 17cfcce2dca79..f03dc7b9c35de 100644
--- a/posthog/tasks/alerts/test/test_alert_checks.py
+++ b/posthog/tasks/alerts/test/test_alert_checks.py
@@ -64,6 +64,12 @@ def set_thresholds(self, lower: Optional[int] = None, upper: Optional[int] = Non
             data={"threshold": {"configuration": {"type": "absolute", "bounds": {"lower": lower, "upper": upper}}}},
         )
 
+    def skip_weekend(self, skip: bool) -> None:
+        self.client.patch(
+            f"/api/projects/{self.team.id}/alerts/{self.alert['id']}",
+            data={"skip_weekend": skip},
+        )
+
     def get_breach_description(self, mock_send_notifications_for_breaches: MagicMock, call_index: int) -> list[str]:
         return mock_send_notifications_for_breaches.call_args_list[call_index].args[1]
 
@@ -130,7 +136,7 @@ def test_alert_is_triggered_for_value_below_lower_threshold(
 
         assert mock_send_notifications_for_breaches.call_count == 1
         anomalies = self.get_breach_description(mock_send_notifications_for_breaches, call_index=0)
-        assert "The insight value ($pageview) for previous interval (0) is less than lower threshold (1.0)" in anomalies
+        assert "The insight value ($pageview) for current interval (0) is less than lower threshold (1.0)" in anomalies
 
     def test_alert_triggers_but_does_not_send_notification_during_firing(
         self, mock_send_notifications_for_breaches: MagicMock, mock_send_errors: MagicMock
@@ -318,7 +324,7 @@ def test_alert_with_insight_with_filter(
 
         assert mock_send_notifications_for_breaches.call_count == 1
         anomalies = self.get_breach_description(mock_send_notifications_for_breaches, call_index=0)
-        assert "The insight value ($pageview) for previous interval (0) is less than lower threshold (1.0)" in anomalies
+        assert "The insight value ($pageview) for current interval (0) is less than lower threshold (1.0)" in anomalies
 
     @patch("posthog.tasks.alerts.utils.EmailMessage")
     def test_send_emails(
@@ -389,3 +395,22 @@ def test_alert_not_recalculated_when_is_calculating(
         assert mock_send_notifications_for_breaches.call_count == 1
         second_check = AlertCheck.objects.filter(alert_configuration=self.alert["id"]).latest("created_at")
         assert first_check.id == second_check.id
+
+    def test_alert_is_not_checked_on_weekend_when_skip_weekends_is_true(
+        self, mock_send_notifications_for_breaches: MagicMock, mock_send_errors: MagicMock
+    ) -> None:
+        self.skip_weekend(True)
+
+        # run on weekend
+        with freeze_time("2024-12-21T07:55:00.000Z"):
+            check_alert(self.alert["id"])
+
+        checks = AlertCheck.objects.filter(alert_configuration=self.alert["id"])
+        assert len(checks) == 0
+
+        # run on week day
+        with freeze_time("2024-12-19T07:55:00.000Z"):
+            check_alert(self.alert["id"])
+
+        checks = AlertCheck.objects.filter(alert_configuration=self.alert["id"])
+        assert len(checks) == 1
diff --git a/posthog/tasks/alerts/test/test_trends_absolute_alerts.py b/posthog/tasks/alerts/test/test_trends_absolute_alerts.py
index 1536c81885ca2..4c09ffea0930a 100644
--- a/posthog/tasks/alerts/test/test_trends_absolute_alerts.py
+++ b/posthog/tasks/alerts/test/test_trends_absolute_alerts.py
@@ -49,6 +49,7 @@ def create_alert(
         lower: Optional[int] = None,
         upper: Optional[int] = None,
         calculation_interval: AlertCalculationInterval = AlertCalculationInterval.DAILY,
+        check_ongoing_interval: bool = False,
     ) -> dict:
         alert = self.client.post(
             f"/api/projects/{self.team.id}/alerts",
@@ -59,6 +60,7 @@ def create_alert(
                 "config": {
                     "type": "TrendsAlertConfig",
                     "series_index": series_index,
+                    "check_ongoing_interval": check_ongoing_interval,
                 },
                 "condition": {"type": "absolute_value"},
                 "calculation_interval": calculation_interval,
@@ -69,7 +71,9 @@ def create_alert(
         return alert
 
     def create_time_series_trend_insight(
-        self, breakdown: Optional[BreakdownFilter] = None, interval: IntervalType = IntervalType.WEEK
+        self,
+        breakdown: Optional[BreakdownFilter] = None,
+        interval: IntervalType = IntervalType.WEEK,
     ) -> dict[str, Any]:
         query_dict = TrendsQuery(
             series=[
@@ -491,7 +495,7 @@ def test_trend_current_interval_high_threshold_breached(
         self, mock_send_breaches: MagicMock, mock_send_errors: MagicMock
     ) -> None:
         insight = self.create_time_series_trend_insight()
-        alert = self.create_alert(insight, series_index=0, upper=1)
+        alert = self.create_alert(insight, series_index=0, upper=1, check_ongoing_interval=True)
 
         # around 8 AM on same day as check
         with freeze_time(FROZEN_TIME - dateutil.relativedelta.relativedelta(hours=1)):
@@ -528,11 +532,11 @@ def test_trend_current_interval_high_threshold_breached(
             ANY, ["The insight value (signed_up) for current week (2) is more than upper threshold (1.0)"]
         )
 
-    def test_trend_current_interval_fallback_to_previous_high_threshold_breached(
+    def test_trend_current_interval_should_not_fallback_to_previous_high_threshold_breached(
         self, mock_send_breaches: MagicMock, mock_send_errors: MagicMock
     ) -> None:
         insight = self.create_time_series_trend_insight(interval=IntervalType.DAY)
-        alert = self.create_alert(insight, series_index=0, upper=1)
+        alert = self.create_alert(insight, series_index=0, upper=1, check_ongoing_interval=True)
 
         # current day doesn't breach
         with freeze_time(FROZEN_TIME - dateutil.relativedelta.relativedelta(hours=1)):
@@ -563,7 +567,7 @@ def test_trend_current_interval_fallback_to_previous_high_threshold_breached(
         check_alert(alert["id"])
 
         updated_alert = AlertConfiguration.objects.get(pk=alert["id"])
-        assert updated_alert.state == AlertState.FIRING
+        assert updated_alert.state == AlertState.NOT_FIRING
 
         next_check = (FROZEN_TIME + dateutil.relativedelta.relativedelta(days=1)).replace(hour=1, tzinfo=pytz.UTC)
         assert updated_alert.next_check_at is not None
@@ -571,15 +575,11 @@ def test_trend_current_interval_fallback_to_previous_high_threshold_breached(
         assert updated_alert.next_check_at.date() == next_check.date()
 
         alert_check = AlertCheck.objects.filter(alert_configuration=alert["id"]).latest("created_at")
-        assert alert_check.calculated_value == 2
-        assert alert_check.state == AlertState.FIRING
+        # has to have value for current period
+        assert alert_check.calculated_value == 1
+        assert alert_check.state == AlertState.NOT_FIRING
         assert alert_check.error is None
 
-        # should be 'previous' week as current week check should fallback
-        mock_send_breaches.assert_called_once_with(
-            ANY, ["The insight value (signed_up) for previous day (2) is more than upper threshold (1.0)"]
-        )
-
     def test_trend_current_interval_no_threshold_breached(
         self, mock_send_breaches: MagicMock, mock_send_errors: MagicMock
     ) -> None:
diff --git a/posthog/tasks/alerts/test/test_trends_relative_alerts.py b/posthog/tasks/alerts/test/test_trends_relative_alerts.py
index 8de118c8cce5e..b56e058be4b9d 100644
--- a/posthog/tasks/alerts/test/test_trends_relative_alerts.py
+++ b/posthog/tasks/alerts/test/test_trends_relative_alerts.py
@@ -52,6 +52,7 @@ def create_alert(
         threshold_type: InsightThresholdType,
         lower: Optional[float] = None,
         upper: Optional[float] = None,
+        check_ongoing_interval: bool = False,
     ) -> dict:
         alert = self.client.post(
             f"/api/projects/{self.team.id}/alerts",
@@ -62,6 +63,7 @@ def create_alert(
                 "config": {
                     "type": "TrendsAlertConfig",
                     "series_index": series_index,
+                    "check_ongoing_interval": check_ongoing_interval,
                 },
                 "condition": {"type": condition_type},
                 "calculation_interval": AlertCalculationInterval.DAILY,
@@ -72,7 +74,9 @@ def create_alert(
         return alert
 
     def create_time_series_trend_insight(
-        self, interval: IntervalType, breakdown: Optional[BreakdownFilter] = None
+        self,
+        interval: IntervalType,
+        breakdown: Optional[BreakdownFilter] = None,
     ) -> dict[str, Any]:
         query_dict = TrendsQuery(
             series=[
@@ -1578,6 +1582,7 @@ def test_current_interval_relative_increase_upper_threshold_breached(
             condition_type=AlertConditionType.RELATIVE_INCREASE,
             threshold_type=InsightThresholdType.ABSOLUTE,
             upper=1,
+            check_ongoing_interval=True,
         )
 
         # alert if sign ups increase by more than 20%
@@ -1587,6 +1592,7 @@ def test_current_interval_relative_increase_upper_threshold_breached(
             condition_type=AlertConditionType.RELATIVE_INCREASE,
             threshold_type=InsightThresholdType.PERCENTAGE,
             upper=0.2,
+            check_ongoing_interval=True,
         )
 
         # FROZEN_TIME is on Tue, insight has weekly interval
@@ -1681,7 +1687,7 @@ def test_current_interval_relative_increase_upper_threshold_breached(
             ["The insight value (signed_up) for current week (200.00%) increased more than upper threshold (20.00%)"],
         )
 
-    def test_current_interval_relative_increase_fallback_upper_threshold_breached(
+    def test_current_interval_relative_increase_does_not_fallback_to_previous_interval(
         self, mock_send_breaches: MagicMock, mock_send_errors: MagicMock
     ) -> None:
         insight = self.create_time_series_trend_insight(interval=IntervalType.WEEK)
@@ -1693,6 +1699,7 @@ def test_current_interval_relative_increase_fallback_upper_threshold_breached(
             condition_type=AlertConditionType.RELATIVE_INCREASE,
             threshold_type=InsightThresholdType.ABSOLUTE,
             upper=1,
+            check_ongoing_interval=True,
         )
 
         # alert if sign ups increase by more than 20%
@@ -1702,6 +1709,7 @@ def test_current_interval_relative_increase_fallback_upper_threshold_breached(
             condition_type=AlertConditionType.RELATIVE_INCREASE,
             threshold_type=InsightThresholdType.PERCENTAGE,
             upper=0.2,
+            check_ongoing_interval=True,
         )
 
         # FROZEN_TIME is on Tue, insight has weekly interval
@@ -1758,7 +1766,7 @@ def test_current_interval_relative_increase_fallback_upper_threshold_breached(
         check_alert(absolute_alert["id"])
 
         updated_alert = AlertConfiguration.objects.get(pk=absolute_alert["id"])
-        assert updated_alert.state == AlertState.FIRING
+        assert updated_alert.state == AlertState.NOT_FIRING
 
         next_check = (FROZEN_TIME + dateutil.relativedelta.relativedelta(days=1)).replace(hour=1, tzinfo=pytz.UTC)
         assert updated_alert.next_check_at
@@ -1767,20 +1775,16 @@ def test_current_interval_relative_increase_fallback_upper_threshold_breached(
 
         alert_check = AlertCheck.objects.filter(alert_configuration=absolute_alert["id"]).latest("created_at")
 
-        assert alert_check.calculated_value == 2
-        assert alert_check.state == AlertState.FIRING
+        # decrease of 2 events compared to week before
+        # shouln't look a previous interval which had increase of 2
+        assert alert_check.calculated_value == -2
+        assert alert_check.state == AlertState.NOT_FIRING
         assert alert_check.error is None
 
-        # should be 'previous' week as we haven't breached for current week
-        # so logic fallback to previous week
-        mock_send_breaches.assert_called_once_with(
-            ANY, ["The insight value (signed_up) for previous week (2) increased more than upper threshold (1.0)"]
-        )
-
         check_alert(percentage_alert["id"])
 
         updated_alert = AlertConfiguration.objects.get(pk=percentage_alert["id"])
-        assert updated_alert.state == AlertState.FIRING
+        assert updated_alert.state == AlertState.NOT_FIRING
 
         next_check = (FROZEN_TIME + dateutil.relativedelta.relativedelta(days=1)).replace(hour=1, tzinfo=pytz.UTC)
         assert updated_alert.next_check_at
@@ -1789,15 +1793,10 @@ def test_current_interval_relative_increase_fallback_upper_threshold_breached(
 
         alert_check = AlertCheck.objects.filter(alert_configuration=percentage_alert["id"]).latest("created_at")
 
-        assert alert_check.calculated_value == 2
-        assert alert_check.state == AlertState.FIRING
+        assert alert_check.calculated_value == -2 / 3
+        assert alert_check.state == AlertState.NOT_FIRING
         assert alert_check.error is None
 
-        mock_send_breaches.assert_called_with(
-            ANY,
-            ["The insight value (signed_up) for previous week (200.00%) increased more than upper threshold (20.00%)"],
-        )
-
     def test_relative_increase_when_previous_value_is_0(
         self, mock_send_breaches: MagicMock, mock_send_errors: MagicMock
     ) -> None:
diff --git a/posthog/tasks/alerts/trends.py b/posthog/tasks/alerts/trends.py
index 0175d414498d4..73ab04530bfd6 100644
--- a/posthog/tasks/alerts/trends.py
+++ b/posthog/tasks/alerts/trends.py
@@ -69,7 +69,7 @@ def check_trends_alert(alert: AlertConfiguration, insight: Insight, query: Trend
         (query.breakdownFilter.breakdown and query.breakdownFilter.breakdown_type) or query.breakdownFilter.breakdowns
     )
     is_non_time_series = _is_non_time_series_trend(query)
-    check_current_interval = False
+    check_current_interval = config.check_ongoing_interval
 
     match condition.type:
         case AlertConditionType.ABSOLUTE_VALUE:
@@ -98,16 +98,18 @@ def check_trends_alert(alert: AlertConfiguration, insight: Insight, query: Trend
 
             interval = query.interval if not is_non_time_series else None
 
-            if threshold.bounds.upper is not None:
+            if check_current_interval and threshold.bounds.upper is None:
                 # checking for value > X so we can also check current interval value
-                check_current_interval = True
+                raise ValueError(
+                    f"check_ongoing_interval is only supported for alert condition ABSOLUTE_VALUE when upper threshold is specified"
+                )
 
             if has_breakdown:
                 # for breakdowns, we need to check all values in calculation_result.result
                 breakdown_results = calculation_result.result
 
                 for breakdown_result in breakdown_results:
-                    if check_current_interval:
+                    if check_current_interval or is_non_time_series:
                         current_interval_value = _pick_interval_value_from_trend_result(query, breakdown_result, 0)
                         breaches = _breach_messages(
                             bounds=threshold.bounds,
@@ -119,21 +121,21 @@ def check_trends_alert(alert: AlertConfiguration, insight: Insight, query: Trend
                             is_current_interval=True,
                         )
                         if breaches:
+                            # found one breakdown value that breached the threshold
                             return AlertEvaluationResult(value=current_interval_value, breaches=breaches)
-
-                    # fall back to check previous interval
-                    prev_interval_value = _pick_interval_value_from_trend_result(query, breakdown_result, -1)
-                    breaches = _breach_messages(
-                        threshold.bounds,
-                        prev_interval_value,
-                        threshold.type,
-                        condition.type,
-                        interval,
-                        breakdown_result["label"],
-                    )
-                    if breaches:
-                        # found one breakdown value that breached the threshold
-                        return AlertEvaluationResult(value=prev_interval_value, breaches=breaches)
+                    else:
+                        prev_interval_value = _pick_interval_value_from_trend_result(query, breakdown_result, -1)
+                        breaches = _breach_messages(
+                            threshold.bounds,
+                            prev_interval_value,
+                            threshold.type,
+                            condition.type,
+                            interval,
+                            breakdown_result["label"],
+                        )
+                        if breaches:
+                            # found one breakdown value that breached the threshold
+                            return AlertEvaluationResult(value=prev_interval_value, breaches=breaches)
 
                 # None of the breakdown values breached the threshold
                 return AlertEvaluationResult(value=None, breaches=[])
@@ -141,7 +143,7 @@ def check_trends_alert(alert: AlertConfiguration, insight: Insight, query: Trend
                 # for non breakdowns, we pick the series (config.series_index) from calculation_result.result
                 selected_series_result = _pick_series_result(config, calculation_result)
 
-                if check_current_interval:
+                if check_current_interval or is_non_time_series:
                     # pick current interval value
                     current_interval_value = _pick_interval_value_from_trend_result(query, selected_series_result, 0)
                     breaches = _breach_messages(
@@ -153,21 +155,18 @@ def check_trends_alert(alert: AlertConfiguration, insight: Insight, query: Trend
                         selected_series_result["label"],
                         is_current_interval=True,
                     )
-                    if breaches:
-                        return AlertEvaluationResult(value=current_interval_value, breaches=breaches)
-
-                # fall back to check previous interval
-                prev_interval_value = _pick_interval_value_from_trend_result(query, selected_series_result, -1)
-                breaches = _breach_messages(
-                    threshold.bounds,
-                    prev_interval_value,
-                    threshold.type,
-                    condition.type,
-                    interval,
-                    selected_series_result["label"],
-                )
-
-                return AlertEvaluationResult(value=prev_interval_value, breaches=breaches)
+                    return AlertEvaluationResult(value=current_interval_value, breaches=breaches)
+                else:
+                    prev_interval_value = _pick_interval_value_from_trend_result(query, selected_series_result, -1)
+                    breaches = _breach_messages(
+                        threshold.bounds,
+                        prev_interval_value,
+                        threshold.type,
+                        condition.type,
+                        interval,
+                        selected_series_result["label"],
+                    )
+                    return AlertEvaluationResult(value=prev_interval_value, breaches=breaches)
         case AlertConditionType.RELATIVE_INCREASE:
             if is_non_time_series:
                 raise ValueError(f"Relative alerts not supported for non time series trends")
@@ -204,10 +203,12 @@ def check_trends_alert(alert: AlertConfiguration, insight: Insight, query: Trend
             increase = None
             breaches = []
 
-            if threshold.bounds.upper is not None:
+            if check_current_interval and threshold.bounds.upper is None:
                 # checking for value increased > X so we can also check current interval value
                 # as can alert right away if current interval value - previous interval value > upper threshold
-                check_current_interval = True
+                raise ValueError(
+                    f"check_ongoing_interval is only supported for alert condition RELATIVE_INCREASE when upper threshold is specified"
+                )
 
             for result in results_to_evaluate:
                 current_interval_value = _pick_interval_value_from_trend_result(query, result, 0)
@@ -242,34 +243,34 @@ def check_trends_alert(alert: AlertConfiguration, insight: Insight, query: Trend
                     if breaches:
                         # found a breach for one of the results so alert
                         return AlertEvaluationResult(value=increase, breaches=breaches)
-
-                # fallback to check previous intervals
-                if threshold.type == InsightThresholdType.ABSOLUTE:
-                    increase = prev_interval_value - prev_prev_interval_value
-                elif threshold.type == InsightThresholdType.PERCENTAGE:
-                    if prev_prev_interval_value == 0 and prev_interval_value == 0:
-                        increase = 0
-                    elif prev_prev_interval_value == 0:
-                        increase = float("inf")
-                    else:
-                        increase = (prev_interval_value - prev_prev_interval_value) / prev_prev_interval_value
                 else:
-                    raise ValueError(
-                        f"Neither relative nor absolute threshold configured for alert condition RELATIVE_INCREASE"
-                    )
+                    # fallback to check previous intervals
+                    if threshold.type == InsightThresholdType.ABSOLUTE:
+                        increase = prev_interval_value - prev_prev_interval_value
+                    elif threshold.type == InsightThresholdType.PERCENTAGE:
+                        if prev_prev_interval_value == 0 and prev_interval_value == 0:
+                            increase = 0
+                        elif prev_prev_interval_value == 0:
+                            increase = float("inf")
+                        else:
+                            increase = (prev_interval_value - prev_prev_interval_value) / prev_prev_interval_value
+                    else:
+                        raise ValueError(
+                            f"Neither relative nor absolute threshold configured for alert condition RELATIVE_INCREASE"
+                        )
 
-                breaches = _breach_messages(
-                    threshold.bounds,
-                    increase,
-                    threshold.type,
-                    condition.type,
-                    query.interval,
-                    result["label"],
-                )
+                    breaches = _breach_messages(
+                        threshold.bounds,
+                        increase,
+                        threshold.type,
+                        condition.type,
+                        query.interval,
+                        result["label"],
+                    )
 
-                if breaches:
-                    # found a breach for one of the results so alert
-                    return AlertEvaluationResult(value=increase, breaches=breaches)
+                    if breaches:
+                        # found a breach for one of the results so alert
+                        return AlertEvaluationResult(value=increase, breaches=breaches)
 
             return AlertEvaluationResult(value=(increase if not has_breakdown else None), breaches=[])
 
diff --git a/posthog/tasks/alerts/utils.py b/posthog/tasks/alerts/utils.py
index 28bebd0aa43e3..145a450227e9b 100644
--- a/posthog/tasks/alerts/utils.py
+++ b/posthog/tasks/alerts/utils.py
@@ -58,6 +58,17 @@ def alert_calculation_interval_to_relativedelta(alert_calculation_interval: Aler
             raise ValueError(f"Invalid alert calculation interval: {alert_calculation_interval}")
 
 
+def skip_because_of_weekend(alert: AlertConfiguration) -> bool:
+    if not alert.skip_weekend:
+        return False
+
+    now = datetime.now(pytz.UTC)
+    team_timezone = pytz.timezone(alert.team.timezone)
+
+    now_local = now.astimezone(team_timezone)
+    return now_local.isoweekday() in [5, 6]
+
+
 def next_check_time(alert: AlertConfiguration) -> datetime:
     """
     Rule by calculation interval

From feaf60e3c2882a5b2ba781341a21df44d635ca93 Mon Sep 17 00:00:00 2001
From: Daniel Bachhuber <daniel.b@posthog.com>
Date: Mon, 23 Dec 2024 09:29:05 -0800
Subject: [PATCH 11/15] fix(experiments): Remove most property math operations
 (#27133)

---
 .../experiments/Metrics/TrendsMetricForm.tsx  |   3 +-
 .../filters/ActionFilter/ActionFilter.tsx     |   4 +
 .../ActionFilterRow/ActionFilterRow.tsx       |  26 ++-
 .../experiment_trends_query_runner.py         |  10 -
 .../test_experiment_trends_query_runner.py    | 219 +-----------------
 5 files changed, 28 insertions(+), 234 deletions(-)

diff --git a/frontend/src/scenes/experiments/Metrics/TrendsMetricForm.tsx b/frontend/src/scenes/experiments/Metrics/TrendsMetricForm.tsx
index f76d69664f008..bfe5cb88ec168 100644
--- a/frontend/src/scenes/experiments/Metrics/TrendsMetricForm.tsx
+++ b/frontend/src/scenes/experiments/Metrics/TrendsMetricForm.tsx
@@ -14,7 +14,7 @@ import { actionsAndEventsToSeries } from '~/queries/nodes/InsightQuery/utils/fil
 import { queryNodeToFilter } from '~/queries/nodes/InsightQuery/utils/queryNodeToFilter'
 import { Query } from '~/queries/Query/Query'
 import { ExperimentTrendsQuery, InsightQueryNode, NodeKind } from '~/queries/schema'
-import { BaseMathType, ChartDisplayType, FilterType } from '~/types'
+import { BaseMathType, ChartDisplayType, FilterType, PropertyMathType } from '~/types'
 
 import { experimentLogic } from '../experimentLogic'
 import { commonActionFilterProps } from './Selectors'
@@ -81,6 +81,7 @@ export function TrendsMetricForm({ isSecondary = false }: { isSecondary?: boolea
                                     showSeriesIndicator={true}
                                     entitiesLimit={1}
                                     showNumericalPropsOnly={true}
+                                    onlyPropertyMathDefinitions={[PropertyMathType.Average]}
                                     {...commonActionFilterProps}
                                 />
                                 <div className="mt-4 space-y-4">
diff --git a/frontend/src/scenes/insights/filters/ActionFilter/ActionFilter.tsx b/frontend/src/scenes/insights/filters/ActionFilter/ActionFilter.tsx
index 91d3c1fcf260d..28c1e19d8419c 100644
--- a/frontend/src/scenes/insights/filters/ActionFilter/ActionFilter.tsx
+++ b/frontend/src/scenes/insights/filters/ActionFilter/ActionFilter.tsx
@@ -86,6 +86,8 @@ export interface ActionFilterProps {
         deleteButton,
         orLabel,
     }: Record<string, JSX.Element | string | undefined>) => JSX.Element
+    /** Only show these property math definitions */
+    onlyPropertyMathDefinitions?: Array<string>
 }
 
 export const ActionFilter = React.forwardRef<HTMLDivElement, ActionFilterProps>(function ActionFilter(
@@ -116,6 +118,7 @@ export const ActionFilter = React.forwardRef<HTMLDivElement, ActionFilterProps>(
         buttonType = 'tertiary',
         readOnly = false,
         bordered = false,
+        onlyPropertyMathDefinitions,
     },
     ref
 ): JSX.Element {
@@ -174,6 +177,7 @@ export const ActionFilter = React.forwardRef<HTMLDivElement, ActionFilterProps>(
         onRenameClick: showModal,
         sortable,
         showNumericalPropsOnly,
+        onlyPropertyMathDefinitions,
     }
 
     const reachedLimit: boolean = Boolean(entitiesLimit && localFilters.length >= entitiesLimit)
diff --git a/frontend/src/scenes/insights/filters/ActionFilter/ActionFilterRow/ActionFilterRow.tsx b/frontend/src/scenes/insights/filters/ActionFilter/ActionFilterRow/ActionFilterRow.tsx
index 15586e766a310..026f8bdda9de7 100644
--- a/frontend/src/scenes/insights/filters/ActionFilter/ActionFilterRow/ActionFilterRow.tsx
+++ b/frontend/src/scenes/insights/filters/ActionFilter/ActionFilterRow/ActionFilterRow.tsx
@@ -126,6 +126,8 @@ export interface ActionFilterRowProps {
     trendsDisplayCategory: ChartDisplayCategory | null
     /** Whether properties shown should be limited to just numerical types */
     showNumericalPropsOnly?: boolean
+    /** Only show these property math definitions */
+    onlyPropertyMathDefinitions?: Array<string>
 }
 
 export function ActionFilterRow({
@@ -155,6 +157,7 @@ export function ActionFilterRow({
     renderRow,
     trendsDisplayCategory,
     showNumericalPropsOnly,
+    onlyPropertyMathDefinitions,
 }: ActionFilterRowProps): JSX.Element {
     const { entityFilterVisible } = useValues(logic)
     const {
@@ -425,6 +428,7 @@ export function ActionFilterRow({
                                             style={{ maxWidth: '100%', width: 'initial' }}
                                             mathAvailability={mathAvailability}
                                             trendsDisplayCategory={trendsDisplayCategory}
+                                            onlyPropertyMathDefinitions={onlyPropertyMathDefinitions}
                                         />
                                         {mathDefinitions[math || BaseMathType.TotalCount]?.category ===
                                             MathCategory.PropertyValue && (
@@ -642,6 +646,8 @@ interface MathSelectorProps {
     onMathSelect: (index: number, value: any) => any
     trendsDisplayCategory: ChartDisplayCategory | null
     style?: React.CSSProperties
+    /** Only show these property math definitions */
+    onlyPropertyMathDefinitions?: Array<string>
 }
 
 function isPropertyValueMath(math: string | undefined): math is PropertyMathType {
@@ -660,6 +666,7 @@ function useMathSelectorOptions({
     mathAvailability,
     onMathSelect,
     trendsDisplayCategory,
+    onlyPropertyMathDefinitions,
 }: MathSelectorProps): LemonSelectOptions<string> {
     const mountedInsightDataLogic = insightDataLogic.findMounted()
     const query = mountedInsightDataLogic?.values?.query
@@ -758,12 +765,19 @@ function useMathSelectorOptions({
                             setPropertyMathTypeShown(value as PropertyMathType)
                             onMathSelect(index, value)
                         }}
-                        options={Object.entries(PROPERTY_MATH_DEFINITIONS).map(([key, definition]) => ({
-                            value: key,
-                            label: definition.shortName,
-                            tooltip: definition.description,
-                            'data-attr': `math-${key}-${index}`,
-                        }))}
+                        options={Object.entries(PROPERTY_MATH_DEFINITIONS)
+                            .filter(([key]) => {
+                                if (undefined === onlyPropertyMathDefinitions) {
+                                    return true
+                                }
+                                return onlyPropertyMathDefinitions.includes(key)
+                            })
+                            .map(([key, definition]) => ({
+                                value: key,
+                                label: definition.shortName,
+                                tooltip: definition.description,
+                                'data-attr': `math-${key}-${index}`,
+                            }))}
                         onClick={(e) => e.stopPropagation()}
                         size="small"
                         dropdownMatchSelectWidth={false}
diff --git a/posthog/hogql_queries/experiments/experiment_trends_query_runner.py b/posthog/hogql_queries/experiments/experiment_trends_query_runner.py
index f43c7c1998a82..6cf76b4c5b4e7 100644
--- a/posthog/hogql_queries/experiments/experiment_trends_query_runner.py
+++ b/posthog/hogql_queries/experiments/experiment_trends_query_runner.py
@@ -38,7 +38,6 @@
     ExperimentTrendsQueryResponse,
     ExperimentVariantTrendsBaseStats,
     DateRange,
-    PropertyMathType,
     PropertyOperator,
     TrendsFilter,
     TrendsQuery,
@@ -128,15 +127,6 @@ def _prepare_count_query(self) -> TrendsQuery:
         """
         prepared_count_query = TrendsQuery(**self.query.count_query.model_dump())
 
-        uses_math_aggregation = self._uses_math_aggregation_by_user_or_property_value(prepared_count_query)
-
-        # :TRICKY: for `avg` aggregation, use `sum` data as an approximation
-        if prepared_count_query.series[0].math == PropertyMathType.AVG:
-            prepared_count_query.series[0].math = PropertyMathType.SUM
-        # TODO: revisit this; using the count data for the remaining aggregation types is likely wrong
-        elif uses_math_aggregation:
-            prepared_count_query.series[0].math = None
-
         prepared_count_query.trendsFilter = TrendsFilter(display=ChartDisplayType.ACTIONS_LINE_GRAPH_CUMULATIVE)
         prepared_count_query.dateRange = self._get_date_range()
         if self._is_data_warehouse_query(prepared_count_query):
diff --git a/posthog/hogql_queries/experiments/test/test_experiment_trends_query_runner.py b/posthog/hogql_queries/experiments/test/test_experiment_trends_query_runner.py
index 69cfc5720e009..0d3b37eeedc77 100644
--- a/posthog/hogql_queries/experiments/test/test_experiment_trends_query_runner.py
+++ b/posthog/hogql_queries/experiments/test/test_experiment_trends_query_runner.py
@@ -1250,7 +1250,7 @@ def test_query_runner_with_avg_math(self):
         flush_persons_and_events()
 
         prepared_count_query = query_runner.prepared_count_query
-        self.assertEqual(prepared_count_query.series[0].math, "sum")
+        self.assertEqual(prepared_count_query.series[0].math, "avg")
 
         result = query_runner.calculate()
         trend_result = cast(ExperimentTrendsQueryResponse, result)
@@ -1363,7 +1363,7 @@ def test_query_runner_with_avg_math_v2_stats(self):
         flush_persons_and_events()
 
         prepared_count_query = query_runner.prepared_count_query
-        self.assertEqual(prepared_count_query.series[0].math, "sum")
+        self.assertEqual(prepared_count_query.series[0].math, "avg")
 
         result = query_runner.calculate()
         trend_result = cast(ExperimentTrendsQueryResponse, result)
@@ -1640,221 +1640,6 @@ def test_query_runner_standard_flow_v2_stats(self):
         self.assertEqual(test_variant.count, 5.0)
         self.assertEqual(test_variant.exposure, 1.0)
 
-    @freeze_time("2020-01-01T12:00:00Z")
-    def test_query_runner_property_math_sum(self):
-        self._test_query_runner_property_math(
-            math="sum",
-            expected_control={
-                "count": 10,
-                "absolute_exposure": 5,
-                "data": [0.0, 0.0, 1.0, 3.0, 6.0, 10.0, 10.0, 10.0, 10.0, 10.0, 10.0, 10.0, 10.0, 10.0, 10.0],
-            },
-            expected_test={
-                "count": 90,
-                "absolute_exposure": 10,
-                "data": [0.0, 0.0, 2.0, 6.0, 12.0, 20.0, 30.0, 42.0, 56.0, 72.0, 90.0, 90.0, 90.0, 90.0, 90.0],
-            },
-        )
-
-    @freeze_time("2020-01-01T12:00:00Z")
-    def test_query_runner_property_math_avg(self):
-        self._test_query_runner_property_math(
-            math="avg",
-            expected_control={
-                "count": 10,
-                "absolute_exposure": 5,
-                "data": [0.0, 0.0, 1.0, 3.0, 6.0, 10.0, 10.0, 10.0, 10.0, 10.0, 10.0, 10.0, 10.0, 10.0, 10.0],
-            },
-            expected_test={
-                "count": 90,
-                "absolute_exposure": 10,
-                "data": [0.0, 0.0, 2.0, 6.0, 12.0, 20.0, 30.0, 42.0, 56.0, 72.0, 90.0, 90.0, 90.0, 90.0, 90.0],
-            },
-        )
-
-    @freeze_time("2020-01-01T12:00:00Z")
-    def test_query_runner_property_math_min(self):
-        self._test_query_runner_property_math(
-            math="min",
-            expected_control={
-                "count": 5,
-                "absolute_exposure": 5,
-                "data": [0.0, 1.0, 2.0, 3.0, 4.0, 5.0, 5.0, 5.0, 5.0, 5.0, 5.0, 5.0, 5.0, 5.0, 5.0],
-            },
-            expected_test={
-                "count": 10,
-                "absolute_exposure": 10,
-                "data": [0.0, 1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 10.0, 10.0, 10.0, 10.0],
-            },
-        )
-
-    @freeze_time("2020-01-01T12:00:00Z")
-    def test_query_runner_property_math_max(self):
-        self._test_query_runner_property_math(
-            math="max",
-            expected_control={
-                "count": 5,
-                "absolute_exposure": 5,
-                "data": [0.0, 1.0, 2.0, 3.0, 4.0, 5.0, 5.0, 5.0, 5.0, 5.0, 5.0, 5.0, 5.0, 5.0, 5.0],
-            },
-            expected_test={
-                "count": 10,
-                "absolute_exposure": 10,
-                "data": [0.0, 1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 10.0, 10.0, 10.0, 10.0],
-            },
-        )
-
-    @freeze_time("2020-01-01T12:00:00Z")
-    def test_query_runner_property_math_median(self):
-        self._test_query_runner_property_math(
-            math="median",
-            expected_control={
-                "count": 5,
-                "absolute_exposure": 5,
-                "data": [0.0, 1.0, 2.0, 3.0, 4.0, 5.0, 5.0, 5.0, 5.0, 5.0, 5.0, 5.0, 5.0, 5.0, 5.0],
-            },
-            expected_test={
-                "count": 10,
-                "absolute_exposure": 10,
-                "data": [0.0, 1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 10.0, 10.0, 10.0, 10.0],
-            },
-        )
-
-    @freeze_time("2020-01-01T12:00:00Z")
-    def test_query_runner_property_math_p90(self):
-        self._test_query_runner_property_math(
-            math="p90",
-            expected_control={
-                "count": 5,
-                "absolute_exposure": 5,
-                "data": [0.0, 1.0, 2.0, 3.0, 4.0, 5.0, 5.0, 5.0, 5.0, 5.0, 5.0, 5.0, 5.0, 5.0, 5.0],
-            },
-            expected_test={
-                "count": 10,
-                "absolute_exposure": 10,
-                "data": [0.0, 1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 10.0, 10.0, 10.0, 10.0],
-            },
-        )
-
-    @freeze_time("2020-01-01T12:00:00Z")
-    def test_query_runner_property_math_p95(self):
-        self._test_query_runner_property_math(
-            math="p95",
-            expected_control={
-                "count": 5,
-                "absolute_exposure": 5,
-                "data": [0.0, 1.0, 2.0, 3.0, 4.0, 5.0, 5.0, 5.0, 5.0, 5.0, 5.0, 5.0, 5.0, 5.0, 5.0],
-            },
-            expected_test={
-                "count": 10,
-                "absolute_exposure": 10,
-                "data": [0.0, 1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 10.0, 10.0, 10.0, 10.0],
-            },
-        )
-
-    @freeze_time("2020-01-01T12:00:00Z")
-    def test_query_runner_property_math_p99(self):
-        self._test_query_runner_property_math(
-            math="p99",
-            expected_control={
-                "count": 5,
-                "absolute_exposure": 5,
-                "data": [0.0, 1.0, 2.0, 3.0, 4.0, 5.0, 5.0, 5.0, 5.0, 5.0, 5.0, 5.0, 5.0, 5.0, 5.0],
-            },
-            expected_test={
-                "count": 10,
-                "absolute_exposure": 10,
-                "data": [0.0, 1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 10.0, 10.0, 10.0, 10.0],
-            },
-        )
-
-    def _test_query_runner_property_math(self, math, expected_control, expected_test):
-        feature_flag = self.create_feature_flag()
-        experiment = self.create_experiment(feature_flag=feature_flag, start_date=datetime(2020, 1, 1))
-
-        feature_flag_property = f"$feature/{feature_flag.key}"
-
-        # control values are 0, 1, 2, 3, 4
-        # test values are 0, 2, 4, 6, 8, 10, 12, 14, 16, 18
-
-        # Populate metric + exposure events
-        for variant, count in [("control", 5), ("test", 10)]:
-            for i in range(count):
-                _create_event(
-                    team=self.team,
-                    event="$feature_flag_called",
-                    distinct_id=f"user_{variant}_{i}",
-                    properties={
-                        "$feature_flag_response": variant,
-                        feature_flag_property: variant,
-                        "$feature_flag": feature_flag.key,
-                    },
-                    timestamp=datetime(2020, 1, i + 1),
-                )
-                _create_event(
-                    team=self.team,
-                    event="purchase",
-                    distinct_id=f"user_{variant}_{i}",
-                    properties={
-                        feature_flag_property: variant,
-                        "amount": i * (1 if variant == "control" else 2),
-                    },
-                    timestamp=datetime(2020, 1, i + 2),
-                )
-
-        count_query = TrendsQuery(
-            series=[
-                EventsNode(
-                    event="purchase",
-                    math=math,
-                    math_property="amount",
-                    math_property_type="event_properties",
-                )
-            ]
-        )
-        exposure_query = TrendsQuery(series=[EventsNode(event="$feature_flag_called")])
-        experiment_query = ExperimentTrendsQuery(
-            experiment_id=experiment.id,
-            kind="ExperimentTrendsQuery",
-            count_query=count_query,
-            exposure_query=exposure_query,
-        )
-
-        experiment.metrics = [{"type": "primary", "query": experiment_query.model_dump()}]
-        experiment.save()
-
-        query_runner = ExperimentTrendsQueryRunner(
-            query=ExperimentTrendsQuery(**experiment.metrics[0]["query"]), team=self.team
-        )
-
-        flush_persons_and_events()
-
-        result = query_runner.calculate()
-
-        trend_result = cast(ExperimentTrendsQueryResponse, result)
-
-        self.assertEqual(len(result.variants), 2)
-
-        control_result = next(variant for variant in trend_result.variants if variant.key == "control")
-        test_result = next(variant for variant in trend_result.variants if variant.key == "test")
-
-        control_insight = next(variant for variant in trend_result.insight if variant["breakdown_value"] == "control")
-        test_insight = next(variant for variant in trend_result.insight if variant["breakdown_value"] == "test")
-
-        self.assertEqual(control_result.count, expected_control["count"])
-        self.assertEqual(test_result.count, expected_test["count"])
-        self.assertEqual(control_result.absolute_exposure, expected_control["absolute_exposure"])
-        self.assertEqual(test_result.absolute_exposure, expected_test["absolute_exposure"])
-
-        self.assertEqual(
-            control_insight["data"],
-            expected_control["data"],
-        )
-        self.assertEqual(
-            test_insight["data"],
-            expected_test["data"],
-        )
-
     @freeze_time("2020-01-01T12:00:00Z")
     def test_validate_event_variants_no_events(self):
         feature_flag = self.create_feature_flag()

From b9099ec2ceba196daae09caa3ed91744b016cde9 Mon Sep 17 00:00:00 2001
From: Eric Duong <eric@posthog.com>
Date: Mon, 23 Dec 2024 14:23:00 -0500
Subject: [PATCH 12/15] chore(import-v2): enable v2 sql for allowlist (#27136)

---
 .../data_imports/workflow_activities/import_data_sync.py    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/posthog/temporal/data_imports/workflow_activities/import_data_sync.py b/posthog/temporal/data_imports/workflow_activities/import_data_sync.py
index 0c51c8db81fcf..2e53da704554a 100644
--- a/posthog/temporal/data_imports/workflow_activities/import_data_sync.py
+++ b/posthog/temporal/data_imports/workflow_activities/import_data_sync.py
@@ -17,7 +17,7 @@
 
 from posthog.temporal.data_imports.pipelines.pipeline.pipeline import PipelineNonDLT
 from posthog.temporal.data_imports.pipelines.pipeline_sync import DataImportPipelineSync, PipelineInputs
-from posthog.temporal.data_imports.util import is_posthog_team
+from posthog.temporal.data_imports.util import is_posthog_team, is_enabled_for_team
 from posthog.warehouse.models import (
     ExternalDataJob,
     ExternalDataSource,
@@ -164,7 +164,9 @@ def import_data_activity_sync(inputs: ImportDataActivityInputs):
             ExternalDataSource.Type.MYSQL,
             ExternalDataSource.Type.MSSQL,
         ]:
-            if is_posthog_team(inputs.team_id):
+            if is_posthog_team(inputs.team_id) or (
+                settings.TEMPORAL_TASK_QUEUE == DATA_WAREHOUSE_TASK_QUEUE_V2 and is_enabled_for_team(inputs.team_id)
+            ):
                 from posthog.temporal.data_imports.pipelines.sql_database_v2 import sql_source_for_type
             else:
                 from posthog.temporal.data_imports.pipelines.sql_database import sql_source_for_type

From 908938051ef152c6a7785d3ae8f57007dca5b1b0 Mon Sep 17 00:00:00 2001
From: Eric Duong <eric@posthog.com>
Date: Mon, 23 Dec 2024 21:21:44 -0500
Subject: [PATCH 13/15] chore(data-import): handle large integers in json
 (#27141)

---
 .../sql_database_v2/arrow_helpers.py          | 14 ++++++++++--
 .../test/test_arrow_helpers.py                | 22 +++++++++++++++++++
 2 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 posthog/temporal/data_imports/pipelines/sql_database_v2/test/test_arrow_helpers.py

diff --git a/posthog/temporal/data_imports/pipelines/sql_database_v2/arrow_helpers.py b/posthog/temporal/data_imports/pipelines/sql_database_v2/arrow_helpers.py
index 1dbd13a28ec22..03c966491f650 100644
--- a/posthog/temporal/data_imports/pipelines/sql_database_v2/arrow_helpers.py
+++ b/posthog/temporal/data_imports/pipelines/sql_database_v2/arrow_helpers.py
@@ -1,8 +1,9 @@
+import json
 from typing import Any, Optional
 from collections.abc import Sequence
 
 from dlt.common.schema.typing import TTableSchemaColumns
-from dlt.common import logger, json
+from dlt.common import logger, json as orjson
 from dlt.common.configuration import with_config
 from dlt.common.destination import DestinationCapabilitiesContext
 from dlt.common.json import custom_encode, map_nested_in_place
@@ -91,7 +92,7 @@ def row_tuples_to_arrow(rows: Sequence[RowAny], columns: TTableSchemaColumns, tz
             logger.warning(
                 f"Field {field.name} was reflected as JSON type and needs to be serialized back to string to be placed in arrow table. This will slow data extraction down. You should cast JSON field to STRING in your database system ie. by creating and extracting an SQL VIEW that selects with cast."
             )
-            json_str_array = pa.array([None if s is None else json.dumps(s) for s in columnar_known_types[field.name]])
+            json_str_array = pa.array([None if s is None else json_dumps(s) for s in columnar_known_types[field.name]])
             columnar_known_types[field.name] = json_str_array
 
     # If there are unknown type columns, first create a table to infer their types
@@ -139,3 +140,12 @@ def row_tuples_to_arrow(rows: Sequence[RowAny], columns: TTableSchemaColumns, tz
         )
 
     return pa.Table.from_pydict(columnar_known_types, schema=arrow_schema)
+
+
+def json_dumps(obj: Any) -> str:
+    try:
+        return orjson.dumps(obj)
+    except TypeError as e:
+        if str(e) == "Integer exceeds 64-bit range":
+            return json.dumps(obj)
+        raise TypeError(e)
diff --git a/posthog/temporal/data_imports/pipelines/sql_database_v2/test/test_arrow_helpers.py b/posthog/temporal/data_imports/pipelines/sql_database_v2/test/test_arrow_helpers.py
new file mode 100644
index 0000000000000..8f26dd3f18dd6
--- /dev/null
+++ b/posthog/temporal/data_imports/pipelines/sql_database_v2/test/test_arrow_helpers.py
@@ -0,0 +1,22 @@
+import pytest
+import pyarrow as pa
+from posthog.temporal.data_imports.pipelines.sql_database_v2.arrow_helpers import json_dumps
+from dlt.common.json import json
+
+
+def test_handle_large_integers():
+    # Test that orjson raises TypeError for integers outside 64-bit range
+    with pytest.raises(TypeError, match="Integer exceeds 64-bit range"):
+        json.dumps({"a": 2**64})
+
+    with pytest.raises(TypeError, match="Integer exceeds 64-bit range"):
+        json.dumps({"a": -(2**64)})
+
+    json_str_array = pa.array([None if s is None else json_dumps(s) for s in [{"a": 2**64}]])
+
+    loaded = json.loads(json_str_array[0].as_py())
+    assert loaded["a"] == float(2**64)
+
+    json_str_array = pa.array([None if s is None else json_dumps(s) for s in [{"a": -(2**64)}]])
+    loaded = json.loads(json_str_array[0].as_py())
+    assert loaded["a"] == float(-(2**64))

From 47b983a9ba331d54ddcef53b8457bbca5bd2e768 Mon Sep 17 00:00:00 2001
From: Eric Duong <eric@posthog.com>
Date: Tue, 24 Dec 2024 10:02:25 -0500
Subject: [PATCH 14/15] chore(import): sql source v2 for allowlist (#27147)

---
 .../data_imports/workflow_activities/import_data_sync.py      | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/posthog/temporal/data_imports/workflow_activities/import_data_sync.py b/posthog/temporal/data_imports/workflow_activities/import_data_sync.py
index 2e53da704554a..6b960ee967b4b 100644
--- a/posthog/temporal/data_imports/workflow_activities/import_data_sync.py
+++ b/posthog/temporal/data_imports/workflow_activities/import_data_sync.py
@@ -164,9 +164,7 @@ def import_data_activity_sync(inputs: ImportDataActivityInputs):
             ExternalDataSource.Type.MYSQL,
             ExternalDataSource.Type.MSSQL,
         ]:
-            if is_posthog_team(inputs.team_id) or (
-                settings.TEMPORAL_TASK_QUEUE == DATA_WAREHOUSE_TASK_QUEUE_V2 and is_enabled_for_team(inputs.team_id)
-            ):
+            if is_posthog_team(inputs.team_id) or is_enabled_for_team(inputs.team_id):
                 from posthog.temporal.data_imports.pipelines.sql_database_v2 import sql_source_for_type
             else:
                 from posthog.temporal.data_imports.pipelines.sql_database import sql_source_for_type

From 34a4f6baf1e22a724393153e937266684cc7b030 Mon Sep 17 00:00:00 2001
From: Ben White <ben@posthog.com>
Date: Wed, 25 Dec 2024 10:24:06 +0100
Subject: [PATCH 15/15] chore: Remove kafka inspector (#27125)

---
 frontend/src/lib/constants.tsx                |  1 -
 .../SystemStatus/KafkaInspectorTab.tsx        | 50 -----------
 .../scenes/instance/SystemStatus/index.tsx    | 21 +----
 .../SystemStatus/kafkaInspectorLogic.ts       | 39 --------
 .../SystemStatus/systemStatusLogic.ts         |  5 +-
 frontend/src/scenes/scenes.ts                 |  1 -
 frontend/src/scenes/urls.ts                   |  1 -
 posthog/api/__init__.py                       |  2 -
 posthog/api/kafka_inspector.py                | 89 -------------------
 posthog/api/test/test_kafka_inspector.py      | 62 -------------
 10 files changed, 3 insertions(+), 268 deletions(-)
 delete mode 100644 frontend/src/scenes/instance/SystemStatus/KafkaInspectorTab.tsx
 delete mode 100644 frontend/src/scenes/instance/SystemStatus/kafkaInspectorLogic.ts
 delete mode 100644 posthog/api/kafka_inspector.py
 delete mode 100644 posthog/api/test/test_kafka_inspector.py

diff --git a/frontend/src/lib/constants.tsx b/frontend/src/lib/constants.tsx
index f7168483b3e98..148862540ea8a 100644
--- a/frontend/src/lib/constants.tsx
+++ b/frontend/src/lib/constants.tsx
@@ -138,7 +138,6 @@ export const WEBHOOK_SERVICES: Record<string, string> = {
 export const FEATURE_FLAGS = {
     // Experiments / beta features
     FUNNELS_CUE_OPT_OUT: 'funnels-cue-opt-out-7301', // owner: @neilkakkar
-    KAFKA_INSPECTOR: 'kafka-inspector', // owner: @yakkomajuri
     HISTORICAL_EXPORTS_V2: 'historical-exports-v2', // owner @macobo
     INGESTION_WARNINGS_ENABLED: 'ingestion-warnings-enabled', // owner: @tiina303
     SESSION_RESET_ON_LOAD: 'session-reset-on-load', // owner: @benjackwhite
diff --git a/frontend/src/scenes/instance/SystemStatus/KafkaInspectorTab.tsx b/frontend/src/scenes/instance/SystemStatus/KafkaInspectorTab.tsx
deleted file mode 100644
index 4c13d01457827..0000000000000
--- a/frontend/src/scenes/instance/SystemStatus/KafkaInspectorTab.tsx
+++ /dev/null
@@ -1,50 +0,0 @@
-import { LemonButton, LemonDivider } from '@posthog/lemon-ui'
-import { useValues } from 'kea'
-import { Field, Form } from 'kea-forms'
-import { CodeSnippet, Language } from 'lib/components/CodeSnippet'
-import { LemonInput } from 'lib/lemon-ui/LemonInput/LemonInput'
-
-import { kafkaInspectorLogic } from './kafkaInspectorLogic'
-
-export function KafkaInspectorTab(): JSX.Element {
-    const { kafkaMessage } = useValues(kafkaInspectorLogic)
-
-    return (
-        <div>
-            <h3 className="l3 mt-4">Kafka Inspector</h3>
-            <div className="mb-4">Debug Kafka messages using the inspector tool.</div>
-            <LemonDivider className="my-4" />
-            <section>
-                <div className="flex mb-3">
-                    <Form logic={kafkaInspectorLogic} formKey="fetchKafkaMessage" enableFormOnSubmit>
-                        <div className="grid grid-cols-12 gap-4">
-                            <div className="col-span-4">
-                                <Field name="topic">
-                                    <LemonInput size="small" placeholder="Topic" />
-                                </Field>
-                            </div>
-                            <div className="col-span-2">
-                                <Field name="partition">
-                                    <LemonInput size="small" placeholder="Partition" type="number" />
-                                </Field>
-                            </div>
-                            <div className="col-span-2">
-                                <Field name="offset">
-                                    <LemonInput size="small" placeholder="Offset" type="number" />
-                                </Field>
-                            </div>
-                            <div className="col-span-3">
-                                <LemonButton data-attr="fetch-kafka-message-submit-button" type="primary">
-                                    Fetch Message
-                                </LemonButton>
-                            </div>
-                        </div>
-                    </Form>
-                </div>
-            </section>
-            <CodeSnippet language={Language.JSON}>
-                {kafkaMessage ? JSON.stringify(kafkaMessage, null, 4) : '\n'}
-            </CodeSnippet>
-        </div>
-    )
-}
diff --git a/frontend/src/scenes/instance/SystemStatus/index.tsx b/frontend/src/scenes/instance/SystemStatus/index.tsx
index a9bba3c522dbd..56e8302485fa8 100644
--- a/frontend/src/scenes/instance/SystemStatus/index.tsx
+++ b/frontend/src/scenes/instance/SystemStatus/index.tsx
@@ -4,11 +4,9 @@ import { IconInfo } from '@posthog/icons'
 import { LemonBanner, Link } from '@posthog/lemon-ui'
 import { useActions, useValues } from 'kea'
 import { PageHeader } from 'lib/components/PageHeader'
-import { FEATURE_FLAGS } from 'lib/constants'
 import { LemonTab, LemonTabs } from 'lib/lemon-ui/LemonTabs'
 import { LemonTag } from 'lib/lemon-ui/LemonTag/LemonTag'
 import { Tooltip } from 'lib/lemon-ui/Tooltip'
-import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
 import { InternalMetricsTab } from 'scenes/instance/SystemStatus/InternalMetricsTab'
 import { OverviewTab } from 'scenes/instance/SystemStatus/OverviewTab'
 import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
@@ -16,7 +14,6 @@ import { SceneExport } from 'scenes/sceneTypes'
 import { userLogic } from 'scenes/userLogic'
 
 import { InstanceConfigTab } from './InstanceConfigTab'
-import { KafkaInspectorTab } from './KafkaInspectorTab'
 import { StaffUsersTab } from './StaffUsersTab'
 import { InstanceStatusTabName, systemStatusLogic } from './systemStatusLogic'
 
@@ -30,7 +27,6 @@ export function SystemStatus(): JSX.Element {
     const { setTab } = useActions(systemStatusLogic)
     const { preflight, siteUrlMisconfigured } = useValues(preflightLogic)
     const { user } = useValues(userLogic)
-    const { featureFlags } = useValues(featureFlagLogic)
 
     let tabs = [
         {
@@ -58,7 +54,7 @@ export function SystemStatus(): JSX.Element {
                 label: (
                     <>
                         Settings{' '}
-                        <LemonTag type="warning" className="uppercase ml-1">
+                        <LemonTag type="warning" className="ml-1 uppercase">
                             Beta
                         </LemonTag>
                     </>
@@ -71,21 +67,6 @@ export function SystemStatus(): JSX.Element {
                 content: <StaffUsersTab />,
             },
         ])
-
-        if (featureFlags[FEATURE_FLAGS.KAFKA_INSPECTOR]) {
-            tabs.push({
-                key: 'kafka_inspector',
-                label: (
-                    <>
-                        Kafka Inspector{' '}
-                        <LemonTag type="warning" className="uppercase ml-1">
-                            Beta
-                        </LemonTag>
-                    </>
-                ),
-                content: <KafkaInspectorTab />,
-            })
-        }
     }
 
     return (
diff --git a/frontend/src/scenes/instance/SystemStatus/kafkaInspectorLogic.ts b/frontend/src/scenes/instance/SystemStatus/kafkaInspectorLogic.ts
deleted file mode 100644
index 3fcb9422d906c..0000000000000
--- a/frontend/src/scenes/instance/SystemStatus/kafkaInspectorLogic.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import { actions, kea, path } from 'kea'
-import { forms } from 'kea-forms'
-import { loaders } from 'kea-loaders'
-import api from 'lib/api'
-
-import type { kafkaInspectorLogicType } from './kafkaInspectorLogicType'
-export interface KafkaMessage {
-    topic: string
-    partition: number
-    offset: number
-    timestamp: number
-    key: string
-    value: Record<string, any> | string
-}
-
-export const kafkaInspectorLogic = kea<kafkaInspectorLogicType>([
-    path(['scenes', 'instance', 'SystemStatus', 'kafkaInspectorLogic']),
-    actions({
-        fetchKafkaMessage: (topic: string, partition: number, offset: number) => ({ topic, partition, offset }),
-    }),
-    loaders({
-        kafkaMessage: [
-            null as KafkaMessage | null,
-            {
-                fetchKafkaMessage: async ({ topic, partition, offset }) => {
-                    return await api.create('api/kafka_inspector/fetch_message', { topic, partition, offset })
-                },
-            },
-        ],
-    }),
-    forms(({ actions }) => ({
-        fetchKafkaMessage: {
-            defaults: { topic: 'clickhouse_events_json', partition: 0, offset: 0 },
-            submit: ({ topic, partition, offset }: { topic: string; partition: number; offset: number }) => {
-                actions.fetchKafkaMessage(topic, Number(partition), Number(offset))
-            },
-        },
-    })),
-])
diff --git a/frontend/src/scenes/instance/SystemStatus/systemStatusLogic.ts b/frontend/src/scenes/instance/SystemStatus/systemStatusLogic.ts
index 5ee7e0b6e3c97..7bfaa40093c80 100644
--- a/frontend/src/scenes/instance/SystemStatus/systemStatusLogic.ts
+++ b/frontend/src/scenes/instance/SystemStatus/systemStatusLogic.ts
@@ -18,7 +18,7 @@ export enum ConfigMode {
     Saving = 'saving',
 }
 
-export type InstanceStatusTabName = 'overview' | 'metrics' | 'settings' | 'staff_users' | 'kafka_inspector'
+export type InstanceStatusTabName = 'overview' | 'metrics' | 'settings' | 'staff_users'
 
 /**
  * We allow the specific instance settings that can be edited via the /instance/status page.
@@ -196,8 +196,7 @@ export const systemStatusLogic = kea<systemStatusLogicType>([
     })),
     urlToAction(({ actions, values }) => ({
         '/instance(/:tab)': ({ tab }: { tab?: InstanceStatusTabName }) => {
-            const currentTab =
-                tab && ['metrics', 'settings', 'staff_users', 'kafka_inspector'].includes(tab) ? tab : 'overview'
+            const currentTab = tab && ['metrics', 'settings', 'staff_users'].includes(tab) ? tab : 'overview'
             if (currentTab !== values.tab) {
                 actions.setTab(currentTab)
             }
diff --git a/frontend/src/scenes/scenes.ts b/frontend/src/scenes/scenes.ts
index 98990142b8d32..6a3dadf7d5c1e 100644
--- a/frontend/src/scenes/scenes.ts
+++ b/frontend/src/scenes/scenes.ts
@@ -591,7 +591,6 @@ export const routes: Record<string, Scene> = {
     [urls.instanceStatus()]: Scene.SystemStatus,
     [urls.instanceSettings()]: Scene.SystemStatus,
     [urls.instanceStaffUsers()]: Scene.SystemStatus,
-    [urls.instanceKafkaInspector()]: Scene.SystemStatus,
     [urls.instanceMetrics()]: Scene.SystemStatus,
     [urls.asyncMigrations()]: Scene.AsyncMigrations,
     [urls.asyncMigrationsFuture()]: Scene.AsyncMigrations,
diff --git a/frontend/src/scenes/urls.ts b/frontend/src/scenes/urls.ts
index 477064de6497e..183766b86db2b 100644
--- a/frontend/src/scenes/urls.ts
+++ b/frontend/src/scenes/urls.ts
@@ -213,7 +213,6 @@ export const urls = {
     // Self-hosted only
     instanceStatus: (): string => '/instance/status',
     instanceStaffUsers: (): string => '/instance/staff_users',
-    instanceKafkaInspector: (): string => '/instance/kafka_inspector',
     instanceSettings: (): string => '/instance/settings',
     instanceMetrics: (): string => `/instance/metrics`,
     asyncMigrations: (): string => '/instance/async_migrations',
diff --git a/posthog/api/__init__.py b/posthog/api/__init__.py
index 72342189f2764..5ebd759df4e1f 100644
--- a/posthog/api/__init__.py
+++ b/posthog/api/__init__.py
@@ -40,7 +40,6 @@
     instance_settings,
     instance_status,
     integration,
-    kafka_inspector,
     notebook,
     organization,
     organization_domain,
@@ -378,7 +377,6 @@ def register_grandfathered_environment_nested_viewset(
 router.register(r"dead_letter_queue", dead_letter_queue.DeadLetterQueueViewSet, "dead_letter_queue")
 router.register(r"async_migrations", async_migration.AsyncMigrationsViewset, "async_migrations")
 router.register(r"instance_settings", instance_settings.InstanceSettingsViewset, "instance_settings")
-router.register(r"kafka_inspector", kafka_inspector.KafkaInspectorViewSet, "kafka_inspector")
 router.register("debug_ch_queries/", debug_ch_queries.DebugCHQueries, "debug_ch_queries")
 
 from posthog.api.action import ActionViewSet  # noqa: E402
diff --git a/posthog/api/kafka_inspector.py b/posthog/api/kafka_inspector.py
deleted file mode 100644
index e966c3e374394..0000000000000
--- a/posthog/api/kafka_inspector.py
+++ /dev/null
@@ -1,89 +0,0 @@
-from typing import Union
-
-from kafka import TopicPartition
-from rest_framework import serializers, viewsets
-from posthog.api.utils import action
-from rest_framework.response import Response
-
-from posthog.kafka_client.client import build_kafka_consumer
-from posthog.permissions import IsStaffUser
-
-KAFKA_CONSUMER_TIMEOUT = 1000
-
-
-# the kafka package doesn't expose ConsumerRecord
-class KafkaConsumerRecord:
-    topic: str
-    partition: int
-    offset: int
-    timestamp: int
-    key: str
-    value: Union[dict, str]
-
-    def __init__(self, topic, partition, offset, timestamp, key, value):
-        self.topic = topic
-        self.partition = partition
-        self.offset = offset
-        self.value = value
-        self.timestamp = timestamp
-        self.key = key
-
-
-class KafkaMessageSerializer(serializers.Serializer):
-    topic = serializers.CharField(read_only=True)
-    partition = serializers.IntegerField(read_only=True)
-    offset = serializers.IntegerField(read_only=True)
-    timestamp = serializers.IntegerField(read_only=True)
-    key = serializers.CharField(read_only=True)
-    value = serializers.JSONField(read_only=True)
-
-
-class KafkaInspectorViewSet(viewsets.ViewSet):
-    permission_classes = [IsStaffUser]
-
-    @action(methods=["POST"], detail=False)
-    def fetch_message(self, request):
-        topic = request.data.get("topic", None)
-        partition = request.data.get("partition", None)
-        offset = request.data.get("offset", None)
-
-        if not isinstance(topic, str):
-            return Response({"error": "Invalid topic."}, status=400)
-
-        if not isinstance(partition, int):
-            return Response({"error": "Invalid partition."}, status=400)
-
-        if not isinstance(offset, int):
-            return Response({"error": "Invalid offset."}, status=400)
-
-        try:
-            message = get_kafka_message(topic, partition, offset)
-            serializer = KafkaMessageSerializer(message, context={"request": request})
-            return Response(serializer.data)
-        except AssertionError:
-            return Response({"error": "Invalid partition/offset pair."}, status=400)
-        except StopIteration:
-            return Response(
-                {
-                    "error": f"Error reading message, most likely the consumer timed out after {KAFKA_CONSUMER_TIMEOUT}ms."
-                },
-                status=400,
-            )
-        except Exception as e:
-            return Response({"error": e.__str__()}, status=500)
-
-
-def get_kafka_message(topic: str, partition: int, offset: int) -> KafkaConsumerRecord:
-    consumer = build_kafka_consumer(
-        topic=None,
-        auto_offset_reset="earliest",
-        group_id="kafka-inspector",
-        consumer_timeout_ms=KAFKA_CONSUMER_TIMEOUT,
-    )
-
-    consumer.assign([TopicPartition(topic, partition)])
-    consumer.seek(partition=TopicPartition(topic, partition), offset=offset)
-
-    message = next(consumer)
-
-    return message
diff --git a/posthog/api/test/test_kafka_inspector.py b/posthog/api/test/test_kafka_inspector.py
deleted file mode 100644
index b9a02d0464e14..0000000000000
--- a/posthog/api/test/test_kafka_inspector.py
+++ /dev/null
@@ -1,62 +0,0 @@
-import json
-from typing import Union
-from unittest.mock import patch
-
-from rest_framework import status
-
-from posthog.api.kafka_inspector import KafkaConsumerRecord
-from posthog.test.base import APIBaseTest
-
-
-class TestKafkaInspector(APIBaseTest):
-    def setUp(self):
-        super().setUp()
-        self.user.is_staff = True
-        self.user.save()
-
-    def _to_json(self, data: Union[dict, list]) -> str:
-        return json.dumps(data)
-
-    @patch(
-        "posthog.api.kafka_inspector.get_kafka_message",
-        side_effect=lambda _, __, ___: KafkaConsumerRecord("foo", 0, 0, 1650375470233, "k", "v"),
-    )
-    def test_fetch_message(self, _):
-        response = self.client.post(
-            "/api/kafka_inspector/fetch_message",
-            data={"topic": "foo", "partition": 1, "offset": 0},
-        )
-        self.assertEqual(response.status_code, status.HTTP_200_OK)
-        self.assertEqual(
-            response.json(),
-            {
-                "key": "k",
-                "offset": 0,
-                "partition": 0,
-                "timestamp": 1650375470233,
-                "topic": "foo",
-                "value": "v",
-            },
-        )
-
-    def test_fetch_message_invalid_params(self):
-        response = self.client.post(
-            "/api/kafka_inspector/fetch_message",
-            data={"topic": "foo", "partition": "1", "offset": 0},
-        )
-        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
-        self.assertEqual(response.json(), {"error": "Invalid partition."})
-
-        response = self.client.post(
-            "/api/kafka_inspector/fetch_message",
-            data={"topic": 42, "partition": 1, "offset": 0},
-        )
-        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
-        self.assertEqual(response.json(), {"error": "Invalid topic."})
-
-        response = self.client.post(
-            "/api/kafka_inspector/fetch_message",
-            data={"topic": "foo", "partition": 1, "offset": "0"},
-        )
-        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
-        self.assertEqual(response.json(), {"error": "Invalid offset."})