From: Philippe Proulx <eeppeliteloop@gmail.com>
Date: Fri, 14 Jun 2019 21:29:56 +0000 (-0400)
Subject: Logging: standardize logging tags
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=350ad6c1c5f45a4e90c33e3c1354125c209bbf02

Logging: standardize logging tags

Use `/` to show the subsystem to source file hierarchy, and use typical
component class identifier, but in uppercase (for example,
`SRC.CTF.FS`).

See the changes in `CONTRIBUTING.adoc` for more details.

Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I94aaf431e6a93e607496267c54419b012564daaf
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1449
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Tested-by: jenkins <jenkins@lttng.org>
---

diff --git a/src/bindings/python/bt2/bt2/native_bt.i b/src/bindings/python/bt2/bt2/native_bt.i
index bf20edc7..e538b268 100644
--- a/src/bindings/python/bt2/bt2/native_bt.i
+++ b/src/bindings/python/bt2/bt2/native_bt.i
@@ -29,7 +29,7 @@
 %module native_bt
 
 %{
-#define BT_LOG_TAG "PY-NATIVE"
+#define BT_LOG_TAG "BT2-PY"
 #include "logging.h"
 
 #include <babeltrace2/babeltrace.h>
diff --git a/src/compat/mman.c b/src/compat/mman.c
index 90255c7c..edc59eda 100644
--- a/src/compat/mman.c
+++ b/src/compat/mman.c
@@ -26,7 +26,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "COMPAT-MMAN"
+#define BT_LOG_TAG "COMPAT/MMAN"
 #include "logging.h"
 
 #include "common/macros.h"
diff --git a/src/compat/uuid.c b/src/compat/uuid.c
index 0b050e3d..547a7921 100644
--- a/src/compat/uuid.c
+++ b/src/compat/uuid.c
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "COMPAT-UUID"
+#define BT_LOG_TAG "COMPAT/UUID"
 #include "logging.h"
 
 #ifdef __APPLE__
diff --git a/src/ctf-writer/attributes.c b/src/ctf-writer/attributes.c
index 961879e4..f331019e 100644
--- a/src/ctf-writer/attributes.c
+++ b/src/ctf-writer/attributes.c
@@ -25,7 +25,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "CTF-WRITER-ATTRS"
+#define BT_LOG_TAG "CTF-WRITER/ATTRS"
 #include "logging.h"
 
 #include "common/assert.h"
diff --git a/src/ctf-writer/clock-class.c b/src/ctf-writer/clock-class.c
index 258d4a6c..9ffb9f67 100644
--- a/src/ctf-writer/clock-class.c
+++ b/src/ctf-writer/clock-class.c
@@ -26,7 +26,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "CTF-WRITER-CLOCK-CLASS"
+#define BT_LOG_TAG "CTF-WRITER/CLOCK-CLASS"
 #include "logging.h"
 
 #include "compat/uuid.h"
diff --git a/src/ctf-writer/clock.c b/src/ctf-writer/clock.c
index cb559265..58d86d1c 100644
--- a/src/ctf-writer/clock.c
+++ b/src/ctf-writer/clock.c
@@ -27,7 +27,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "CTF-WRITER-CLOCK"
+#define BT_LOG_TAG "CTF-WRITER/CLOCK"
 #include "logging.h"
 
 #include "common/assert.h"
diff --git a/src/ctf-writer/event-class.c b/src/ctf-writer/event-class.c
index 419707e1..3830ea55 100644
--- a/src/ctf-writer/event-class.c
+++ b/src/ctf-writer/event-class.c
@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "CTF-WRITER-EVENT-CLASS"
+#define BT_LOG_TAG "CTF-WRITER/EVENT-CLASS"
 #include "logging.h"
 
 #include <glib.h>
diff --git a/src/ctf-writer/event.c b/src/ctf-writer/event.c
index e1bc85e7..c68b87ad 100644
--- a/src/ctf-writer/event.c
+++ b/src/ctf-writer/event.c
@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "CTF-WRITER-EVENT"
+#define BT_LOG_TAG "CTF-WRITER/EVENT"
 #include "logging.h"
 
 #include <inttypes.h>
diff --git a/src/ctf-writer/field-path.c b/src/ctf-writer/field-path.c
index dbd817a5..be19b403 100644
--- a/src/ctf-writer/field-path.c
+++ b/src/ctf-writer/field-path.c
@@ -25,7 +25,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "CTF-WRITER-FIELD-PATH"
+#define BT_LOG_TAG "CTF-WRITER/FIELD-PATH"
 #include "logging.h"
 
 #include <glib.h>
diff --git a/src/ctf-writer/field-types.c b/src/ctf-writer/field-types.c
index 644270a6..7270aec8 100644
--- a/src/ctf-writer/field-types.c
+++ b/src/ctf-writer/field-types.c
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "CTF-WRITER-FIELD-TYPES"
+#define BT_LOG_TAG "CTF-WRITER/FIELD-TYPES"
 #include "logging.h"
 
 #include <float.h>
diff --git a/src/ctf-writer/field-wrapper.c b/src/ctf-writer/field-wrapper.c
index eecd3304..a7a047b8 100644
--- a/src/ctf-writer/field-wrapper.c
+++ b/src/ctf-writer/field-wrapper.c
@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "CTF-WRITER-FIELD-WRAPPER"
+#define BT_LOG_TAG "CTF-WRITER/FIELD-WRAPPER"
 #include "logging.h"
 
 #include <glib.h>
diff --git a/src/ctf-writer/fields.c b/src/ctf-writer/fields.c
index 11f649cd..b37b0429 100644
--- a/src/ctf-writer/fields.c
+++ b/src/ctf-writer/fields.c
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "CTF-WRITER-FIELDS"
+#define BT_LOG_TAG "CTF-WRITER/FIELDS"
 #include "logging.h"
 
 #include <float.h>
diff --git a/src/ctf-writer/object-pool.c b/src/ctf-writer/object-pool.c
index 831297e7..16f2be95 100644
--- a/src/ctf-writer/object-pool.c
+++ b/src/ctf-writer/object-pool.c
@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "OBJECT-POOL"
+#define BT_LOG_TAG "CTF-WRITER/OBJECT-POOL"
 #include "logging.h"
 
 #include <stdint.h>
diff --git a/src/ctf-writer/resolve.c b/src/ctf-writer/resolve.c
index fd59c873..18481435 100644
--- a/src/ctf-writer/resolve.c
+++ b/src/ctf-writer/resolve.c
@@ -28,7 +28,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "CTF-WRITER-RESOLVE"
+#define BT_LOG_TAG "CTF-WRITER/RESOLVE"
 #include "logging.h"
 
 #include <glib.h>
diff --git a/src/ctf-writer/stream-class.c b/src/ctf-writer/stream-class.c
index 8b5e39b4..0fc5c46b 100644
--- a/src/ctf-writer/stream-class.c
+++ b/src/ctf-writer/stream-class.c
@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "CTF-WRITER-STREAM-CLASS"
+#define BT_LOG_TAG "CTF-WRITER/STREAM-CLASS"
 #include "logging.h"
 
 #include <inttypes.h>
diff --git a/src/ctf-writer/stream.c b/src/ctf-writer/stream.c
index a1025c75..e456dcfb 100644
--- a/src/ctf-writer/stream.c
+++ b/src/ctf-writer/stream.c
@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "CTF-WRITER-STREAM"
+#define BT_LOG_TAG "CTF-WRITER/STREAM"
 #include "logging.h"
 
 #include <inttypes.h>
diff --git a/src/ctf-writer/trace.c b/src/ctf-writer/trace.c
index f2ce7141..66397985 100644
--- a/src/ctf-writer/trace.c
+++ b/src/ctf-writer/trace.c
@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "CTF-WRITER-TRACE"
+#define BT_LOG_TAG "CTF-WRITER/TRACE"
 #include "logging.h"
 
 #include <inttypes.h>
diff --git a/src/ctf-writer/utils.c b/src/ctf-writer/utils.c
index b63883e4..f221a3ca 100644
--- a/src/ctf-writer/utils.c
+++ b/src/ctf-writer/utils.c
@@ -26,7 +26,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "CTF-WRITER-UTILS"
+#define BT_LOG_TAG "CTF-WRITER/UTILS"
 #include "logging.h"
 
 #include <glib.h>
diff --git a/src/ctf-writer/validation.c b/src/ctf-writer/validation.c
index 6522f865..8efd5463 100644
--- a/src/ctf-writer/validation.c
+++ b/src/ctf-writer/validation.c
@@ -24,7 +24,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "CTF-WRITER-VALIDATION"
+#define BT_LOG_TAG "CTF-WRITER/VALIDATION"
 #include "logging.h"
 
 #include <babeltrace2/ctf-writer/object.h>
diff --git a/src/ctf-writer/values.c b/src/ctf-writer/values.c
index fb5ffa67..1e887d5e 100644
--- a/src/ctf-writer/values.c
+++ b/src/ctf-writer/values.c
@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "CTF-WRITER-VALUES"
+#define BT_LOG_TAG "CTF-WRITER/VALUES"
 #include "logging.h"
 
 #include <stdlib.h>
diff --git a/src/lib/graph/component-class-sink-colander.c b/src/lib/graph/component-class-sink-colander.c
index 328348bb..c20ff5ec 100644
--- a/src/lib/graph/component-class-sink-colander.c
+++ b/src/lib/graph/component-class-sink-colander.c
@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "COLANDER"
+#define BT_LOG_TAG "LIB/COLANDER"
 #include "lib/lib-logging.h"
 
 #include "common/assert.h"
diff --git a/src/lib/graph/component-class.c b/src/lib/graph/component-class.c
index 13c20d05..24a32ffc 100644
--- a/src/lib/graph/component-class.c
+++ b/src/lib/graph/component-class.c
@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "COMP-CLASS"
+#define BT_LOG_TAG "LIB/COMPONENT-CLASS"
 #include "lib/lib-logging.h"
 
 #include "common/assert.h"
diff --git a/src/lib/graph/component-filter.c b/src/lib/graph/component-filter.c
index ab48fb75..259ba626 100644
--- a/src/lib/graph/component-filter.c
+++ b/src/lib/graph/component-filter.c
@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "COMP-FILTER"
+#define BT_LOG_TAG "LIB/COMPONENT-FILTER"
 #include "lib/lib-logging.h"
 
 #include "common/assert.h"
diff --git a/src/lib/graph/component-sink.c b/src/lib/graph/component-sink.c
index 59839245..6cb9187c 100644
--- a/src/lib/graph/component-sink.c
+++ b/src/lib/graph/component-sink.c
@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "COMP-SINK"
+#define BT_LOG_TAG "LIB/COMPONENT-SINK"
 #include "lib/lib-logging.h"
 
 #include "common/assert.h"
diff --git a/src/lib/graph/component-source.c b/src/lib/graph/component-source.c
index c7c01ab1..404da691 100644
--- a/src/lib/graph/component-source.c
+++ b/src/lib/graph/component-source.c
@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "COMP-SOURCE"
+#define BT_LOG_TAG "LIB/COMPONENT-SOURCE"
 #include "lib/lib-logging.h"
 
 #include "common/assert.h"
diff --git a/src/lib/graph/component.c b/src/lib/graph/component.c
index 6018a278..3bb901fa 100644
--- a/src/lib/graph/component.c
+++ b/src/lib/graph/component.c
@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "COMP"
+#define BT_LOG_TAG "LIB/COMPONENT"
 #include "lib/lib-logging.h"
 
 #include "common/assert.h"
diff --git a/src/lib/graph/connection.c b/src/lib/graph/connection.c
index d290e604..8c31c38e 100644
--- a/src/lib/graph/connection.c
+++ b/src/lib/graph/connection.c
@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "CONNECTION"
+#define BT_LOG_TAG "LIB/CONNECTION"
 #include "lib/lib-logging.h"
 
 #include "common/assert.h"
diff --git a/src/lib/graph/graph.c b/src/lib/graph/graph.c
index 244ecf30..f738559e 100644
--- a/src/lib/graph/graph.c
+++ b/src/lib/graph/graph.c
@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "GRAPH"
+#define BT_LOG_TAG "LIB/GRAPH"
 #include "lib/lib-logging.h"
 
 #include "common/assert.h"
diff --git a/src/lib/graph/iterator.c b/src/lib/graph/iterator.c
index 42bc819a..e2152039 100644
--- a/src/lib/graph/iterator.c
+++ b/src/lib/graph/iterator.c
@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "MSG-ITER"
+#define BT_LOG_TAG "LIB/MSG-ITER"
 #include "lib/lib-logging.h"
 
 #include "compat/compiler.h"
diff --git a/src/lib/graph/message/discarded-items.c b/src/lib/graph/message/discarded-items.c
index 646a7e4f..25836dc3 100644
--- a/src/lib/graph/message/discarded-items.c
+++ b/src/lib/graph/message/discarded-items.c
@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "MSG-DISCARDED-ITEMS"
+#define BT_LOG_TAG "LIB/MSG-DISCARDED-ITEMS"
 #include "lib/lib-logging.h"
 
 #include "lib/assert-pre.h"
diff --git a/src/lib/graph/message/event.c b/src/lib/graph/message/event.c
index 1d74e1dd..8468186c 100644
--- a/src/lib/graph/message/event.c
+++ b/src/lib/graph/message/event.c
@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "MSG-EVENT"
+#define BT_LOG_TAG "LIB/MSG-EVENT"
 #include "lib/lib-logging.h"
 
 #include "common/assert.h"
diff --git a/src/lib/graph/message/message-iterator-inactivity.c b/src/lib/graph/message/message-iterator-inactivity.c
index 5e376381..0c89d84c 100644
--- a/src/lib/graph/message/message-iterator-inactivity.c
+++ b/src/lib/graph/message/message-iterator-inactivity.c
@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "MSG-MESSAGE-ITERATOR-INACTIVITY"
+#define BT_LOG_TAG "LIB/MSG-MSG-ITER-INACTIVITY"
 #include "lib/lib-logging.h"
 
 #include "lib/assert-pre.h"
diff --git a/src/lib/graph/message/message.c b/src/lib/graph/message/message.c
index 0a65b3be..25afe1a5 100644
--- a/src/lib/graph/message/message.c
+++ b/src/lib/graph/message/message.c
@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "MSG"
+#define BT_LOG_TAG "LIB/MSG"
 #include "lib/lib-logging.h"
 
 #include "common/assert.h"
diff --git a/src/lib/graph/message/packet.c b/src/lib/graph/message/packet.c
index 1a6169a2..4a5a3e39 100644
--- a/src/lib/graph/message/packet.c
+++ b/src/lib/graph/message/packet.c
@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "MSG-PACKET"
+#define BT_LOG_TAG "LIB/MSG-PACKET"
 #include "lib/lib-logging.h"
 
 #include "compat/compiler.h"
diff --git a/src/lib/graph/message/stream-activity.c b/src/lib/graph/message/stream-activity.c
index 0058ccfb..dd8bd7e5 100644
--- a/src/lib/graph/message/stream-activity.c
+++ b/src/lib/graph/message/stream-activity.c
@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "MSG-STREAM-ACTIVITY"
+#define BT_LOG_TAG "LIB/MSG-STREAM-ACTIVITY"
 #include "lib/lib-logging.h"
 
 #include "lib/assert-pre.h"
diff --git a/src/lib/graph/message/stream.c b/src/lib/graph/message/stream.c
index f691d72b..ba8a91fa 100644
--- a/src/lib/graph/message/stream.c
+++ b/src/lib/graph/message/stream.c
@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "MSG-STREAM"
+#define BT_LOG_TAG "LIB/MSG-STREAM"
 #include "lib/lib-logging.h"
 
 #include "lib/assert-pre.h"
diff --git a/src/lib/graph/port.c b/src/lib/graph/port.c
index f5a0d732..bf768ad0 100644
--- a/src/lib/graph/port.c
+++ b/src/lib/graph/port.c
@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "PORT"
+#define BT_LOG_TAG "LIB/PORT"
 #include "lib/lib-logging.h"
 
 #include "common/assert.h"
diff --git a/src/lib/graph/query-executor.c b/src/lib/graph/query-executor.c
index 0a9798f2..1a51df92 100644
--- a/src/lib/graph/query-executor.c
+++ b/src/lib/graph/query-executor.c
@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "QUERY-EXECUTOR"
+#define BT_LOG_TAG "LIB/QUERY-EXECUTOR"
 #include "lib/lib-logging.h"
 
 #include "common/assert.h"
diff --git a/src/lib/lib-logging.c b/src/lib/lib-logging.c
index d6d75e05..e29c2e90 100644
--- a/src/lib/lib-logging.c
+++ b/src/lib/lib-logging.c
@@ -20,7 +20,11 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "LIB-LOGGING"
+/*
+ * This is just to satisfy the preprocessor check in "lib/logging.h":
+ * this file does not log anything.
+ */
+#define BT_LOG_TAG ""
 
 #include <stdarg.h>
 #include <stdio.h>
diff --git a/src/lib/logging.c b/src/lib/logging.c
index 30ab704a..b362d667 100644
--- a/src/lib/logging.c
+++ b/src/lib/logging.c
@@ -24,7 +24,7 @@
 #include <babeltrace2/logging.h>
 #include <babeltrace2/version.h>
 
-#define BT_LOG_TAG "LIB"
+#define BT_LOG_TAG "LIB/LOGGING"
 #include "lib/lib-logging.h"
 
 #ifdef BT_DEV_MODE
diff --git a/src/lib/object-pool.c b/src/lib/object-pool.c
index 2542047a..3aa9b2e1 100644
--- a/src/lib/object-pool.c
+++ b/src/lib/object-pool.c
@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "OBJECT-POOL"
+#define BT_LOG_TAG "LIB/OBJECT-POOL"
 #include "lib/lib-logging.h"
 
 #include <stdint.h>
diff --git a/src/lib/plugin/plugin-so.c b/src/lib/plugin/plugin-so.c
index 11cea29d..fac050dc 100644
--- a/src/lib/plugin/plugin-so.c
+++ b/src/lib/plugin/plugin-so.c
@@ -23,7 +23,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "PLUGIN-SO"
+#define BT_LOG_TAG "LIB/PLUGIN-SO"
 #include "lib/lib-logging.h"
 
 #include "common/assert.h"
diff --git a/src/lib/plugin/plugin.c b/src/lib/plugin/plugin.c
index 5bf1a151..30c10ed2 100644
--- a/src/lib/plugin/plugin.c
+++ b/src/lib/plugin/plugin.c
@@ -23,7 +23,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "PLUGIN"
+#define BT_LOG_TAG "LIB/PLUGIN"
 #include "lib/lib-logging.h"
 
 #include "common/assert.h"
diff --git a/src/lib/trace-ir/attributes.c b/src/lib/trace-ir/attributes.c
index 4391f276..c68531c6 100644
--- a/src/lib/trace-ir/attributes.c
+++ b/src/lib/trace-ir/attributes.c
@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "ATTRS"
+#define BT_LOG_TAG "LIB/ATTRS"
 #include "lib/lib-logging.h"
 
 #include "common/macros.h"
diff --git a/src/lib/trace-ir/clock-class.c b/src/lib/trace-ir/clock-class.c
index 7b8cce0e..dd78c8c9 100644
--- a/src/lib/trace-ir/clock-class.c
+++ b/src/lib/trace-ir/clock-class.c
@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "CLOCK-CLASS"
+#define BT_LOG_TAG "LIB/CLOCK-CLASS"
 #include "lib/lib-logging.h"
 
 #include "lib/assert-pre.h"
diff --git a/src/lib/trace-ir/clock-snapshot.c b/src/lib/trace-ir/clock-snapshot.c
index e2e98411..6b44334e 100644
--- a/src/lib/trace-ir/clock-snapshot.c
+++ b/src/lib/trace-ir/clock-snapshot.c
@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "CLOCK-SNAPSHOT"
+#define BT_LOG_TAG "LIB/CLOCK-SNAPSHOT"
 #include "lib/lib-logging.h"
 
 #include "lib/assert-pre.h"
diff --git a/src/lib/trace-ir/event-class.c b/src/lib/trace-ir/event-class.c
index 1d12d95a..3f4f5d2d 100644
--- a/src/lib/trace-ir/event-class.c
+++ b/src/lib/trace-ir/event-class.c
@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "EVENT-CLASS"
+#define BT_LOG_TAG "LIB/EVENT-CLASS"
 #include "lib/lib-logging.h"
 
 #include "lib/assert-pre.h"
diff --git a/src/lib/trace-ir/event.c b/src/lib/trace-ir/event.c
index 133d0d2a..7f93d065 100644
--- a/src/lib/trace-ir/event.c
+++ b/src/lib/trace-ir/event.c
@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "EVENT"
+#define BT_LOG_TAG "LIB/EVENT"
 #include "lib/lib-logging.h"
 
 #include "lib/assert-pre.h"
diff --git a/src/lib/trace-ir/field-class.c b/src/lib/trace-ir/field-class.c
index 6b3a2e93..b6a1f65d 100644
--- a/src/lib/trace-ir/field-class.c
+++ b/src/lib/trace-ir/field-class.c
@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "FIELD-CLASSES"
+#define BT_LOG_TAG "LIB/FIELD-CLASS"
 #include "lib/lib-logging.h"
 
 #include "lib/assert-pre.h"
diff --git a/src/lib/trace-ir/field-path.c b/src/lib/trace-ir/field-path.c
index d43cc5b1..32d80552 100644
--- a/src/lib/trace-ir/field-path.c
+++ b/src/lib/trace-ir/field-path.c
@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "FIELD-PATH"
+#define BT_LOG_TAG "LIB/FIELD-PATH"
 #include "lib/lib-logging.h"
 
 #include "lib/assert-pre.h"
diff --git a/src/lib/trace-ir/field-wrapper.c b/src/lib/trace-ir/field-wrapper.c
index 778d8650..86949fe1 100644
--- a/src/lib/trace-ir/field-wrapper.c
+++ b/src/lib/trace-ir/field-wrapper.c
@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "FIELD-WRAPPER"
+#define BT_LOG_TAG "LIB/FIELD-WRAPPER"
 #include "lib/lib-logging.h"
 
 #include "lib/object-pool.h"
diff --git a/src/lib/trace-ir/field.c b/src/lib/trace-ir/field.c
index 31d9803e..ff5c65a6 100644
--- a/src/lib/trace-ir/field.c
+++ b/src/lib/trace-ir/field.c
@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "FIELDS"
+#define BT_LOG_TAG "LIB/FIELD"
 #include "lib/lib-logging.h"
 
 #include "lib/assert-pre.h"
diff --git a/src/lib/trace-ir/packet-context-field.c b/src/lib/trace-ir/packet-context-field.c
index 03219a2a..612adb94 100644
--- a/src/lib/trace-ir/packet-context-field.c
+++ b/src/lib/trace-ir/packet-context-field.c
@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "PACKET-CONTEXT-FIELD"
+#define BT_LOG_TAG "LIB/PACKET-CONTEXT-FIELD"
 #include "lib/lib-logging.h"
 
 #include "lib/assert-pre.h"
diff --git a/src/lib/trace-ir/packet.c b/src/lib/trace-ir/packet.c
index ade0a3f2..6aeb2b89 100644
--- a/src/lib/trace-ir/packet.c
+++ b/src/lib/trace-ir/packet.c
@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "PACKET"
+#define BT_LOG_TAG "LIB/PACKET"
 #include "lib/lib-logging.h"
 
 #include "lib/assert-pre.h"
diff --git a/src/lib/trace-ir/resolve-field-path.c b/src/lib/trace-ir/resolve-field-path.c
index a7fe29b9..febcfdee 100644
--- a/src/lib/trace-ir/resolve-field-path.c
+++ b/src/lib/trace-ir/resolve-field-path.c
@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "RESOLVE-FIELD-PATH"
+#define BT_LOG_TAG "LIB/RESOLVE-FIELD-PATH"
 #include "lib/lib-logging.h"
 
 #include "lib/assert-pre.h"
diff --git a/src/lib/trace-ir/stream-class.c b/src/lib/trace-ir/stream-class.c
index b77f46aa..be575296 100644
--- a/src/lib/trace-ir/stream-class.c
+++ b/src/lib/trace-ir/stream-class.c
@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "STREAM-CLASS"
+#define BT_LOG_TAG "LIB/STREAM-CLASS"
 #include "lib/lib-logging.h"
 
 #include "lib/assert-pre.h"
diff --git a/src/lib/trace-ir/stream.c b/src/lib/trace-ir/stream.c
index 508866b1..a19828f4 100644
--- a/src/lib/trace-ir/stream.c
+++ b/src/lib/trace-ir/stream.c
@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "STREAM"
+#define BT_LOG_TAG "LIB/STREAM"
 #include "lib/lib-logging.h"
 
 #include "lib/assert-pre.h"
diff --git a/src/lib/trace-ir/trace-class.c b/src/lib/trace-ir/trace-class.c
index 42c5bfed..28e12480 100644
--- a/src/lib/trace-ir/trace-class.c
+++ b/src/lib/trace-ir/trace-class.c
@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "TRACE"
+#define BT_LOG_TAG "LIB/TRACE"
 #include "lib/lib-logging.h"
 
 #include "lib/assert-pre.h"
diff --git a/src/lib/trace-ir/trace.c b/src/lib/trace-ir/trace.c
index 0776a7b2..9c5b9acf 100644
--- a/src/lib/trace-ir/trace.c
+++ b/src/lib/trace-ir/trace.c
@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "TRACE"
+#define BT_LOG_TAG "LIB/TRACE"
 #include "lib/lib-logging.h"
 
 #include "lib/assert-pre.h"
diff --git a/src/lib/trace-ir/utils.c b/src/lib/trace-ir/utils.c
index 3b446e01..1ba06785 100644
--- a/src/lib/trace-ir/utils.c
+++ b/src/lib/trace-ir/utils.c
@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "TRACE-IR-UTILS"
+#define BT_LOG_TAG "LIB/TRACE-IR-UTILS"
 #include "lib/lib-logging.h"
 
 #include <stdlib.h>
diff --git a/src/lib/util.c b/src/lib/util.c
index b17fe2f3..250ce8a4 100644
--- a/src/lib/util.c
+++ b/src/lib/util.c
@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "UTIL"
+#define BT_LOG_TAG "LIB/UTIL"
 #include "lib/lib-logging.h"
 
 #include "lib/assert-pre.h"
diff --git a/src/lib/value.c b/src/lib/value.c
index ca1687fa..38ff2201 100644
--- a/src/lib/value.c
+++ b/src/lib/value.c
@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "VALUES"
+#define BT_LOG_TAG "LIB/VALUE"
 #include "lib/lib-logging.h"
 
 #include <stdlib.h>
diff --git a/src/plugins/ctf/common/bfcr/bfcr.c b/src/plugins/ctf/common/bfcr/bfcr.c
index 0d1ae577..db84fe95 100644
--- a/src/plugins/ctf/common/bfcr/bfcr.c
+++ b/src/plugins/ctf/common/bfcr/bfcr.c
@@ -23,7 +23,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "PLUGIN-CTF-BFCR"
+#define BT_LOG_TAG "PLUGIN/CTF/BFCR"
 #include "logging.h"
 
 #include <stdlib.h>
diff --git a/src/plugins/ctf/common/metadata/ctf-meta-resolve.c b/src/plugins/ctf/common/metadata/ctf-meta-resolve.c
index 5ea4d8f7..17bfcf36 100644
--- a/src/plugins/ctf/common/metadata/ctf-meta-resolve.c
+++ b/src/plugins/ctf/common/metadata/ctf-meta-resolve.c
@@ -13,7 +13,7 @@
  * all copies or substantial portions of the Software.
  */
 
-#define BT_LOG_TAG "PLUGIN-CTF-METADATA-META-RESOLVE"
+#define BT_LOG_TAG "PLUGIN/CTF/META/RESOLVE"
 #include "logging.h"
 
 #include <babeltrace2/babeltrace.h>
diff --git a/src/plugins/ctf/common/metadata/ctf-meta-translate.c b/src/plugins/ctf/common/metadata/ctf-meta-translate.c
index 6cff9921..e05fdba8 100644
--- a/src/plugins/ctf/common/metadata/ctf-meta-translate.c
+++ b/src/plugins/ctf/common/metadata/ctf-meta-translate.c
@@ -12,7 +12,7 @@
  * all copies or substantial portions of the Software.
  */
 
-#define BT_LOG_TAG "PLUGIN-CTF-METADATA-META-TRANSLATE"
+#define BT_LOG_TAG "PLUGIN/CTF/META/TRANSLATE"
 #include "logging.h"
 
 #include <babeltrace2/babeltrace.h>
diff --git a/src/plugins/ctf/common/metadata/ctf-meta-update-default-clock-classes.c b/src/plugins/ctf/common/metadata/ctf-meta-update-default-clock-classes.c
index 41ca6b03..eea855fa 100644
--- a/src/plugins/ctf/common/metadata/ctf-meta-update-default-clock-classes.c
+++ b/src/plugins/ctf/common/metadata/ctf-meta-update-default-clock-classes.c
@@ -12,7 +12,7 @@
  * all copies or substantial portions of the Software.
  */
 
-#define BT_LOG_TAG "PLUGIN-CTF-METADATA-META-UPDATE-DEF-CC"
+#define BT_LOG_TAG "PLUGIN/CTF/META/UPDATE-DEF-CC"
 #include "logging.h"
 
 #include <babeltrace2/babeltrace.h>
diff --git a/src/plugins/ctf/common/metadata/ctf-meta-update-in-ir.c b/src/plugins/ctf/common/metadata/ctf-meta-update-in-ir.c
index 1279d146..cdafe1c8 100644
--- a/src/plugins/ctf/common/metadata/ctf-meta-update-in-ir.c
+++ b/src/plugins/ctf/common/metadata/ctf-meta-update-in-ir.c
@@ -12,7 +12,7 @@
  * all copies or substantial portions of the Software.
  */
 
-#define BT_LOG_TAG "PLUGIN-CTF-METADATA-META-UPDATE-IN-IR"
+#define BT_LOG_TAG "PLUGIN/CTF/META/UPDATE-IN-IR"
 #include "logging.h"
 
 #include <babeltrace2/babeltrace.h>
diff --git a/src/plugins/ctf/common/metadata/ctf-meta-update-meanings.c b/src/plugins/ctf/common/metadata/ctf-meta-update-meanings.c
index 9aaeba83..865ff59c 100644
--- a/src/plugins/ctf/common/metadata/ctf-meta-update-meanings.c
+++ b/src/plugins/ctf/common/metadata/ctf-meta-update-meanings.c
@@ -12,7 +12,7 @@
  * all copies or substantial portions of the Software.
  */
 
-#define BT_LOG_TAG "PLUGIN-CTF-METADATA-META-UPDATE-MEANINGS"
+#define BT_LOG_TAG "PLUGIN/CTF/META/UPDATE-MEANINGS"
 #include "logging.h"
 
 #include <babeltrace2/babeltrace.h>
diff --git a/src/plugins/ctf/common/metadata/ctf-meta-update-stream-class-config.c b/src/plugins/ctf/common/metadata/ctf-meta-update-stream-class-config.c
index 7c28ee23..a9683718 100644
--- a/src/plugins/ctf/common/metadata/ctf-meta-update-stream-class-config.c
+++ b/src/plugins/ctf/common/metadata/ctf-meta-update-stream-class-config.c
@@ -12,7 +12,7 @@
  * all copies or substantial portions of the Software.
  */
 
-#define BT_LOG_TAG "PLUGIN-CTF-METADATA-META-UPDATE-SC-CONFIG"
+#define BT_LOG_TAG "PLUGIN/CTF/META/UPDATE-SC-CONFIG"
 #include "logging.h"
 
 #include <babeltrace2/babeltrace.h>
diff --git a/src/plugins/ctf/common/metadata/ctf-meta-update-text-array-sequence.c b/src/plugins/ctf/common/metadata/ctf-meta-update-text-array-sequence.c
index 843069b8..c1b2ae76 100644
--- a/src/plugins/ctf/common/metadata/ctf-meta-update-text-array-sequence.c
+++ b/src/plugins/ctf/common/metadata/ctf-meta-update-text-array-sequence.c
@@ -12,7 +12,7 @@
  * all copies or substantial portions of the Software.
  */
 
-#define BT_LOG_TAG "PLUGIN-CTF-METADATA-META-UPDATE-TEXT-ARRAY-SEQ"
+#define BT_LOG_TAG "PLUGIN/CTF/META/UPDATE-TEXT-ARRAY-SEQ"
 #include "logging.h"
 
 #include <babeltrace2/babeltrace.h>
diff --git a/src/plugins/ctf/common/metadata/ctf-meta-update-value-storing-indexes.c b/src/plugins/ctf/common/metadata/ctf-meta-update-value-storing-indexes.c
index 81aa9909..20cd4cb6 100644
--- a/src/plugins/ctf/common/metadata/ctf-meta-update-value-storing-indexes.c
+++ b/src/plugins/ctf/common/metadata/ctf-meta-update-value-storing-indexes.c
@@ -12,7 +12,7 @@
  * all copies or substantial portions of the Software.
  */
 
-#define BT_LOG_TAG "PLUGIN-CTF-METADATA-META-UPDATE-VALUE-STORING-INDEXES"
+#define BT_LOG_TAG "PLUGIN/CTF/META/UPDATE-VALUE-STORING-INDEXES"
 #include "logging.h"
 
 #include <babeltrace2/babeltrace.h>
diff --git a/src/plugins/ctf/common/metadata/ctf-meta-validate.c b/src/plugins/ctf/common/metadata/ctf-meta-validate.c
index 99a73208..d778270c 100644
--- a/src/plugins/ctf/common/metadata/ctf-meta-validate.c
+++ b/src/plugins/ctf/common/metadata/ctf-meta-validate.c
@@ -12,7 +12,7 @@
  * all copies or substantial portions of the Software.
  */
 
-#define BT_LOG_TAG "PLUGIN-CTF-METADATA-META-VALIDATE"
+#define BT_LOG_TAG "PLUGIN/CTF/META/VALIDATE"
 #include "logging.h"
 
 #include <babeltrace2/babeltrace.h>
diff --git a/src/plugins/ctf/common/metadata/ctf-meta-warn-meaningless-header-fields.c b/src/plugins/ctf/common/metadata/ctf-meta-warn-meaningless-header-fields.c
index 87245a9e..c43648ac 100644
--- a/src/plugins/ctf/common/metadata/ctf-meta-warn-meaningless-header-fields.c
+++ b/src/plugins/ctf/common/metadata/ctf-meta-warn-meaningless-header-fields.c
@@ -12,7 +12,7 @@
  * all copies or substantial portions of the Software.
  */
 
-#define BT_LOG_TAG "PLUGIN-CTF-METADATA-META-WARN-MEANINGLESS-HEADER-FIELDS"
+#define BT_LOG_TAG "PLUGIN/CTF/META/WARN-MEANINGLESS-HEADER-FIELDS"
 #include "logging.h"
 
 #include <babeltrace2/babeltrace.h>
diff --git a/src/plugins/ctf/common/metadata/decoder.c b/src/plugins/ctf/common/metadata/decoder.c
index 08eb9abe..8422b166 100644
--- a/src/plugins/ctf/common/metadata/decoder.c
+++ b/src/plugins/ctf/common/metadata/decoder.c
@@ -12,7 +12,7 @@
  * all copies or substantial portions of the Software.
  */
 
-#define BT_LOG_TAG "PLUGIN-CTF-METADATA-DECODER"
+#define BT_LOG_TAG "PLUGIN/CTF/META/DECODER"
 #include "logging.h"
 
 #include <stdio.h>
diff --git a/src/plugins/ctf/common/metadata/objstack.c b/src/plugins/ctf/common/metadata/objstack.c
index 1cb069d5..20dbbdae 100644
--- a/src/plugins/ctf/common/metadata/objstack.c
+++ b/src/plugins/ctf/common/metadata/objstack.c
@@ -24,7 +24,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "PLUGIN-CTF-METADATA-OBJSTACK"
+#define BT_LOG_TAG "PLUGIN/CTF/META/OBJSTACK"
 #include "logging.h"
 
 #include <stdlib.h>
diff --git a/src/plugins/ctf/common/metadata/parser.y b/src/plugins/ctf/common/metadata/parser.y
index 8082a0b0..3f993cef 100644
--- a/src/plugins/ctf/common/metadata/parser.y
+++ b/src/plugins/ctf/common/metadata/parser.y
@@ -25,7 +25,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "PLUGIN-CTF-METADATA-PARSER"
+#define BT_LOG_TAG "PLUGIN/CTF/META/PARSER"
 #include "logging.h"
 
 #include <stdio.h>
diff --git a/src/plugins/ctf/common/metadata/visitor-generate-ir.c b/src/plugins/ctf/common/metadata/visitor-generate-ir.c
index d2f80d0f..2b87f609 100644
--- a/src/plugins/ctf/common/metadata/visitor-generate-ir.c
+++ b/src/plugins/ctf/common/metadata/visitor-generate-ir.c
@@ -27,7 +27,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "PLUGIN-CTF-METADATA-IR-VISITOR"
+#define BT_LOG_TAG "PLUGIN/CTF/META/IR-VISITOR"
 #include "logging.h"
 
 #include <stdio.h>
diff --git a/src/plugins/ctf/common/metadata/visitor-parent-links.c b/src/plugins/ctf/common/metadata/visitor-parent-links.c
index c1389ba7..a7f0e93e 100644
--- a/src/plugins/ctf/common/metadata/visitor-parent-links.c
+++ b/src/plugins/ctf/common/metadata/visitor-parent-links.c
@@ -24,7 +24,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "PLUGIN-CTF-METADATA-PARENT-LINKS-VISITOR"
+#define BT_LOG_TAG "PLUGIN/CTF/META/PARENT-LINKS-VISITOR"
 #include "logging.h"
 
 #include <stdio.h>
diff --git a/src/plugins/ctf/common/metadata/visitor-semantic-validator.c b/src/plugins/ctf/common/metadata/visitor-semantic-validator.c
index 5592d6d5..bb0122be 100644
--- a/src/plugins/ctf/common/metadata/visitor-semantic-validator.c
+++ b/src/plugins/ctf/common/metadata/visitor-semantic-validator.c
@@ -24,7 +24,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "PLUGIN-CTF-METADATA-SEMANTIC-VALIDATOR-VISITOR"
+#define BT_LOG_TAG "PLUGIN/CTF/META/SEMANTIC-VALIDATOR-VISITOR"
 #include "logging.h"
 
 #include <stdio.h>
diff --git a/src/plugins/ctf/common/msg-iter/msg-iter.c b/src/plugins/ctf/common/msg-iter/msg-iter.c
index 3713a278..13914231 100644
--- a/src/plugins/ctf/common/msg-iter/msg-iter.c
+++ b/src/plugins/ctf/common/msg-iter/msg-iter.c
@@ -23,7 +23,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "PLUGIN-CTF-MSG-ITER"
+#define BT_LOG_TAG "PLUGIN/CTF/MSG-ITER"
 #include "logging.h"
 
 #include <stdint.h>
diff --git a/src/plugins/ctf/common/utils/utils.c b/src/plugins/ctf/common/utils/utils.c
index dd65f941..3d82ad5c 100644
--- a/src/plugins/ctf/common/utils/utils.c
+++ b/src/plugins/ctf/common/utils/utils.c
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "PLUGIN-CTF-UTILS"
+#define BT_LOG_TAG "PLUGIN/CTF/UTILS"
 #include "logging.h"
 
 #include "utils.h"
diff --git a/src/plugins/ctf/fs-sink/fs-sink-stream.c b/src/plugins/ctf/fs-sink/fs-sink-stream.c
index d79e80e0..41098dc7 100644
--- a/src/plugins/ctf/fs-sink/fs-sink-stream.c
+++ b/src/plugins/ctf/fs-sink/fs-sink-stream.c
@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "PLUGIN-CTF-FS-SINK-STREAM"
+#define BT_LOG_TAG "PLUGIN/SINK.CTF.FS/STREAM"
 #include "logging.h"
 
 #include <babeltrace2/babeltrace.h>
diff --git a/src/plugins/ctf/fs-sink/fs-sink-trace.c b/src/plugins/ctf/fs-sink/fs-sink-trace.c
index 4feb8245..7ff92808 100644
--- a/src/plugins/ctf/fs-sink/fs-sink-trace.c
+++ b/src/plugins/ctf/fs-sink/fs-sink-trace.c
@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "PLUGIN-CTF-FS-SINK-TRACE"
+#define BT_LOG_TAG "PLUGIN/SINK.CTF.FS/TRACE"
 #include "logging.h"
 
 #include <babeltrace2/babeltrace.h>
diff --git a/src/plugins/ctf/fs-sink/fs-sink.c b/src/plugins/ctf/fs-sink/fs-sink.c
index 7ecc7875..0e839dd9 100644
--- a/src/plugins/ctf/fs-sink/fs-sink.c
+++ b/src/plugins/ctf/fs-sink/fs-sink.c
@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "PLUGIN-CTF-FS-SINK"
+#define BT_LOG_TAG "PLUGIN/SINK.CTF.FS"
 #include "logging.h"
 
 #include <babeltrace2/babeltrace.h>
diff --git a/src/plugins/ctf/fs-sink/translate-ctf-ir-to-tsdl.c b/src/plugins/ctf/fs-sink/translate-ctf-ir-to-tsdl.c
index c81b70f6..ec6de88d 100644
--- a/src/plugins/ctf/fs-sink/translate-ctf-ir-to-tsdl.c
+++ b/src/plugins/ctf/fs-sink/translate-ctf-ir-to-tsdl.c
@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "PLUGIN-CTF-FS-SINK-TRANSLATE-CTF-IR-TO-TSDL"
+#define BT_LOG_TAG "PLUGIN/SINK.CTF.FS/TRANSLATE-CTF-IR-TO-TSDL"
 #include "logging.h"
 
 #include <babeltrace2/babeltrace.h>
diff --git a/src/plugins/ctf/fs-sink/translate-trace-ir-to-ctf-ir.c b/src/plugins/ctf/fs-sink/translate-trace-ir-to-ctf-ir.c
index 10243227..7bd9423b 100644
--- a/src/plugins/ctf/fs-sink/translate-trace-ir-to-ctf-ir.c
+++ b/src/plugins/ctf/fs-sink/translate-trace-ir-to-ctf-ir.c
@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "PLUGIN-CTF-FS-SINK-TRANSLATE-TRACE-IR-TO-CTF-IR"
+#define BT_LOG_TAG "PLUGIN/SINK.CTF.FS/TRANSLATE-TRACE-IR-TO-CTF-IR"
 #include "logging.h"
 
 #include <babeltrace2/babeltrace.h>
diff --git a/src/plugins/ctf/fs-src/data-stream-file.c b/src/plugins/ctf/fs-src/data-stream-file.c
index 6abf64c3..1a451925 100644
--- a/src/plugins/ctf/fs-src/data-stream-file.c
+++ b/src/plugins/ctf/fs-src/data-stream-file.c
@@ -40,7 +40,7 @@
 #include "data-stream-file.h"
 #include <string.h>
 
-#define BT_LOG_TAG "PLUGIN-CTF-FS-SRC-DS"
+#define BT_LOG_TAG "PLUGIN/SRC.CTF.FS/DS"
 #include "logging.h"
 
 static inline
diff --git a/src/plugins/ctf/fs-src/file.c b/src/plugins/ctf/fs-src/file.c
index 7aa15b27..de913a70 100644
--- a/src/plugins/ctf/fs-src/file.c
+++ b/src/plugins/ctf/fs-src/file.c
@@ -27,7 +27,7 @@
 #include <glib.h>
 #include "file.h"
 
-#define BT_LOG_TAG "PLUGIN-CTF-FS-FILE-SRC"
+#define BT_LOG_TAG "PLUGIN/SRC.CTF.FS/FILE"
 #include "logging.h"
 
 BT_HIDDEN
diff --git a/src/plugins/ctf/fs-src/fs.c b/src/plugins/ctf/fs-src/fs.c
index 594c3551..d0a729b6 100644
--- a/src/plugins/ctf/fs-src/fs.c
+++ b/src/plugins/ctf/fs-src/fs.c
@@ -41,7 +41,7 @@
 #include "../common/utils/utils.h"
 #include "query.h"
 
-#define BT_LOG_TAG "PLUGIN-CTF-FS-SRC"
+#define BT_LOG_TAG "PLUGIN/SRC.CTF.FS"
 #include "logging.h"
 
 static
diff --git a/src/plugins/ctf/fs-src/metadata.c b/src/plugins/ctf/fs-src/metadata.c
index 30744612..08545027 100644
--- a/src/plugins/ctf/fs-src/metadata.c
+++ b/src/plugins/ctf/fs-src/metadata.c
@@ -38,7 +38,7 @@
 #include "metadata.h"
 #include "../common/metadata/decoder.h"
 
-#define BT_LOG_TAG "PLUGIN-CTF-FS-METADATA-SRC"
+#define BT_LOG_TAG "PLUGIN/SRC.CTF.FS/META"
 #include "logging.h"
 
 BT_HIDDEN
diff --git a/src/plugins/ctf/fs-src/query.c b/src/plugins/ctf/fs-src/query.c
index b83a4353..3a58e1ff 100644
--- a/src/plugins/ctf/fs-src/query.c
+++ b/src/plugins/ctf/fs-src/query.c
@@ -34,7 +34,7 @@
 #include <babeltrace2/babeltrace.h>
 #include "fs.h"
 
-#define BT_LOG_TAG "PLUGIN-CTF-FS-QUERY-SRC"
+#define BT_LOG_TAG "PLUGIN/SRC.CTF.FS/QUERY"
 #include "logging.h"
 
 #define METADATA_TEXT_SIG	"/* CTF 1.8"
diff --git a/src/plugins/ctf/lttng-live/data-stream.c b/src/plugins/ctf/lttng-live/data-stream.c
index 8ea914db..5641d281 100644
--- a/src/plugins/ctf/lttng-live/data-stream.c
+++ b/src/plugins/ctf/lttng-live/data-stream.c
@@ -23,7 +23,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "PLUGIN-CTF-LTTNG-LIVE-SRC-DS"
+#define BT_LOG_TAG "PLUGIN/SRC.CTF.LTTNG-LIVE/DS"
 #include "logging.h"
 
 #include <stdio.h>
diff --git a/src/plugins/ctf/lttng-live/lttng-live.c b/src/plugins/ctf/lttng-live/lttng-live.c
index 589472dc..c44217b6 100644
--- a/src/plugins/ctf/lttng-live/lttng-live.c
+++ b/src/plugins/ctf/lttng-live/lttng-live.c
@@ -28,7 +28,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "PLUGIN-CTF-LTTNG-LIVE-SRC"
+#define BT_LOG_TAG "PLUGIN/SRC.CTF.LTTNG-LIVE"
 #include "logging.h"
 
 #include <glib.h>
diff --git a/src/plugins/ctf/lttng-live/metadata.c b/src/plugins/ctf/lttng-live/metadata.c
index 2d605e15..f8f22480 100644
--- a/src/plugins/ctf/lttng-live/metadata.c
+++ b/src/plugins/ctf/lttng-live/metadata.c
@@ -24,7 +24,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "PLUGIN-CTF-LTTNG-LIVE-SRC-METADATA"
+#define BT_LOG_TAG "PLUGIN/SRC.CTF.LTTNG-LIVE/META"
 #include "logging.h"
 
 #include <stdio.h>
diff --git a/src/plugins/ctf/lttng-live/viewer-connection.c b/src/plugins/ctf/lttng-live/viewer-connection.c
index 3d172162..984caf2b 100644
--- a/src/plugins/ctf/lttng-live/viewer-connection.c
+++ b/src/plugins/ctf/lttng-live/viewer-connection.c
@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "PLUGIN-CTF-LTTNG-LIVE-SRC-VIEWER"
+#define BT_LOG_TAG "PLUGIN/SRC.CTF.LTTNG-LIVE/VIEWER"
 #include "logging.h"
 
 #include <stdio.h>
diff --git a/src/plugins/lttng-utils/debug-info/bin-info.c b/src/plugins/lttng-utils/debug-info/bin-info.c
index 2b3ae350..cbf9310a 100644
--- a/src/plugins/lttng-utils/debug-info/bin-info.c
+++ b/src/plugins/lttng-utils/debug-info/bin-info.c
@@ -26,7 +26,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "PLUGIN-CTF-LTTNG-UTILS-DEBUG-INFO-FLT-BIN-INFO"
+#define BT_LOG_TAG "PLUGIN/FLT.LTTNG-UTILS.DEBUG-INFO/BIN-INFO"
 #include "logging.h"
 
 #include <dwarf.h>
diff --git a/src/plugins/lttng-utils/debug-info/debug-info.c b/src/plugins/lttng-utils/debug-info/debug-info.c
index 1d5886b7..8fee09ab 100644
--- a/src/plugins/lttng-utils/debug-info/debug-info.c
+++ b/src/plugins/lttng-utils/debug-info/debug-info.c
@@ -26,7 +26,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "PLUGIN-CTF-LTTNG-UTILS-DEBUG-INFO-FLT"
+#define BT_LOG_TAG "PLUGIN/FLT.LTTNG-UTILS.DEBUG-INFO"
 #include "logging.h"
 
 #include <glib.h>
diff --git a/src/plugins/lttng-utils/debug-info/trace-ir-data-copy.c b/src/plugins/lttng-utils/debug-info/trace-ir-data-copy.c
index 9d01d962..880a942a 100644
--- a/src/plugins/lttng-utils/debug-info/trace-ir-data-copy.c
+++ b/src/plugins/lttng-utils/debug-info/trace-ir-data-copy.c
@@ -23,7 +23,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "PLUGIN-LTTNG-UTILS-DEBUG-INFO-TRACE-IR-DATA-COPY"
+#define BT_LOG_TAG "PLUGIN/FLT.LTTNG-UTILS.DEBUG-INFO/TRACE-IR-DATA-COPY"
 #include "logging.h"
 
 #include <inttypes.h>
diff --git a/src/plugins/lttng-utils/debug-info/trace-ir-mapping.c b/src/plugins/lttng-utils/debug-info/trace-ir-mapping.c
index 67b24f84..19a03f27 100644
--- a/src/plugins/lttng-utils/debug-info/trace-ir-mapping.c
+++ b/src/plugins/lttng-utils/debug-info/trace-ir-mapping.c
@@ -25,7 +25,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "PLUGIN-LTTNG-UTILS-DEBUG-INFO-TRACE-IR-MAPPING"
+#define BT_LOG_TAG "PLUGIN/FLT.LTTNG-UTILS.DEBUG-INFO/TRACE-IR-MAPPING"
 #include "logging.h"
 
 #include <stdbool.h>
diff --git a/src/plugins/lttng-utils/debug-info/trace-ir-metadata-copy.c b/src/plugins/lttng-utils/debug-info/trace-ir-metadata-copy.c
index 92bc3de8..2471e96f 100644
--- a/src/plugins/lttng-utils/debug-info/trace-ir-metadata-copy.c
+++ b/src/plugins/lttng-utils/debug-info/trace-ir-metadata-copy.c
@@ -24,7 +24,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "PLUGIN-LTTNG-UTILS-DEBUG-INFO-TRACE-IR-METADATA-COPY"
+#define BT_LOG_TAG "PLUGIN/FLT.LTTNG-UTILS.DEBUG-INFO/TRACE-IR-META-COPY"
 #include "logging.h"
 
 #include <inttypes.h>
diff --git a/src/plugins/lttng-utils/debug-info/trace-ir-metadata-field-class-copy.c b/src/plugins/lttng-utils/debug-info/trace-ir-metadata-field-class-copy.c
index 70242d66..f7cab92f 100644
--- a/src/plugins/lttng-utils/debug-info/trace-ir-metadata-field-class-copy.c
+++ b/src/plugins/lttng-utils/debug-info/trace-ir-metadata-field-class-copy.c
@@ -24,7 +24,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "PLUGIN-LTTNG-UTILS-DEBUG-INFO-TRACE-IR-METADATA-FC-COPY"
+#define BT_LOG_TAG "PLUGIN/FLT.LTTNG-UTILS.DEBUG-INFO/TRACE-IR-META-FC-COPY"
 #include "logging.h"
 
 #include "common/assert.h"
diff --git a/src/plugins/text/details/details.c b/src/plugins/text/details/details.c
index 3fcd4660..8f09efa4 100644
--- a/src/plugins/text/details/details.c
+++ b/src/plugins/text/details/details.c
@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "PLUGIN-TEXT-DETAILS-SINK"
+#define BT_LOG_TAG "PLUGIN/SINK.TEXT.DETAILS"
 #include "logging.h"
 
 #include <babeltrace2/babeltrace.h>
diff --git a/src/plugins/text/details/obj-lifetime-mgmt.c b/src/plugins/text/details/obj-lifetime-mgmt.c
index fc749046..182c8b66 100644
--- a/src/plugins/text/details/obj-lifetime-mgmt.c
+++ b/src/plugins/text/details/obj-lifetime-mgmt.c
@@ -20,9 +20,6 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "PLUGIN-TEXT-DETAILS-SINK-OBJ-LIFETIME-MGMT"
-#include "logging.h"
-
 #include <babeltrace2/babeltrace.h>
 
 #include "common/common.h"
diff --git a/src/plugins/text/details/write.c b/src/plugins/text/details/write.c
index 8fabe0b8..3601d45c 100644
--- a/src/plugins/text/details/write.c
+++ b/src/plugins/text/details/write.c
@@ -20,10 +20,9 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "PLUGIN-TEXT-DETAILS-SINK-WRITE"
-#include "logging.h"
-
 #include <babeltrace2/babeltrace.h>
+#include <stdio.h>
+#include <string.h>
 
 #include "common/assert.h"
 #include "common/common.h"
diff --git a/src/plugins/text/dmesg/dmesg.c b/src/plugins/text/dmesg/dmesg.c
index 7ed01cdc..476b0803 100644
--- a/src/plugins/text/dmesg/dmesg.c
+++ b/src/plugins/text/dmesg/dmesg.c
@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "PLUGIN-TEXT-DMESG-SRC"
+#define BT_LOG_TAG "PLUGIN/SRC.TEXT.DMESG"
 #include "logging.h"
 
 #include <stdbool.h>
diff --git a/src/plugins/text/pretty/pretty.c b/src/plugins/text/pretty/pretty.c
index b713f5d0..95abda08 100644
--- a/src/plugins/text/pretty/pretty.c
+++ b/src/plugins/text/pretty/pretty.c
@@ -23,7 +23,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "PLUGIN-TEXT-PRETTY-SINK"
+#define BT_LOG_TAG "PLUGIN/SINK.TEXT.PRETTY"
 #include "logging.h"
 
 #include <babeltrace2/babeltrace.h>
diff --git a/src/plugins/utils/counter/counter.c b/src/plugins/utils/counter/counter.c
index a6c53936..42ac5ad6 100644
--- a/src/plugins/utils/counter/counter.c
+++ b/src/plugins/utils/counter/counter.c
@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "PLUGIN-UTILS-COUNTER-FLT"
+#define BT_LOG_TAG "PLUGIN/FLT.UTILS.COUNTER"
 #include "logging.h"
 
 #include <babeltrace2/babeltrace.h>
diff --git a/src/plugins/utils/muxer/muxer.c b/src/plugins/utils/muxer/muxer.c
index a8dbe2a0..9c48a760 100644
--- a/src/plugins/utils/muxer/muxer.c
+++ b/src/plugins/utils/muxer/muxer.c
@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "PLUGIN-UTILS-MUXER-FLT"
+#define BT_LOG_TAG "PLUGIN/FLT.UTILS.MUXER"
 #include "logging.h"
 
 #include "common/macros.h"
diff --git a/src/plugins/utils/trimmer/trimmer.c b/src/plugins/utils/trimmer/trimmer.c
index 1275750d..fb1a2a70 100644
--- a/src/plugins/utils/trimmer/trimmer.c
+++ b/src/plugins/utils/trimmer/trimmer.c
@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "PLUGIN-UTILS-TRIMMER-FLT"
+#define BT_LOG_TAG "PLUGIN/FLT.UTILS.TRIMMER"
 #include "logging.h"
 
 #include "compat/utc.h"
diff --git a/src/python-plugin-provider/python-plugin-provider.c b/src/python-plugin-provider/python-plugin-provider.c
index 7ca264b4..88c04e84 100644
--- a/src/python-plugin-provider/python-plugin-provider.c
+++ b/src/python-plugin-provider/python-plugin-provider.c
@@ -24,7 +24,7 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "PLUGIN-PY"
+#define BT_LOG_TAG "LIB/PLUGIN-PY"
 
 #include "lib/lib-logging.h"
 #include "common/macros.h"