diff options
author | Ivan Topolnjak <ivantopo@gmail.com> | 2019-02-11 23:16:54 +0100 |
---|---|---|
committer | Ivan Topolnjak <ivantopo@gmail.com> | 2019-02-12 02:49:23 +0100 |
commit | 7152517f2586a5b40726365a756087ddddc099ca (patch) | |
tree | 26b4d9a1768dd0460a4cedb9fc4fde27750936a4 /kamon-core/src/main/scala/kamon/status/JsonMarshalling.scala | |
parent | 4ce838b1af6257625b27ea38d55947912cba00c9 (diff) | |
download | Kamon-7152517f2586a5b40726365a756087ddddc099ca.tar.gz Kamon-7152517f2586a5b40726365a756087ddddc099ca.tar.bz2 Kamon-7152517f2586a5b40726365a756087ddddc099ca.zip |
self-review changes and use a thread pool for the embedded status page
server
Diffstat (limited to 'kamon-core/src/main/scala/kamon/status/JsonMarshalling.scala')
-rw-r--r-- | kamon-core/src/main/scala/kamon/status/JsonMarshalling.scala | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kamon-core/src/main/scala/kamon/status/JsonMarshalling.scala b/kamon-core/src/main/scala/kamon/status/JsonMarshalling.scala index 2291648c..5ab0eb9f 100644 --- a/kamon-core/src/main/scala/kamon/status/JsonMarshalling.scala +++ b/kamon-core/src/main/scala/kamon/status/JsonMarshalling.scala @@ -39,9 +39,9 @@ object JsonMarshalling { .value("description", m.description) .value("clazz", m.clazz) .value("kind", moduleKindString(m.kind)) - .value("isProgrammaticallyRegistered", m.isProgrammaticallyRegistered) - .value("enabled", m.isEnabled) - .value("started", m.isStarted) + .value("programmaticallyRegistered", m.programmaticallyRegistered) + .value("enabled", m.enabled) + .value("started", m.started) .end() }) @@ -107,7 +107,7 @@ object JsonMarshalling { override def toJson(instance: Status.Instrumentation, builder: JavaStringBuilder): Unit = { val instrumentationObject = JsonWriter.on(builder) .`object`() - .value("isActive", instance.isIActive) + .value("active", instance.active) .`object`("modules") instance.modules.asScala.foreach { |