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 | a80034229b12d42b420a9b2cc10bf23f8c5f613b (patch) | |
tree | 812d3756ffb1dd74f014a07959c79fd2e651f943 /kamon-testkit | |
parent | 1f873f6f28b92db54d97ce82c967866de41008d1 (diff) | |
parent | edceb598dd986c7a0b22f2f89e8dc9f8c0da19e8 (diff) | |
download | Kamon-a80034229b12d42b420a9b2cc10bf23f8c5f613b.tar.gz Kamon-a80034229b12d42b420a9b2cc10bf23f8c5f613b.tar.bz2 Kamon-a80034229b12d42b420a9b2cc10bf23f8c5f613b.zip |
Merge branch 'wip/improve-metric-recorders-infrastructure'
Conflicts:
kamon-system-metrics/src/main/scala/kamon/system/SystemMetricsCollector.scala
Diffstat (limited to 'kamon-testkit')
-rw-r--r-- | kamon-testkit/src/main/scala/testkit/AkkaExtensionSwap.scala | 31 | ||||
-rw-r--r-- | kamon-testkit/src/main/scala/testkit/TestProbeInstrumentation.scala | 4 |
2 files changed, 33 insertions, 2 deletions
diff --git a/kamon-testkit/src/main/scala/testkit/AkkaExtensionSwap.scala b/kamon-testkit/src/main/scala/testkit/AkkaExtensionSwap.scala new file mode 100644 index 00000000..2f77df95 --- /dev/null +++ b/kamon-testkit/src/main/scala/testkit/AkkaExtensionSwap.scala @@ -0,0 +1,31 @@ +/* + * ========================================================================================= + * 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 testkit + +import java.util.concurrent.ConcurrentHashMap + +import akka.actor.{ ActorSystem, Extension, ExtensionId } + +object AkkaExtensionSwap { + def swap(system: ActorSystem, key: ExtensionId[_], value: Extension): Unit = { + val extensionsField = system.getClass.getDeclaredField("extensions") + extensionsField.setAccessible(true) + + val extensions = extensionsField.get(system).asInstanceOf[ConcurrentHashMap[ExtensionId[_], AnyRef]] + extensions.put(key, value) + } +} diff --git a/kamon-testkit/src/main/scala/testkit/TestProbeInstrumentation.scala b/kamon-testkit/src/main/scala/testkit/TestProbeInstrumentation.scala index 825cc718..9e736971 100644 --- a/kamon-testkit/src/main/scala/testkit/TestProbeInstrumentation.scala +++ b/kamon-testkit/src/main/scala/testkit/TestProbeInstrumentation.scala @@ -17,7 +17,7 @@ package akka.testkit import org.aspectj.lang.annotation._ -import kamon.trace.{ EmptyTraceContext, TraceContextAware, TraceRecorder } +import kamon.trace.{ EmptyTraceContext, TraceContextAware, TraceContext } import org.aspectj.lang.ProceedingJoinPoint import akka.testkit.TestActor.RealMessage @@ -46,7 +46,7 @@ class TestProbeInstrumentation { case _ ⇒ EmptyTraceContext } - TraceRecorder.withTraceContext(traceContext) { + TraceContext.withContext(traceContext) { pjp.proceed } } |