From d1c689e5abca4f679a5e2deda34047f7ecd4cd8b Mon Sep 17 00:00:00 2001
From: Dmitriy Ryajov <dryajov@gmail.com>
Date: Tue, 1 Dec 2020 11:34:27 -0600
Subject: [PATCH] adding libp2p tag to logScope (#465)

---
 libp2p/connmanager.nim                  | 2 +-
 libp2p/multistream.nim                  | 2 +-
 libp2p/muxers/mplex/coder.nim           | 2 +-
 libp2p/muxers/mplex/lpchannel.nim       | 2 +-
 libp2p/muxers/mplex/mplex.nim           | 2 +-
 libp2p/muxers/muxer.nim                 | 2 +-
 libp2p/protocols/identify.nim           | 2 +-
 libp2p/protocols/pubsub/floodsub.nim    | 2 +-
 libp2p/protocols/pubsub/gossipsub.nim   | 2 +-
 libp2p/protocols/pubsub/gossipsub10.nim | 2 +-
 libp2p/protocols/pubsub/pubsub.nim      | 2 +-
 libp2p/protocols/pubsub/pubsubpeer.nim  | 2 +-
 libp2p/protocols/secure/noise.nim       | 2 +-
 libp2p/protocols/secure/secio.nim       | 2 +-
 libp2p/protocols/secure/secure.nim      | 2 +-
 libp2p/stream/bufferstream.nim          | 2 +-
 libp2p/stream/chronosstream.nim         | 2 +-
 libp2p/stream/connection.nim            | 2 +-
 libp2p/stream/lpstream.nim              | 2 +-
 libp2p/switch.nim                       | 2 +-
 libp2p/transports/tcptransport.nim      | 2 +-
 libp2p/transports/transport.nim         | 3 +++
 22 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/libp2p/connmanager.nim b/libp2p/connmanager.nim
index 34b7593..36fbe6d 100644
--- a/libp2p/connmanager.nim
+++ b/libp2p/connmanager.nim
@@ -15,7 +15,7 @@ import peerinfo,
        errors
 
 logScope:
-  topics = "connmanager"
+  topics = "libp2p connmanager"
 
 declareGauge(libp2p_peers, "total connected peers")
 
diff --git a/libp2p/multistream.nim b/libp2p/multistream.nim
index baa46f5..cf16e25 100644
--- a/libp2p/multistream.nim
+++ b/libp2p/multistream.nim
@@ -14,7 +14,7 @@ import stream/connection,
        protocols/protocol
 
 logScope:
-  topics = "multistream"
+  topics = "libp2p multistream"
 
 const
   MsgSize* = 64*1024
diff --git a/libp2p/muxers/mplex/coder.nim b/libp2p/muxers/mplex/coder.nim
index 4efee09..7f05a8e 100644
--- a/libp2p/muxers/mplex/coder.nim
+++ b/libp2p/muxers/mplex/coder.nim
@@ -15,7 +15,7 @@ import ../../stream/connection,
        ../../vbuffer
 
 logScope:
-  topics = "mplexcoder"
+  topics = "libp2p mplexcoder"
 
 type
   MessageType* {.pure.} = enum
diff --git a/libp2p/muxers/mplex/lpchannel.nim b/libp2p/muxers/mplex/lpchannel.nim
index bb7eb1a..9cc3dd3 100644
--- a/libp2p/muxers/mplex/lpchannel.nim
+++ b/libp2p/muxers/mplex/lpchannel.nim
@@ -18,7 +18,7 @@ import ./coder,
 export connection
 
 logScope:
-  topics = "mplexchannel"
+  topics = "libp2p mplexchannel"
 
 ## Channel half-closed states
 ##
diff --git a/libp2p/muxers/mplex/mplex.nim b/libp2p/muxers/mplex/mplex.nim
index 6f147aa..ef0b612 100644
--- a/libp2p/muxers/mplex/mplex.nim
+++ b/libp2p/muxers/mplex/mplex.nim
@@ -20,7 +20,7 @@ import ../muxer,
 export muxer
 
 logScope:
-  topics = "mplex"
+  topics = "libp2p mplex"
 
 const MplexCodec* = "/mplex/6.7.0"
 
diff --git a/libp2p/muxers/muxer.nim b/libp2p/muxers/muxer.nim
index 870a80a..6509685 100644
--- a/libp2p/muxers/muxer.nim
+++ b/libp2p/muxers/muxer.nim
@@ -13,7 +13,7 @@ import ../protocols/protocol,
        ../errors
 
 logScope:
-  topics = "muxer"
+  topics = "libp2p muxer"
 
 const
   DefaultChanTimeout* = 5.minutes
diff --git a/libp2p/protocols/identify.nim b/libp2p/protocols/identify.nim
index 95ca1e3..017a482 100644
--- a/libp2p/protocols/identify.nim
+++ b/libp2p/protocols/identify.nim
@@ -19,7 +19,7 @@ import ../protobuf/minprotobuf,
        ../utility
 
 logScope:
-  topics = "identify"
+  topics = "libp2p identify"
 
 const
   IdentifyCodec* = "/ipfs/id/1.0.0"
diff --git a/libp2p/protocols/pubsub/floodsub.nim b/libp2p/protocols/pubsub/floodsub.nim
index fab4b0f..0bf053d 100644
--- a/libp2p/protocols/pubsub/floodsub.nim
+++ b/libp2p/protocols/pubsub/floodsub.nim
@@ -20,7 +20,7 @@ import ./pubsub,
        ../../utility
 
 logScope:
-  topics = "floodsub"
+  topics = "libp2p floodsub"
 
 const FloodSubCodec* = "/floodsub/1.0.0"
 
diff --git a/libp2p/protocols/pubsub/gossipsub.nim b/libp2p/protocols/pubsub/gossipsub.nim
index ce9fd5c..1a6ddc4 100644
--- a/libp2p/protocols/pubsub/gossipsub.nim
+++ b/libp2p/protocols/pubsub/gossipsub.nim
@@ -25,7 +25,7 @@ import stew/results
 export results
 
 logScope:
-  topics = "gossipsub"
+  topics = "libp2p gossipsub"
 
 const
   GossipSubCodec* = "/meshsub/1.1.0"
diff --git a/libp2p/protocols/pubsub/gossipsub10.nim b/libp2p/protocols/pubsub/gossipsub10.nim
index 9d828f9..8908fb1 100644
--- a/libp2p/protocols/pubsub/gossipsub10.nim
+++ b/libp2p/protocols/pubsub/gossipsub10.nim
@@ -28,7 +28,7 @@ import ./pubsub,
        ../../utility
 
 logScope:
-  topics = "gossipsub"
+  topics = "libp2p gossipsub"
 
 const GossipSubCodec* = "/meshsub/1.0.0"
 
diff --git a/libp2p/protocols/pubsub/pubsub.nim b/libp2p/protocols/pubsub/pubsub.nim
index a747847..9901fbd 100644
--- a/libp2p/protocols/pubsub/pubsub.nim
+++ b/libp2p/protocols/pubsub/pubsub.nim
@@ -27,7 +27,7 @@ export PubSubObserver
 export protocol
 
 logScope:
-  topics = "pubsub"
+  topics = "libp2p pubsub"
 
 declareGauge(libp2p_pubsub_peers, "pubsub peer instances")
 declareGauge(libp2p_pubsub_topics, "pubsub subscribed topics")
diff --git a/libp2p/protocols/pubsub/pubsubpeer.nim b/libp2p/protocols/pubsub/pubsubpeer.nim
index 75c9900..9c5fa50 100644
--- a/libp2p/protocols/pubsub/pubsubpeer.nim
+++ b/libp2p/protocols/pubsub/pubsubpeer.nim
@@ -20,7 +20,7 @@ import rpc/[messages, message, protobuf],
 export peerid, connection
 
 logScope:
-  topics = "pubsubpeer"
+  topics = "libp2p pubsubpeer"
 
 when defined(libp2p_expensive_metrics):
   declareCounter(libp2p_pubsub_sent_messages, "number of messages sent", labels = ["id", "topic"])
diff --git a/libp2p/protocols/secure/noise.nim b/libp2p/protocols/secure/noise.nim
index 1a9cd5a..38e45a4 100644
--- a/libp2p/protocols/secure/noise.nim
+++ b/libp2p/protocols/secure/noise.nim
@@ -25,7 +25,7 @@ when defined(libp2p_dump):
   import ../../debugutils
 
 logScope:
-  topics = "noise"
+  topics = "libp2p noise"
 
 const
   # https://godoc.org/github.com/libp2p/go-libp2p-noise#pkg-constants
diff --git a/libp2p/protocols/secure/secio.nim b/libp2p/protocols/secure/secio.nim
index ff22d44..a294138 100644
--- a/libp2p/protocols/secure/secio.nim
+++ b/libp2p/protocols/secure/secio.nim
@@ -20,7 +20,7 @@ import secure,
 export hmac, sha2, sha, hash, rijndael, bcmode
 
 logScope:
-  topics = "secio"
+  topics = "libp2p secio"
 
 const
   SecioCodec* = "/secio/1.0.0"
diff --git a/libp2p/protocols/secure/secure.nim b/libp2p/protocols/secure/secure.nim
index 5fcfeb9..61ef59d 100644
--- a/libp2p/protocols/secure/secure.nim
+++ b/libp2p/protocols/secure/secure.nim
@@ -19,7 +19,7 @@ import ../protocol,
 export protocol
 
 logScope:
-  topics = "secure"
+  topics = "libp2p secure"
 
 const
   SecureConnTrackerName* = "SecureConn"
diff --git a/libp2p/stream/bufferstream.nim b/libp2p/stream/bufferstream.nim
index c33cd5a..69e4e57 100644
--- a/libp2p/stream/bufferstream.nim
+++ b/libp2p/stream/bufferstream.nim
@@ -19,7 +19,7 @@ when chronicles.enabledLogLevel == LogLevel.TRACE:
 export connection
 
 logScope:
-  topics = "bufferstream"
+  topics = "libp2p bufferstream"
 
 const
   BufferStreamTrackerName* = "BufferStream"
diff --git a/libp2p/stream/chronosstream.nim b/libp2p/stream/chronosstream.nim
index b496f19..1daff04 100644
--- a/libp2p/stream/chronosstream.nim
+++ b/libp2p/stream/chronosstream.nim
@@ -12,7 +12,7 @@ import chronos, chronicles
 import connection
 
 logScope:
-  topics = "chronosstream"
+  topics = "libp2p chronosstream"
 
 const
   DefaultChronosStreamTimeout = 10.minutes
diff --git a/libp2p/stream/connection.nim b/libp2p/stream/connection.nim
index f83bdaf..a20e98e 100644
--- a/libp2p/stream/connection.nim
+++ b/libp2p/stream/connection.nim
@@ -16,7 +16,7 @@ import lpstream,
 export lpstream, peerinfo
 
 logScope:
-  topics = "connection"
+  topics = "libp2p connection"
 
 const
   ConnectionTrackerName* = "Connection"
diff --git a/libp2p/stream/lpstream.nim b/libp2p/stream/lpstream.nim
index faebf47..507efca 100644
--- a/libp2p/stream/lpstream.nim
+++ b/libp2p/stream/lpstream.nim
@@ -21,7 +21,7 @@ declareGauge(libp2p_open_streams,
 export oids
 
 logScope:
-  topics = "lpstream"
+  topics = "libp2p lpstream"
 
 const
   LPStreamTrackerName* = "LPStream"
diff --git a/libp2p/switch.nim b/libp2p/switch.nim
index 6e81199..3a67ef1 100644
--- a/libp2p/switch.nim
+++ b/libp2p/switch.nim
@@ -33,7 +33,7 @@ import stream/connection,
 export connmanager
 
 logScope:
-  topics = "switch"
+  topics = "libp2p switch"
 
 #TODO: General note - use a finite state machine to manage the different
 # steps of connections establishing and upgrading. This makes everything
diff --git a/libp2p/transports/tcptransport.nim b/libp2p/transports/tcptransport.nim
index 53b60e6..f48cc09 100644
--- a/libp2p/transports/tcptransport.nim
+++ b/libp2p/transports/tcptransport.nim
@@ -18,7 +18,7 @@ import transport,
        ../stream/chronosstream
 
 logScope:
-  topics = "tcptransport"
+  topics = "libp2p tcptransport"
 
 export transport
 
diff --git a/libp2p/transports/transport.nim b/libp2p/transports/transport.nim
index a3ac045..fa31c71 100644
--- a/libp2p/transports/transport.nim
+++ b/libp2p/transports/transport.nim
@@ -14,6 +14,9 @@ import ../stream/connection,
        ../multiaddress,
        ../multicodec
 
+logScope:
+  topics = "libp2p transport"
+
 type
   TransportClosedError* = object of CatchableError