From 42e391d98f05e4aa0417c1a224e7a0f173688292 Mon Sep 17 00:00:00 2001 From: Filipe Cabaco Date: Wed, 21 Jun 2023 22:07:54 +0100 Subject: [PATCH 1/2] fix - Flag cache stats Due to the amount of data sent when stats are enabled we need to flag it per environment This PR adds a new flag called LOGFLARE_CACHE_STATS that determines if we want to enable Cachex stats --- .staging.cacert.key.enc | Bin 1787 -> 1787 bytes .staging.cacert.pem.enc | Bin 1771 -> 1771 bytes .staging.cert.key.enc | Bin 1786 -> 1786 bytes .staging.cert.pem.enc | Bin 1177 -> 1177 bytes .staging.env.enc | Bin 2431 -> 2457 bytes .template.env | 1 + config/runtime.exs | 3 +- gcloud_staging.json.enc | Bin 2418 -> 2418 bytes lib/logflare/billing/cache.ex | 3 +- lib/logflare/context_cache.ex | 3 +- lib/logflare/logs/log_events_cache.ex | 4 ++- lib/logflare/logs/rejected_log_events.ex | 3 +- lib/logflare/pubsub_rates/cache.ex | 3 +- lib/logflare/source_schemas/cache.ex | 3 +- lib/logflare/sources/cache.ex | 3 +- lib/logflare/users/cache.ex | 3 +- lib/telemetry.ex | 34 +++++++++++++++-------- 17 files changed, 43 insertions(+), 20 deletions(-) diff --git a/.staging.cacert.key.enc b/.staging.cacert.key.enc index bb77e50fe8024f6e533862dada30aa33c0a788e2..c26daae2fbb6de5de2e76ec9a6c82bab85c5bb06 100644 GIT binary patch literal 1787 zcmV_@9j^gE-~8MBto2ztuD-)V3z4oJYnn>uie~M74oIWoaanM*5wlo#|%ElgsKz%2Xzz z)R15JHcU(0>I?N9lAgXm0Qhlhoc+wK z0(IpqZgh@T_Z~e2VROyf^1zc8Y)QkWa94tC=}1Oto}#XRVbTW$Ti-DQsw&Qoto??IA6*3x4cWg ze7oABT&?+*`uA2bjht+h77hE|%^N?CalKu%Y0fDc5YUZV2BTC=G-^6ple&m zluU94zCGgqt^hK^;fmudibjwj)29{T!sJbza~>J}ND>h&z2o(idaR3oQhP&n?>V0q zMmZLgugtsQc{Cv2>@7E-1jDQp}B-={)ud_nUOw$1d~<}6FRUr4tjJle;F^%lupgYK-9-GqEG@VA{e2=s(sob1H+84k z&TZsJwoh`Zb6!YnNs6r#k!}Tjnt5I^7sitgp;E@YGuq_bYIA}@joBqyw{f*P3}C?~ zG642&5y3BW7P3Gi2YVaB9B4K@p$Wg47x38Lh8`@%{Km&}N#VkvL(d8$<{iL1YHP{v z+J^D+{F!n*LUojMWi{m4K8;1O!Swt2U0)Y=fKBlkb56aC<*mLo)$g4UzAcOI8#g1)$;>K-!#X>{Mfo+{#i?;g60&6O^^M;b+`yCZSohKMEgVqD_wj9Q-OV3yFzI0^P$Vn_x zKPHhgMEZnRKIl0@;~00gp3sZ%s<4Rh0Un6DjQVBQ1w@)UszJ-$lO1Gas^q#m*=p*j zr2}o19za_p^Vn>g%16k8q*z|8{ms9~z7ygg2ONjsLSln3t6h_Mfz$CksB6CUJM)o% z)^)tWtFKFNJ+CXhdH&AIef0nKBr$@__qGqYG%+VIW0?b2G(rbDNK7>$SN*%Fhy6WglFrpv$)zKzfaPG>ks2 zKNUz~fjKHMbSR=oz7)NhPUdO1&O7W5B)nOKcjljQ7FQPZt4vK+2)1tAp%c*K-%u-_ zDYT)6AD`-oO|_h&TxE-rEI?%7E`uCgM2LMcP&Bz#k%H%7w_<>uJiPWka1O$&r}J{* zA}#b@Yt3Mvpx4W1xfo9#BPme%DeU)g*vKU{6I4TQdzQO7MHoas5UL-r$-Y`+0bfbm zhE4+-UC*<{y4Ixywr*jeqW(j{aWTcKkT7`JpwK-54xY^U-W{e|fEFYr#vA9dqzgyX d^iDx69I4Vaj8UH*qSgpM9Xmbsu=lcFf`|YB literal 1787 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 NMt;M>k;nPRtqvoJd#(Tg literal 1771 zcmVB~YA?)J?HU3FNx*Ayst?)a;;8=S5{qt!G|(yy=Dx%1^79G%6H=f2fX~=D@;a&6 zXnuL61R)1qH{wZh^!KRfblm~#g(8vI=ZUbl^_YqQkiWgjU^17G31(o`&t3j z>F(iw96kp}M$+9p&ORL?&~{n0nuliQ<&AZ&G@|I6!Q%qYR#?zQ%DBBg`5b81w)Wgf#T%$PhjgxN?XX}yhZNp_x^a7(V1vL$+t4k_L&;lN#2I;_qy zqrWPco?9Qs905U^QFi~-?vQYBb*YANbtBF-m<2*6{P#eT%^8$|R;RUbs3@v>I)7uK z{;><2J~2|u-67-ATnBD$2^)&LZnWGvV9TmmFZNsOGws3gC78gWQhC+ASpf1W(K; zOnyf+<(aYj3PM!G{hxUCH@!@o#6>~hDrq`wcj#0@r@cnRZ)AL({-lEU2W)dpHyLQB zxv83rW)-Ni8!W_DPKkjrgw~{swvqv)V4Oe*N%rHt)K{RR9nRyI;LINz8~)>n?{;uO zVEX1(d~t7l$$-3eS(-ei?QNDcdx?SjFjoUIK!1im8IA@rdx8q_O*b%*UJab5N@i+h6r#8TY%iHYkLFidMjHcb~P>gq+ z!*}QMaQnocx!+`hkd6z$6ZBBmpCS{lWe;tWDYXRzY1qV&==%kzux(}_> zjeTK(%9zX_>&w<`Ss5W$6gYPwh1w#OXyyV1Sh1)m-33hyv1iy+G?!{Ee`yo^t^c=P z6%Gnxy;g=~e$~x%w&6Q%6boZCwzwpJ2V1a%;Co%UBrr~6$dEnaoPqT#%B1E&j!Hc* zNdPOZNEAL&M-jIlN6!jXj3ueZq$DMd5$vz6VCLi@OrM?>L539S4Y=a1kLny*d6IqT zvY(94zk_MUwV3&Yfxk4%G+!OW-!Y{b@tX|pl3MhWS-?zuw3t1lxBpc=2}*13sxWc` zK~V(0vgRfB4WBF=k0(z>rNf9nx;lwX5<1y`R21M#^8q94(gLI=L`0X#CDpcn%WRH9 zrV0JQ6A30!)IUHUq`NP;TbFT=Sl69>mo&O}!jrVY3nqD0CeaW6_@Z;Ax8A(Xn=s?U zmk~ojj7Nu-APgF?TJRp8ML3(|ny9?JsP@rd{4Kg17@UR)E=J3-Li2~ zY}fH-F@^1e_V0N@94Z*VAFl>XEl;FA?00!Um&M)-oBFu8tp|edkeIfr==8&?SQz!c zhw_%YSwW7KVZ??9WsUdI)280SEwWcED+d#es*iQPMv0l)0{44HE$a#T&gGi-Zid@q zx!g-7BO(nTjJAc6ohkji-xoKQ!z!Vagxp4ZYJx6@-fyYO>IOUBq7}LRdaW}H#JI?{ z_jB2dHfqryAb0SIQ}*rE#gth0OmLZcB*`PB@~U?euNwXaA#OIY6^bI_xZFcAClCoY zkTJRj#@V*Qd3tCQWX7Cmf=^0N_xJIHe!;D@puqe?D@^gA3hSd*1kP&nwEQ|%zTLnx z|DKnOqG@qt<)E9`-}OCwlKw!rUv#i+HB3J=!TAe@lUl>0Ux}dLSOQV0f01ZB7739% z%5oijjmK9N;sKiLO%M4nPLx4#C}~EuDT%+8q3uSTnIMJNYm0~kFxKfp{(%kA`v%7O zN$#eFTt}!nF7+x&r}5X0D#Uaz$rz!MpCw+BslOyEy*QLil?Kkc-Yxh6I*_At+cTl9 Nk~LxyC46-BAf~?)b-w@r diff --git a/.staging.cert.key.enc b/.staging.cert.key.enc index a1cdc122ae6db626ab76d6a75b5c4558e3379009..62a5a52e54b32bd5ed66a8fa1d3f1949028f291c 100644 GIT binary patch literal 1786 zcmV+NDpG3L310t|6owd9vVh{Y#w~*b77iH?!KON2LGZM65s z00hpR7c!_MJjU*|SS*MZ!S4fUE`coDDI)`Z02(xPqBHm!oEpY-IjDiAk3N2!F`6b? z<}ThKjbFd^xKad+9h-2zYokiE*sNV&%o$g)9HSLNrd_iY7vJc2 zqsp#iEUDtbLqW=8vOR{_d8*ILhIyf!l;z#?Juks%x#WUrim?fZVh>c6w1K5SVVufA43WPbZwerSu}P9p6YQB1qsob*UK zl?7F>jAPx3D&+5Ds8JFiroGc8Bc%d3ljiv2cOUb-tBCZ>4Ux03boxJ>Uv=G(RrTmb ztbWy((pIK`btfh_%EmGXvKar0zUr4D1ivwj>aC+^JJm9Re4v)-0A;WvxF&G-wo&K! zXAlRYB#KA)TS`knWPM+p%w&u&t)1r!b&KoKW;C~v9$Gm7U$_i8m?Ts7S5#mG9x*uS zLN1lPR5$#a^&NaM!J*AvLzapPoE-3YgZ%H_u*xd)Y1YO#Jxe=f5in%siU$31(2k(i z*Bt(P!qM3CU57fM*&L*%<35?A8GR9TgxVvGo0o%-vVG4z199ejzPpGT#u&+r8Qg^H z`Rs9`J*`2PaQ^g5(eSjBR;gadpAWd6;X9L;Gf_CWD!ttDtxOwNup{MM&Yt8y11fNQ zcY6|9Ck#92AIeW}4oeH>B?f&SY_jc;iO9ww^(`o^G7Iql_W|PHPVff|3U6fZRVhV? zZ+TFe1?3-=o)aO+RbGxM1*=$jz3*mz4i|8#MRtf92Qb$kHZGk=(Rw{Wtsi4s^aS4u zx@`sdEK~Veij^b`yj)ZnmrpHgZ2@(gxzD8C?3GOuC)?iGwP#14*A<-{vW7z8Rpsp! z#gGci=4)cdc9Oaqu_#lmeF{?*qByub*=%~*EU1hrd|$FWv$EGy=9?;Ye-PgJ9FM5_ z2<&fJMF0NrQ&lxTr5)A=)u2v}U8cuwDB!g3So_n)L*($@bfgGn6Eigd9xc6LxH1qCzwr|pr7Dfj>vHx7~a0|txH za*(@rH0qUP^vUtZKb!kY9na#~dBer44M-S%54}E2wAi2dje|pjFLaZ6n5lM&o2V?G zSu-wTXw~J?u9EkK+yrCXDF$Cv17-QCF;6mDW&^D|e-{HKo4(b__l$`FlUoZq zAGMRNv=A8@HVO+AflVMlcevFPtHDjP-G3H&a-S9REQrwvRtwczw2{RPrdNzl5Z&g; z$e2t+Mtv-Zo_=rqSbx!+^0yQ(1sYUB;J?APq)V4w3sqpp5ng=jg7TpuvO=;-zi@8u?O%J}bqo`J&?VWDi;JxJ$bj zz|ORM^xtRU-tSFNU*bE?F;8C~VD&f}oyVa|PCCj;BT61mDudoz9ZtS*8kZ ccLmWXC~(ZmkRX0iDJFkSM8$>OU{E~ztZ_zi7ytkO literal 1786 zcmVRuDfqj)k=(Na1G<)3Jf$N}u`a$@p@k*)|s3Vf6hoTNS ze%etO^fI)EOeQ0YaM^*fAr7q8^iphl#3{*9$jtt$+0w>9JLWARg>Bw95}fW80z<-u z{6@*)!8df)*YusspUxb?g&03Xb0;|J7=>wMM0i+TiD?}}m$034e2F72*eJA8&`d9u zmXA5lNCWYq!`|Fb4vYa`z;wH4;<#{feX3MIKkC6WNjQcCZ5GTgM=PZHEFs7Q6i;lTkzQxaL>53<^zL|H^CD0O(*`X z;=l~ma(z4jFr`__^lz=ZAKX_9il!NKtsrdJ0T4keb2f({Ov-ZZ8&PB&>)`f1vPgbw z6n`hocS^%GE{?_dv*3I>OC4IiY8^n*ZmDlRO-vnj{SO&|0P7Eb{9|H#UX11?j+=j( za0IAw^rt3Eb|X4;jICj;{|y~RnDD0EQtA1p%UY!vlX%Y)j$|orY3Bk?Vm~3Hz+p*E7=g}S#DM8XLG!A95UG#s@dTqwd)amT*5 z32+j7Zo*AScn(Rj$l5snk{iTg zk$+p|n^;d(P#cRN^$W}tJ|N(0(8HX|_)iH`t*Cm)Xals8??x`@@V{0k?au__1qdY& zt?6voE$srni{sC0*@JN$y@G7XZ^tct&(DS!5|MuqW@=y!e3^JIU$+tM?|iVyjL7aw-^&KN@gIpMvB7V`~xH*P8 z@zwhi`$~~S4pm->G)=MZffTDf{88&2TmWsBWZkLSHV3Q!P^HMg7>M|ARc>?8CbqaC zM^;d7G_M;x0L&@>TR+PDHI4K@D4;?pLE`f3(`Q~4l?FP5l3s@syGC{5-=`Jd{cFkp zfD9hbKwZxU|%bbfUh1R3m#>g+T-#8zm`sOQ| zW(>5IYE+d8OCYAY6=t1Z`8hDKPUU;L9`4LFRBJ-zWvfLFy^<3=Eew!|6h|aFESe%J zQ8^Gvn28BWQWSY?8XOsHAXaoa9BDWBz*-;SnsLQ)Y)Igm@ALnW@tkq6#mH-+tj+mv zS+IJgq;L+SHh`Xl^rB-3eyH55^6=FFZrfAZcwG#zyaj(mM`~VH_^w=I-(&Wl>TrEY zGAi0fEZMqZfl*LJQGT8TT~|}IoIzp&u$dB5=)85q1@}CUk2}bPV?=%EMq=pH-j`dO c(4LI|42n;P5My8pgt~hIVEEmM+AOptTPq4~_y7O^ diff --git a/.staging.cert.pem.enc b/.staging.cert.pem.enc index bc700d120c96d714e4ea58737f894085f9fa122e..3875564089a81b37d2368c1ac43966c9c503ea91 100644 GIT binary patch literal 1177 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 literal 2431 zcmV-_34rzrBmjzmMhMxw z7HR*{^_qyGushQ;1qe2yo2cY{&>5el`KWtIpts{V_Vc1){oxsyhX!vxCvd~@`EkZ- zem@thKZ7OtFKiee(StT(gV(LqjB)}F9NFEcaWO=5OKSz<_x=w^8jh0EFAr*a#ST!umR+ z7A49T?hbzSQG8niFY9Vy2zV;*;6`zg966M(DK<&ZCnwSS7UY(d99y8JM}TsFQ)>jC z0%w){+|aMXGZwk&_IXROMOxBE(sV;J9>S>y(z<#VZ5FDq@s#AS7Nr{wE~g%z=pK5H zMuG{5-_^i@)ArSCF8oO;t)BgGc{A-O-j5X;P&+38i;{s?wRrxJ=$$RE)&hY*NwhC6k5J4@L* zr-U4PLn}uops%u%v)Juf;RQ)(1w10sA%s4NG!q8O?d-K(@NOgJ?_h9IZxw^x{p45v zDI*tjGf7?_QeybEHAUS$CrX8GznHJvolw{SoHG_pj$xN(y^nu5c5D7{QuGJWe7DG z5FpRZFPh}{)fyOBH-_|KLzfVKXz^jrtouz8nn=jvzpSX!vcD10{ih&E0bfd8R0Fa| zR2T0x#@STt^SyAyuw{`dK~y4(Fp?vPYuzO|da>jJg7~Wwd^*#ZHCW@ki9H0l!PBUa zFoK`8AnR+B^@7r4S@5L|d#C$e&kNGo+*^ZYb7xQYt{2sRJwS6;!R0Fk%xQ|=2iqo( zb>^8!-K?o&?mi7#Fnj(~Ad->7BA52AOm*X{whZ@0A!YeKL^~Iu7=*xh;UIn(3VjyQ zsE@39E#%VMqyhZOZdc*X7=_t7FJRD0EMc&y&>a1{;e3a-H3MUMI@{hl_)eL^Hmi>W zig?^{skJ-MothRZPQp)iUJ7#6vLCQ8QC+ zGkl7(_led2B#9pPeYuLf(P>0Da=DpJo0Z(B3r6|?$rKjyjyJM-lmpgjnj}VSCq@XF zaz7R!zNAh0M3%1S7*e8cbQ;sgj>+*=#Md1U+{J#x#7L$u2)#t9`t!g9jK22Wk#^j+ zM#T2_pFB&CQL#bA6pNJKpK&8|2&G*8e4!Mfq@O|A;?+}`M9_+{5rPszsl&9^dS(t$ z*DGuyr_c^rfg+jG^D4RMawmBGuJy~SOcu^mKcIg$IrW_L(hnMun`W3930PS_8&z;c zSb?Twut-)BqigQkGyj$71faTLleTURLq3EHD_84tZfM-abM*jR*k5V+Bfqt5m7+#l zzqs?wHX!xWtUdn3PLKPXKQNk`7dm{n#tKnMWljF{&F(1W{Ok8Mq+UgUN$~C;vBIWsi>_Z#Y{syTlJbTeH z^{UhecKxhu6Duyc9=1I~Gd@`1PQE67m%%Uj!K~*71sQpn?N1zqw^5qsC-B2|eGH~W zkf|$P1X;Ab`aWa2Mr+GXiMjEE;=jH`_2K;4wDQ>o z=n_xnh!&lzStr!rkEYOh2DR8^uFtMdtW|9#ktahTNmsE{o(cOvQzrjAV9MC{0>u@< zQ%^Y>(Nees<(fNK4fPPf*%wmCPGJ#P*-_!xZ>CZ;;Y)vedz~(#1x(Xw! zGb-Pn-mWBdVCwxEk&8Bw^ujP=lN{U7rhNZ5J1bwvU-Jf5%;3d(0kX+TtL;A5O=wX( z#}H@Q%*U6)UsbkI%XWV}q>DI4-%*VM&R)gC? zyve=ayV^NZm3*8Vg*+a%5sBv1CE$Owh^qw3)x zBOo!bmK506BUYOJCtvSUQLT7j<<{dip2Lc}zBj-?$EUc3r)yav2>?T&#M?sR`fP&_ x_mnwMeZ{Iym`1;^Jd?o}*@ao4=V0~6{q=igFExsy4_B@30*<;WLKj~LMXzG}!507k diff --git a/.template.env b/.template.env index e39ee6086..2a73a9492 100644 --- a/.template.env +++ b/.template.env @@ -45,3 +45,4 @@ TWILLIO_AUTH_TOKEN= STRIPE_API_KEY= STRIPE_PUBLISHABLE_KEY= LOGFLARE_GRPC_PORT= +LOGFLARE_CACHE_STATS= diff --git a/config/runtime.exs b/config/runtime.exs index 8eb56581a..aaf7d411e 100644 --- a/config/runtime.exs +++ b/config/runtime.exs @@ -11,7 +11,8 @@ config :logflare, config_cat_sdk_key: System.get_env("LOGFLARE_CONFIG_CAT_SDK_KEY"), single_tenant: System.get_env("LOGFLARE_SINGLE_TENANT"), supabase_mode: System.get_env("LOGFLARE_SUPABASE_MODE"), - api_key: System.get_env("LOGFLARE_API_KEY") + api_key: System.get_env("LOGFLARE_API_KEY"), + cache_stats: System.get_env("LOGFLARE_CACHE_STATS", "false") == "true" ] |> filter_nil_kv_pairs.() diff --git a/gcloud_staging.json.enc b/gcloud_staging.json.enc index 64a54e0f9674d1c7ebc2e597e1e4727a7b313dec..9568db07952b492ebbcfde2373d41720f8acb6e5 100644 GIT binary patch literal 2418 zcmV-&361s&Bmj-od1v?uNbFsa;jGtfg6WhEdYF$O>?A0Zer9>BZ-Ch}rK#C6^PLM3m>X9-OYSyU%C ziF%#2C|N78dK|%Ss6vr6!x^3h_^aw1 z%(6nxPpUF{D$u(zyr7#wsstCOqgqNIAY5H_(cFEp=6X7*7*~qU9tB>GbuI%P zT%B)A$XyY)PyB#3ZA^7>eH@!gQ+!oD@t8P}zav|LCIbr#s}g!BJ@0q5eYbP6y;$!+ z*kP+`Iw0E{p9dqNA&4h$(d)>dU#;;aiVR+<&wx6yj|qP;GKd1fv=uV*?_%=CR(!;| z#CXdJ5pU~i(ALNy;kcf_l^W3eJ70$La!<-QLy7-|wkLd~;(!poDA9YKde)0rM@+;i z(K!fTYGszEVn#$X+|Hfx>`P;huIc`D6MkU3_Vo&72A@CmO6<*|?aLI#Lyy~27;5Hg zo)fD{%}Tn)(Kg(Cr)`Z1`K3~lRF}|!Q*J`cM9uxhGclxhq<+*rb>>`^yeYATmU>sF zxm-fjDsZOEG5DSH+DKD_2kb&E7Sqb6b;+hm4)`*+0P?545$mCrpLV~aj)PM)eI33+ zWAv^O!F`&F_HxG}iV>>tX!nAqQVL+aun$lQX_ons3%RA)s?QpFu2t4QG?mQoN5Mjy zbT{IpCZo;3DsCx9tda7B|afFH;$@e#r;hYO&+~3x#Kia zbqG}frV@hS)@I9j-06y`o!LK&zT+p5Zx@r4LN8+^MkduQZ?d;*c!ba(~}gJ220zItLUpsolCkP#GXfg$Xb z$dh)x_+7@8OFg6JD>9&mgF}A5@MsdtCLwo$S#3+?t4;QVq+3)0Qkf&bn#))rQ;d-8 zVZfJJ7&8Qz8_>HQ=VmR&*1Do6}3)+HG!mX7b4>cAuU|h~C{iDz`Nfjf(XJo4zqiMxp^2CET`H7PS;wm z#bXu25qnLJ%4QHO$8+>G9#bZ$l`%urlenuMBjbxq*L$Jg3230=Afr+>`MCjJ6+O4) zPW7_g7gWsy_F2fxc-$yl;UZtyLsQ_sHBFj>a|mc8Y(av1x|u>&6@w0o!l~o8L`!zAAk7a7ft}1Rdi2)F;k7Q{Htkp1T5;z0?_l zYM2)$wOh^7ikLtRIqPyNHfv6T2Ds9*lE2<~K^}Ct^S=XZyl*p}Yx%9ypq7UV8*_-# z)EMpdFhso(S_lUN&pa|QY{}IsDr|@rNZpmLYk@{hw0XvM{Y3FQU}3-*n+SHs6~&;_ z95(=vIWnKmDNlDln_ZEn-W)%~fHf->yEk+k!OGpkhd%5-yPr?IU46zby45N%CK?fux8&2y2Z$_zY`Wx2iN> zvwUBaQ?6dd$0K3a%&8DiH?agm>S<9o_ZEJ!M!`J4&=0)Tem`PDWwAMMg{2FdKm@Qz z?5-Gx(PhGFPt6h8t)R#N2>@?({tokdX`yCMM5j^dWV*F46dz7jBKtw>mh zEAwBi{z)>Gs?=WXJ-$Kza`Xn>pmA_-Zs0gVQPfNCRB@c$Y^&Ve*FG8w7ub3}E$`TA zXAw6U8Kp4aHgnh>3)eQKxaM7@LlwYT+_yRFQL3aY*7tF}HgWEb$Cg~WW9kvX|0+ZV zp!LU^m~N^FgcD0kx8{7N$+`Rlc~EAXw{GJu}&C z@QX(=joV5v1RfIgHYly!?Ggejcj06afJ*0`D$^Cv;kOBdE~TD-3JqotHlf0Gr)>PE z(K(sO>(2qvNdjFu#ec{=@g-0RvMOq}xcHx$(d4?jowPs2H~f;F+*ci7KrUq#W7acF ksp`Jq8b_J?dY7fzT8C~i-I_o0Ai?3(RSQ|^?j_3=iS}NVZU6uP literal 2418 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 - [ - last_value("cachex.#{metric}.purge"), - last_value("cachex.#{metric}.stats"), - last_value("cachex.#{metric}.evictions"), - last_value("cachex.#{metric}.expirations"), - last_value("cachex.#{metric}.operations"), - last_value("cachex.#{metric}.total_heap_size", unit: {:byte, :megabyte}) - ] - end) + if cache_stats? do + Enum.flat_map(@caches, fn {_cache, metric} -> + [ + last_value("cachex.#{metric}.purge"), + last_value("cachex.#{metric}.stats"), + last_value("cachex.#{metric}.evictions"), + last_value("cachex.#{metric}.expirations"), + last_value("cachex.#{metric}.operations"), + last_value("cachex.#{metric}.total_heap_size", unit: {:byte, :megabyte}) + ] + end) + else + [] + end phoenix_metrics = [ summary("phoenix.endpoint.stop.duration", unit: {:native, :millisecond}), @@ -67,7 +73,13 @@ defmodule Logflare.Telemetry do end defp periodic_measurements() do - [{__MODULE__, :cachex_metrics, []}] + cache_stats? = Application.get_env(:logflare, :cache_stats, false) + + if cache_stats? do + [{__MODULE__, :cachex_metrics, []}] + else + [] + end end def cachex_metrics do From 83f3c2448dfe1931aca372a9f539d0da2afdade0 Mon Sep 17 00:00:00 2001 From: Filipe Cabaco Date: Wed, 21 Jun 2023 22:29:49 +0100 Subject: [PATCH 2/2] Bump up version to 1.3.15 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 22122dbf4..92ee6ac2f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.3.14 \ No newline at end of file +1.3.15 \ No newline at end of file