diff options
author | Ivan Topolnjak <ivantopo@gmail.com> | 2014-03-24 23:56:07 -0300 |
---|---|---|
committer | Ivan Topolnjak <ivantopo@gmail.com> | 2014-03-24 23:58:42 -0300 |
commit | a5cf2e2f600303ca1927d060196f95932153fe15 (patch) | |
tree | 6555ef9d95ac9110ed207b9e28244d5eae3cc8ac /kamon-core/src/main/scala/akka/instrumentation | |
parent | c941dd2b2556d3046f308d2995049dd35e84b3e3 (diff) | |
download | Kamon-a5cf2e2f600303ca1927d060196f95932153fe15.tar.gz Kamon-a5cf2e2f600303ca1927d060196f95932153fe15.tar.bz2 Kamon-a5cf2e2f600303ca1927d060196f95932153fe15.zip |
ensure that kamon.trace.ask-pattern-tracing setting is honored, closes #4
Diffstat (limited to 'kamon-core/src/main/scala/akka/instrumentation')
-rw-r--r-- | kamon-core/src/main/scala/akka/instrumentation/AskPatternTracing.scala | 49 |
1 files changed, 27 insertions, 22 deletions
diff --git a/kamon-core/src/main/scala/akka/instrumentation/AskPatternTracing.scala b/kamon-core/src/main/scala/akka/instrumentation/AskPatternTracing.scala index b5b23e61..08508930 100644 --- a/kamon-core/src/main/scala/akka/instrumentation/AskPatternTracing.scala +++ b/kamon-core/src/main/scala/akka/instrumentation/AskPatternTracing.scala @@ -1,18 +1,19 @@ -/* =================================================== +/* + * ========================================================================================= * Copyright © 2013 the kamon project <http://kamon.io/> * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ========================================================== */ + * Unless required by applicable law or agreed to in writing, software distributed under the + * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language governing permissions + * and limitations under the License. + * ========================================================================================= + */ + package akka.instrumentation import org.aspectj.lang.annotation.{ AfterReturning, Pointcut, Aspect } @@ -20,6 +21,8 @@ import akka.event.Logging.Warning import scala.compat.Platform.EOL import akka.actor.ActorRefProvider import akka.pattern.{ AskTimeoutException, PromiseActorRef } +import kamon.trace.Trace +import kamon.Kamon @Aspect class AskPatternTracing { @@ -27,23 +30,25 @@ class AskPatternTracing { class StackTraceCaptureException extends Throwable @Pointcut(value = "execution(* akka.pattern.PromiseActorRef$.apply(..)) && args(provider, *)", argNames = "provider") - def promiseActorRefApply(provider: ActorRefProvider): Unit = { - provider.settings.config.getBoolean("kamon.trace.ask-pattern-tracing") - } + def promiseActorRefApply(provider: ActorRefProvider): Unit = {} @AfterReturning(pointcut = "promiseActorRefApply(provider)", returning = "promiseActor") def hookAskTimeoutWarning(provider: ActorRefProvider, promiseActor: PromiseActorRef): Unit = { - val future = promiseActor.result.future val system = promiseActor.provider.guardian.underlying.system - implicit val ec = system.dispatcher - val stack = new StackTraceCaptureException + val traceExtension = Kamon(Trace)(system) + + if (traceExtension.enableAskPatternTracing) { + val future = promiseActor.result.future + implicit val ec = system.dispatcher + val stack = new StackTraceCaptureException - future onFailure { - case timeout: AskTimeoutException ⇒ - val stackString = stack.getStackTrace.drop(3).mkString("", EOL, EOL) + future onFailure { + case timeout: AskTimeoutException ⇒ + val stackString = stack.getStackTrace.drop(3).mkString("", EOL, EOL) - system.eventStream.publish(Warning("AskPatternTracing", classOf[AskPatternTracing], - "Timeout triggered for ask pattern registered at: " + stackString)) + system.eventStream.publish(Warning("AskPatternTracing", classOf[AskPatternTracing], + "Timeout triggered for ask pattern registered at: " + stackString)) + } } } } |