Merge pull request #4308 from tloncorp/mp/lure-logs

Enable lure flow logging in %grouper
tloncorp · Jan 13, 2025 · d4c5e11 · d4c5e11
2 parents e5f8d9e + fbf8da8
commit d4c5e11
Show file tree

Hide file tree

Showing 8 changed files with 77 additions and 26 deletions.
diff --git a/desk/app/activity.hoon b/desk/app/activity.hoon
@@ -74,6 +74,7 @@
   |_  =bowl:gall
   +*  this  .
       def   ~(. (default-agent this %|) bowl)
+      log   ~(. logs [our.bowl /logs])
       cor   ~(. +> [bowl ~])
   ::
   ++  on-init
@@ -112,7 +113,7 @@
     |=  [=term =tang]
     ^-  (quip card _this)
     :_  this
-    [(log-fail:logs /logs our.bowl (fail-event:logs term tang))]~
+    [(fail:log term tang)]~
   --
 |_  [=bowl:gall cards=(list card)]
 ++  abet  [(flop cards) state]

diff --git a/desk/app/channels-server.hoon b/desk/app/channels-server.hoon
@@ -29,6 +29,7 @@
   |_  =bowl:gall
   +*  this  .
       def   ~(. (default-agent this %|) bowl)
+      log   ~(. logs [our.bowl /logs])
       cor   ~(. +> [bowl ~])
   ++  on-init
     ^-  (quip card _this)
@@ -64,7 +65,7 @@
     |=  [=term =tang]
     ^-  (quip card _this)
     :_  this
-    [(log-fail:logs /logs our.bowl (fail-event:logs term tang))]~
+    [(fail:log term tang)]~
   ::
   ++  on-agent
     |=  [=wire =sign:agent:gall]

diff --git a/desk/app/channels.hoon b/desk/app/channels.hoon
@@ -47,6 +47,7 @@
   |_  =bowl:gall
   +*  this  .
       def   ~(. (default-agent this %|) bowl)
+      log   ~(. logs [our.bowl /logs])
       cor   ~(. +> [bowl ~])
   ++  on-init
     ^-  (quip card _this)
@@ -82,7 +83,7 @@
     |=  [=term =tang]
     ^-  (quip card _this)
     :_  this
-    [(log-fail:logs /logs our.bowl (fail-event:logs term tang))]~
+    [(fail:log term tang)]~
   ::
   ++  on-agent
     |=  [=wire =sign:agent:gall]

diff --git a/desk/app/grouper.hoon b/desk/app/grouper.hoon
@@ -1,8 +1,7 @@
 /-  reel, groups, c=chat, ch=channels
-/+  gj=groups-json, default-agent, verb, dbug
+/+  gj=groups-json, default-agent, verb, logs, dbug
 ::
 |%
-++  dev-mode  |
 ++  enabled-groups  (set cord)
 ++  outstanding-pokes  (set (pair ship cord))
 ++  bite-subscribe
@@ -27,6 +26,7 @@
 |_  =bowl:gall
 +*  this  .
     def   ~(. (default-agent this %.n) bowl)
+    log   ~(. logs [our.bowl /logs])
 ::
 ++  on-init
   :_  this
@@ -138,7 +138,7 @@
     :_  this
     =;  caz=(list card)
       ?~  inviter=(~(get by fields.metadata.bite) 'inviter')
