diff options
author | Ivan Topolnjak <ivantopo@gmail.com> | 2019-02-06 15:45:09 +0100 |
---|---|---|
committer | Ivan Topolnjak <ivantopo@gmail.com> | 2019-02-06 15:45:09 +0100 |
commit | 77d0fa78a8dba17e710a0caedbd91272218bfcee (patch) | |
tree | fc1cc3343402b60b416dc2c6a551162357979770 /kamon-core/src/main | |
parent | 7e9cb172cb7ead8e5579ffb1f0b0ba3ffef90605 (diff) | |
download | Kamon-77d0fa78a8dba17e710a0caedbd91272218bfcee.tar.gz Kamon-77d0fa78a8dba17e710a0caedbd91272218bfcee.tar.bz2 Kamon-77d0fa78a8dba17e710a0caedbd91272218bfcee.zip |
better component structure, included a Kamon APM suggestion
Diffstat (limited to 'kamon-core/src/main')
3 files changed, 8 insertions, 3 deletions
diff --git a/kamon-core/src/main/scala/kamon/module/ModuleRegistry.scala b/kamon-core/src/main/scala/kamon/module/ModuleRegistry.scala index 5520c602..18921b03 100644 --- a/kamon-core/src/main/scala/kamon/module/ModuleRegistry.scala +++ b/kamon-core/src/main/scala/kamon/module/ModuleRegistry.scala @@ -338,17 +338,20 @@ class ModuleRegistry(classLoading: ClassLoading, configuration: Configuration, c _registeredModules.get(moduleSettings.name) .map(moduleEntry => // The module is on the classpath and started. - Status.Module(moduleEntry.name, moduleEntry.settings.description, moduleEntry.settings.kind, false, true) + 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.kind, false, false) + Status.Module(moduleSettings.name, moduleSettings.description, moduleSettings.clazz.getCanonicalName, + moduleSettings.kind, false, false) ) }) val programmaticallyAddedModules = _registeredModules .filter { case (_, entry) => entry.programmaticallyAdded } - .map { case (name, entry) => Status.Module(name, entry.settings.description, entry.settings.kind, true, true) } + .map { case (name, entry) => Status.Module(name, entry.settings.description, entry.settings.clazz.getCanonicalName, + entry.settings.kind, 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 370ab467..a84d016a 100644 --- a/kamon-core/src/main/scala/kamon/status/JsonMarshalling.scala +++ b/kamon-core/src/main/scala/kamon/status/JsonMarshalling.scala @@ -37,6 +37,7 @@ object JsonMarshalling { array.`object`() .value("name", m.name) .value("description", m.description) + .value("clazz", m.clazz) .value("kind", moduleKindString(m.kind)) .value("isProgrammaticallyRegistered", m.isProgrammaticallyRegistered) .value("isStarted", m.isStarted) diff --git a/kamon-core/src/main/scala/kamon/status/Status.scala b/kamon-core/src/main/scala/kamon/status/Status.scala index 2a52b95f..1ba5defd 100644 --- a/kamon-core/src/main/scala/kamon/status/Status.scala +++ b/kamon-core/src/main/scala/kamon/status/Status.scala @@ -70,6 +70,7 @@ object Status { case class Module( name: String, description: String, + clazz: String, kind: ModuleKind, isProgrammaticallyRegistered: Boolean, isStarted: Boolean |