more metrics

llarp/link/utp.cpp

@@ -182,6 +182,9 @@ namespace llarp
       PruneInboundMessages(now);
       m_TXRate = 0;
       m_RXRate = 0;
+      METRICS_DYNAMIC_UPDATE("utp.session.sendq",
+                             RouterID(remoteRC.pubkey).ToString().c_str(),
+                             sendq.size());
     }
 
     /// low level read

llarp/messages/dht_immediate.hpp

@@ -29,6 +29,12 @@ namespace llarp
 
     void
     Clear() override;
+
+    const char*
+    Name() const override
+    {
+      return "DHTImmediate";
+    }
   };
 }  // namespace llarp
 

llarp/messages/discard.hpp

@@ -31,6 +31,12 @@ namespace llarp
     {
     }
 
+    const char*
+    Name() const override
+    {
+      return "Discard";
+    }
+
     bool
     DecodeKey(__attribute__((unused)) const llarp_buffer_t& key,
               __attribute__((unused)) llarp_buffer_t* buf) override

llarp/messages/link_intro.hpp

@@ -44,6 +44,12 @@ namespace llarp
 
     void
     Clear() override;
+
+    const char*
+    Name() const override
+    {
+      return "LinkIntro";
+    }
   };
 }  // namespace llarp
 

llarp/messages/link_message.cpp

@@ -68,10 +68,12 @@ namespace llarp
       }
       // create the message to parse based off message type
       llarp::LogDebug("inbound message ", *strbuf.cur);
+      bool isLIM = false;
       switch(*strbuf.cur)
       {
         case 'i':
           handler->msg = &handler->holder->i;
+          isLIM        = true;
           break;
         case 'd':
           handler->msg = &handler->holder->d;
@@ -91,14 +93,14 @@ namespace llarp
         default:
           return false;
       }
+
+      if(!isLIM)
       {
         const std::string host =
-            handler->from->GetRemoteEndpoint().xtohl().ToString();
-        char buf[16] = "LinkLayerRecv_";
-        buf[14]      = *strbuf.cur;
-        buf[15]      = 0;
-        METRICS_DYNAMIC_INCREMENT(buf, host.c_str());
+            "RX_" + RouterID(handler->from->GetPubKey()).ToString();
+        METRICS_DYNAMIC_INCREMENT(handler->msg->Name(), host.c_str());
       }
+
       handler->msg->session = handler->from;
       handler->firstkey     = false;
       return true;
@@ -116,8 +118,6 @@ namespace llarp
     bool result = false;
     if(msg)
     {
-      const std::string host = from->GetRemoteEndpoint().xtohl().ToString();
-      METRICS_TIME_BLOCK("HandleMessage", host.c_str());
       result = msg->HandleMessage(router);
     }
     Reset();

llarp/messages/link_message.hpp

@@ -30,6 +30,10 @@ namespace llarp
 
     virtual void
     Clear() = 0;
+
+    // the name of this kind of message
+    virtual const char*
+    Name() const = 0;
   };
 
 }  // namespace llarp

llarp/messages/relay.hpp

@@ -31,6 +31,12 @@ namespace llarp
 
     void
     Clear() override;
+    const char*
+
+    Name() const override
+    {
+      return "RelayUpstream";
+    }
   };
 
   struct RelayDownstreamMessage : public ILinkMessage
@@ -53,6 +59,12 @@ namespace llarp
 
     void
     Clear() override;
+
+    const char*
+    Name() const override
+    {
+      return "RelayDownstream";
+    }
   };
 }  // namespace llarp
 

llarp/messages/relay_commit.hpp

@@ -68,6 +68,12 @@ namespace llarp
 
     bool
     AsyncDecrypt(llarp::path::PathContext *context) const;
+
+    const char *
+    Name() const override
+    {
+      return "RelayCommit";
+    }
   };
 }  // namespace llarp
 

llarp/router/router.cpp

@@ -1145,7 +1145,8 @@ namespace llarp
   void
   Router::SendTo(RouterID remote, const ILinkMessage *msg, ILinkLayer *selected)
   {
-    METRICS_TIME_BLOCK("RouterSendTo", remote.ToString().c_str());
+    const std::string remoteName = "TX_" + remote.ToString();
+    METRICS_DYNAMIC_INCREMENT(msg->Name(), remoteName.c_str());
     llarp_buffer_t buf(linkmsg_buffer);
 
     if(!msg->BEncode(&buf))