diff options
author | Ivan Topolnjak <ivantopo@gmail.com> | 2015-01-29 03:42:27 +0100 |
---|---|---|
committer | Ivan Topolnjak <ivantopo@gmail.com> | 2015-01-29 03:42:27 +0100 |
commit | 75bd9503aebee628da394a935816991e7a790092 (patch) | |
tree | f4df3333826cec805fadc14894579f1bc1054279 /kamon-core/src/main/scala/kamon/instrumentation/scalaz/FutureInstrumentation.scala | |
parent | 61089a75240f5cc21b056087f1d633dd31981c61 (diff) | |
parent | 9839db9d46312435822b6b5faffbbc445af80077 (diff) | |
download | Kamon-75bd9503aebee628da394a935816991e7a790092.tar.gz Kamon-75bd9503aebee628da394a935816991e7a790092.tar.bz2 Kamon-75bd9503aebee628da394a935816991e7a790092.zip |
Merge branch 'wip/improve-metric-recorders-infrastructure'
Conflicts:
kamon-system-metrics/src/main/scala/kamon/system/SystemMetricsCollector.scala
Diffstat (limited to 'kamon-core/src/main/scala/kamon/instrumentation/scalaz/FutureInstrumentation.scala')
-rw-r--r-- | kamon-core/src/main/scala/kamon/instrumentation/scalaz/FutureInstrumentation.scala | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/kamon-core/src/main/scala/kamon/instrumentation/scalaz/FutureInstrumentation.scala b/kamon-core/src/main/scala/kamon/instrumentation/scalaz/FutureInstrumentation.scala deleted file mode 100644 index 65caaa8f..00000000 --- a/kamon-core/src/main/scala/kamon/instrumentation/scalaz/FutureInstrumentation.scala +++ /dev/null @@ -1,47 +0,0 @@ -/* - * ========================================================================================= - * Copyright © 2013-2014 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 - * - * 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. - * ========================================================================================= - */ - -package kamon.instrumentation.scalaz - -import kamon.trace.{ TraceContextAware, TraceRecorder } -import org.aspectj.lang.ProceedingJoinPoint -import org.aspectj.lang.annotation._ - -@Aspect -class FutureInstrumentation { - - @DeclareMixin("scalaz.concurrent..* && java.util.concurrent.Callable+") - def mixinTraceContextAwareToFutureRelatedCallable: TraceContextAware = - TraceContextAware.default - - @Pointcut("execution((scalaz.concurrent..* && java.util.concurrent.Callable+).new(..)) && this(callable)") - def futureRelatedCallableCreation(callable: TraceContextAware): Unit = {} - - @After("futureRelatedCallableCreation(callable)") - def afterCreation(callable: TraceContextAware): Unit = - // Force traceContext initialization. - callable.traceContext - - @Pointcut("execution(* (scalaz.concurrent..* && java.util.concurrent.Callable+).call()) && this(callable)") - def futureRelatedCallableExecution(callable: TraceContextAware): Unit = {} - - @Around("futureRelatedCallableExecution(callable)") - def aroundExecution(pjp: ProceedingJoinPoint, callable: TraceContextAware): Any = - TraceRecorder.withInlineTraceContextReplacement(callable.traceContext) { - pjp.proceed() - } - -} |