From b17ece3b8227032e645537570fda04bf668b5afb Mon Sep 17 00:00:00 2001 From: dfranetovich Date: Tue, 5 Feb 2019 22:07:20 -0300 Subject: changes to integrate with kanela info provider on kanela#70 --- kamon-core/src/main/resources/reference.conf | 2 ++ kamon-core/src/main/scala/kamon/status/Status.scala | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) 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 /** -- cgit v1.2.3