From c985537bfe1b352911aa3ba6247112dfac917171 Mon Sep 17 00:00:00 2001
From: Ivan Topolnjak <ivantopo@gmail.com>
Date: Thu, 7 Feb 2019 15:09:34 +0100
Subject: show instrumentation modules in the status page

---
 .../main/scala/kamon/module/ModuleRegistry.scala   | 23 +++++++++++-----------
 .../main/scala/kamon/status/JsonMarshalling.scala  |  3 ++-
 .../src/main/scala/kamon/status/Status.scala       |  1 +
 3 files changed, 14 insertions(+), 13 deletions(-)

(limited to 'kamon-core/src/main/scala')

diff --git a/kamon-core/src/main/scala/kamon/module/ModuleRegistry.scala b/kamon-core/src/main/scala/kamon/module/ModuleRegistry.scala
index 18921b03..81b94f29 100644
--- a/kamon-core/src/main/scala/kamon/module/ModuleRegistry.scala
+++ b/kamon-core/src/main/scala/kamon/module/ModuleRegistry.scala
@@ -335,23 +335,22 @@ class ModuleRegistry(classLoading: ClassLoading, configuration: Configuration, c
     */
   private[kamon] def status(): Status.ModuleRegistry = {
     val automaticallyAddedModules = readModuleSettings(configuration.config()).map(moduleSettings => {
-      _registeredModules.get(moduleSettings.name)
-        .map(moduleEntry =>
-          // The module is on the classpath and started.
-          Status.Module(moduleEntry.name, moduleEntry.settings.description, moduleEntry.settings.clazz.getCanonicalName,
-            moduleEntry.settings.kind, false, true)
-
-        ).getOrElse(
-          // The module is on the classpath but has not been started.
-          Status.Module(moduleSettings.name, moduleSettings.description, moduleSettings.clazz.getCanonicalName,
-            moduleSettings.kind, false, false)
-        )
+      val isActive = _registeredModules.get(moduleSettings.name).nonEmpty
+
+      Status.Module(
+        moduleSettings.name,
+        moduleSettings.description,
+        moduleSettings.clazz.getCanonicalName,
+        moduleSettings.kind,
+        isProgrammaticallyRegistered = false,
+        moduleSettings.enabled,
+        isActive)
     })
 
     val programmaticallyAddedModules = _registeredModules
       .filter { case (_, entry) => entry.programmaticallyAdded }
       .map { case (name, entry) => Status.Module(name, entry.settings.description, entry.settings.clazz.getCanonicalName,
-        entry.settings.kind, true, true) }
+        entry.settings.kind, true, true, true) }
 
     val allModules = automaticallyAddedModules ++ programmaticallyAddedModules
     Status.ModuleRegistry(allModules)
diff --git a/kamon-core/src/main/scala/kamon/status/JsonMarshalling.scala b/kamon-core/src/main/scala/kamon/status/JsonMarshalling.scala
index a84d016a..3fb2df1e 100644
--- a/kamon-core/src/main/scala/kamon/status/JsonMarshalling.scala
+++ b/kamon-core/src/main/scala/kamon/status/JsonMarshalling.scala
@@ -40,7 +40,8 @@ object JsonMarshalling {
           .value("clazz", m.clazz)
           .value("kind", moduleKindString(m.kind))
           .value("isProgrammaticallyRegistered", m.isProgrammaticallyRegistered)
-          .value("isStarted", m.isStarted)
+          .value("enabled", m.isEnabled)
+          .value("started", m.isStarted)
           .end()
       })
 
diff --git a/kamon-core/src/main/scala/kamon/status/Status.scala b/kamon-core/src/main/scala/kamon/status/Status.scala
index dd5d475f..9b323922 100644
--- a/kamon-core/src/main/scala/kamon/status/Status.scala
+++ b/kamon-core/src/main/scala/kamon/status/Status.scala
@@ -73,6 +73,7 @@ object Status {
     clazz: String,
     kind: ModuleKind,
     isProgrammaticallyRegistered: Boolean,
+    isEnabled: Boolean,
     isStarted: Boolean
   )
 
-- 
cgit v1.2.3