diff options
| author | Ivan Topolnjak <ivantopo@gmail.com> | 2019-02-06 22:17:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-06 22:17:20 +0100 |
| commit | 660c059fb96a24739197f04f16bfa39bacbed739 (patch) | |
| tree | 1b9c4dd95591941a1efd84d59d175a4904686ec9 | |
| parent | 77d0fa78a8dba17e710a0caedbd91272218bfcee (diff) | |
| parent | b17ece3b8227032e645537570fda04bf668b5afb (diff) | |
| download | Kamon-660c059fb96a24739197f04f16bfa39bacbed739.tar.gz Kamon-660c059fb96a24739197f04f16bfa39bacbed739.tar.bz2 Kamon-660c059fb96a24739197f04f16bfa39bacbed739.zip | |
Merge pull request #2 from damdev/status-page
changes to integrate with kanela info provider on kanela#70
| -rw-r--r-- | kamon-core/src/main/resources/reference.conf | 2 | ||||
| -rw-r--r-- | kamon-core/src/main/scala/kamon/status/Status.scala | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/kamon-core/src/main/resources/reference.conf b/kamon-core/src/main/resources/reference.conf index dea7296d..37491c79 100644 --- a/kamon-core/src/main/resources/reference.conf +++ b/kamon-core/src/main/resources/reference.conf @@ -407,3 +407,5 @@ kamon { } } } + +kanela.class-replacer.replace += "kamon.status.Status$Instrumentation$=>kanela.agent.util.KanelaInformationProvider"
\ No newline at end of file diff --git a/kamon-core/src/main/scala/kamon/status/Status.scala b/kamon-core/src/main/scala/kamon/status/Status.scala index 1ba5defd..dd5d475f 100644 --- a/kamon-core/src/main/scala/kamon/status/Status.scala +++ b/kamon-core/src/main/scala/kamon/status/Status.scala @@ -111,7 +111,7 @@ object Status { /** * Whether instrumentation is active or not. When Kanela is present it will replace this method to return true. */ - def isActive(): Boolean = + def isActive(): java.lang.Boolean = false /** |