diff options
| author | dfranetovich <dfranetovich@despegar.com> | 2019-02-05 22:07:20 -0300 |
|---|---|---|
| committer | dfranetovich <dfranetovich@despegar.com> | 2019-02-05 22:07:20 -0300 |
| commit | b17ece3b8227032e645537570fda04bf668b5afb (patch) | |
| tree | 7bc0468c13412ada928114d4065702dd474066c3 | |
| parent | 7e9cb172cb7ead8e5579ffb1f0b0ba3ffef90605 (diff) | |
| download | Kamon-b17ece3b8227032e645537570fda04bf668b5afb.tar.gz Kamon-b17ece3b8227032e645537570fda04bf668b5afb.tar.bz2 Kamon-b17ece3b8227032e645537570fda04bf668b5afb.zip | |
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 2a52b95f..7ff083cf 100644 --- a/kamon-core/src/main/scala/kamon/status/Status.scala +++ b/kamon-core/src/main/scala/kamon/status/Status.scala @@ -110,7 +110,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 /** |