-        ~&("no inviter field for token: {<token.bite>}" ~)
+        ~[(tell:log `token.bite %crit 'inviter field missing' ~)]
       ?.  =((slav %p u.inviter) our.bowl)  ~
       =/  wir=^wire  /dm/(scot %p joiner.bite)
       =/  =dock  [our.bowl %chat]
@@ -149,43 +149,45 @@
         :-  joiner.bite
         [id %add memo [%notice ~] ~]
       =/  =cage  chat-dm-action+!>(`action:dm:c`action)
-      (snoc caz [%pass wir %agent dock %poke cage])
+      =*  dez  %^  tell:log  `token.bite  %info
+               ~[leaf+"{<joiner.bite>} invited to DM"]
+      (snoc [dez caz] [%pass wir %agent dock %poke cage])
     ?~  group=(~(get by fields.metadata.bite) 'group')
-      ~&("no group field for token: {<token.bite>}" ~)
+      ~[(tell:log `token.bite %warn 'group field missing' ~)]
     =/  =flag:groups  (flag:dejs:gj s+u.group)
-    ~?  dev-mode  [bite (~(has in enabled-groups) q.flag)]
     ?.  (~(has in enabled-groups) q.flag)
-      ~&("group lure not enabled: {<flag>}" ~)
-    ~?  dev-mode  'inviting'
+      ~[(tell:log `token.bite %warn 'group {<p.flag>}/{<q.flag>} lure disabled' ~)]
     =/  =invite:groups  [flag joiner.bite]
     =/  prefix  /(scot %p our.bowl)/groups/(scot %da now.bowl)
     ?.  .^(? %gu (weld prefix /$))
-      ~?(dev-mode "groups not running" ~)
+      ~[(tell:log `token.bite %warn '%groups not running' ~)]
     =/  gnat=path  /(scot %p p.flag)/[q.flag]/noun
     ?.  .^(? %gx :(weld prefix /exists gnat))
-      ~?(dev-mode "group doesn't exist" ~)
+      ~[(tell:log `token.bite %warn 'group {<p.flag>}/{<q.flag>} not found' ~)]
     =+  .^(=group:groups %gx :(weld prefix /groups gnat))
-    ~?  dev-mode  cordon.group
     ?+  -.cordon.group  ~
         %open
-      ~?  dev-mode  ['inviting to public' joiner.bite]
+      :-  %^  tell:log  `token.bite  %info
+          ~[leaf+"{<joiner.bite>} invited to public group {<p.flag>}/{<q.flag>}"]
       ~[[%pass /invite %agent [our.bowl %groups] %poke %group-invite !>(invite)]]
     ::
         %shut
-      ~?  dev-mode  ['inviting to private/secret' joiner.bite]
       =/  =action:groups
         :-  flag
         :-  now.bowl
         :-  %cordon
         [%shut [%add-ships %pending (~(gas in *(set ship)) ~[joiner.bite])]]
-      :_  ~
-      [%pass /invite %agent [our.bowl %groups] %poke act:mar:groups !>(action)]
+      :-  %^  tell:log  `token.bite  %info
+          ~[leaf+"{<joiner.bite>} invited to restricted group {<p.flag>}/{<q.flag>}"]
+      ~[[%pass /invite %agent [our.bowl %groups] %poke act:mar:groups !>(action)]]
     ==
   ==
 ::
 ++  on-fail
   |=  [=term =tang]
-  (mean ':sub +on-fail' term tang)
+  ^-  (quip card _this)
+  :_  this
+  [(fail:log (fail-event:logs term tang))]~
 ::
 ++  on-leave
   |=  =path

diff --git a/desk/app/groups.hoon b/desk/app/groups.hoon
@@ -40,6 +40,7 @@
   |_  =bowl:gall
   +*  this  .
       def   ~(. (default-agent this %|) bowl)
+      log   ~(. logs [our.bowl /logs])
       cor   ~(. +> [bowl ~])
   ++  on-init
     ^-  (quip card _this)
@@ -73,7 +74,7 @@
     |=  [=term =tang]
     ^-  (quip card _this)
     :_  this
-    [(log-fail:logs /logs our.bowl (fail-event:logs term tang))]~
+    [(fail:log term tang)]~
   ::
   ++  on-agent
     |=  [=wire =sign:agent:gall]

diff --git a/desk/lib/logs.hoon b/desk/lib/logs.hoon
@@ -1,15 +1,37 @@
 /-  *logs
+=<
+  |_  [our=ship =wire]
+  ::
+  ++  fail
+    |=  [desc=term trace=tang]
+    ^-  card:agent:gall
+    =/  event=$>(%fail log-event)
+      [%fail desc trace]
+    (pass event)
+  ::
+  ++  tell
+    |=  [id=(unit @ta) vol=volume =echo]
+    ^-  card:agent:gall
+    =/  event=$>(%tell log-event)
+      [%tell id vol echo]
+    (pass event)
+  ::
+  ++  pass
+    |=  event=log-event
+    ^-  card:agent:gall
+    [%pass wire %agent [our %logs] %poke log-action+!>([%log event])]
+  --
 |%
 ::
 ++  fail-event
   |=  [=term =tang]
   ^-  $>(%fail log-event)
   [%fail term tang]
 ::
-++  log-fail
-  |=  [=wire our=ship event=$>(%fail log-event)]
-  ^-  card:agent:gall
-  [%pass wire %agent [our %logs] %poke log-action+!>([%log event])]
+++  tell-event
+  |=  [id=(unit @ta) vol=volume =echo]
+  ^-  $>(%tell log-event)
+  [%tell id vol echo]
 ::
 ++  enjs
   =,  format
@@ -34,7 +56,19 @@
       %-  pairs:enjs
       :~  type/s+event-type
           description/s+desc.e
-          stacktrace/(tang crash.e)
+          stacktrace/(tang trace.e)
+      ==
+    ::
+        %tell
+      =-  ?>(?=(%o -.-) -)
+      %-  pairs:enjs
+      ::
+      ::  insert tell id if present
+      =-  ?~  id.e  -
+          [id/s+u.id.e -]
+      :~  type/s+event-type
+          message/(tang echo.e)
+          volume/s+vol.e
       ==
     ==
   --

diff --git a/desk/sur/logs.hoon b/desk/sur/logs.hoon
@@ -1,12 +1,18 @@
 /+  mp=mop-extensions
 ::
 |%
+::  $echo: formatted message
++$  echo  (list tank)
+::  $volume: echo volume
++$  volume  ?(%info %warn %crit)
 ::  $log-event
 ::
 ::  %fail: agent failure
+::  %tell: agent message
 ::
 +$  log-event
-  $%  [%fail desc=term crash=tang]
+  $%  [%fail desc=term trace=tang]
+      [%tell id=(unit @ta) vol=volume =echo]
   ==
 ::
 ::  $log-item: event with timestamp

diff --git a/desk/ted/posthog.hoon b/desk/ted/posthog.hoon
@@ -21,13 +21,18 @@
 =*  log-item  q.u.arg
 ;<  =bowl:strand  bind:m  get-bowl:io
 =/  log-event-json=$>(%o json)  (log-event:enjs:l event.log-item)
+::  retrieve desk hash
+::
+;<  hash=@uv  bind:m  (scry:io @uv %cz q.byk.bowl ~)
+::
 =/  props=json
   :-  %o
   %-  ~(uni by p.log-event-json)
   ^-  (map @t json)
   %-  my
   :~  'distinct_id'^s+(scot %p our.bowl)
       'origin'^s+(spat origin)
+      'hash'^s+(crip ((v-co:co 5) (end [0 25] hash)))
   ==
 =/  event=json
   %-  pairs:enjs:format