diff options
Diffstat (limited to 'kamon-core/src')
12 files changed, 26 insertions, 22 deletions
diff --git a/kamon-core/src/main/scala/kamon/instrumentation/akka/AskPatternInstrumentation.scala b/kamon-core/src/main/scala/kamon/instrumentation/akka/AskPatternInstrumentation.scala index 3bf13ce2..5e8175fa 100644 --- a/kamon-core/src/main/scala/kamon/instrumentation/akka/AskPatternInstrumentation.scala +++ b/kamon-core/src/main/scala/kamon/instrumentation/akka/AskPatternInstrumentation.scala @@ -30,7 +30,7 @@ class AskPatternInstrumentation { class StackTraceCaptureException extends Throwable - @Pointcut(value = "execution(* akka.pattern.PromiseActorRef$.apply(..)) && args(provider, *, *)", argNames = "provider") + @Pointcut(value = "execution(* akka.pattern.PromiseActorRef$.apply(..)) && args(provider, *)", argNames = "provider") def promiseActorRefApply(provider: ActorRefProvider): Unit = {} @AfterReturning(pointcut = "promiseActorRefApply(provider)", returning = "promiseActor") diff --git a/kamon-core/src/main/scala/kamon/metric/MetricsExtension.scala b/kamon-core/src/main/scala/kamon/metric/MetricsExtension.scala index 00214f51..7febb0ec 100644 --- a/kamon-core/src/main/scala/kamon/metric/MetricsExtension.scala +++ b/kamon-core/src/main/scala/kamon/metric/MetricsExtension.scala @@ -38,7 +38,7 @@ class MetricsExtension(system: ExtendedActorSystem) extends Kamon.Extension { val gaugeRecordingsDispatcher = system.dispatchers.lookup(metricsExtConfig.getString("dispatchers.gauge-recordings")) /** Configuration Settings */ - val gaugeRecordingInterval = metricsExtConfig.getDuration("gauge-recording-interval", TimeUnit.MILLISECONDS) + val gaugeRecordingInterval: Long = metricsExtConfig.getMilliseconds("gauge-recording-interval") val storage = TrieMap[MetricGroupIdentity, MetricGroupRecorder]() val filters = loadFilters(metricsExtConfig) diff --git a/kamon-core/src/main/scala/kamon/metric/Subscriptions.scala b/kamon-core/src/main/scala/kamon/metric/Subscriptions.scala index c6571507..1ba9f312 100644 --- a/kamon-core/src/main/scala/kamon/metric/Subscriptions.scala +++ b/kamon-core/src/main/scala/kamon/metric/Subscriptions.scala @@ -99,7 +99,7 @@ class Subscriptions extends Actor { def scheduleFlushMessage(): Cancellable = { val config = context.system.settings.config - val tickInterval = Duration(config.getDuration("kamon.metrics.tick-interval", TimeUnit.NANOSECONDS), TimeUnit.NANOSECONDS) + val tickInterval = Duration(config.getMilliseconds("kamon.metrics.tick-interval"), TimeUnit.MILLISECONDS) context.system.scheduler.schedule(tickInterval, tickInterval, self, FlushMetrics)(context.dispatcher) } } diff --git a/kamon-core/src/main/scala/kamon/metric/instrument/Gauge.scala b/kamon-core/src/main/scala/kamon/metric/instrument/Gauge.scala index efd7d78f..0c1815c3 100644 --- a/kamon-core/src/main/scala/kamon/metric/instrument/Gauge.scala +++ b/kamon-core/src/main/scala/kamon/metric/instrument/Gauge.scala @@ -49,7 +49,7 @@ object Gauge { val highest = config.getLong("highest-trackable-value") val significantDigits = config.getInt("significant-value-digits") - val refreshInterval = config.getDuration("refresh-interval", TimeUnit.MILLISECONDS) + val refreshInterval = config.getMilliseconds("refresh-interval").toInt Gauge(Histogram.Precision(significantDigits), highest, scale, refreshInterval.millis, system)(currentValueCollector) } diff --git a/kamon-core/src/main/scala/kamon/metric/instrument/MinMaxCounter.scala b/kamon-core/src/main/scala/kamon/metric/instrument/MinMaxCounter.scala index 471e7bd4..b8d163cc 100644 --- a/kamon-core/src/main/scala/kamon/metric/instrument/MinMaxCounter.scala +++ b/kamon-core/src/main/scala/kamon/metric/instrument/MinMaxCounter.scala @@ -56,7 +56,7 @@ object MinMaxCounter { val highest = config.getLong("highest-trackable-value") val significantDigits = config.getInt("significant-value-digits") - val refreshInterval = config.getDuration("refresh-interval", TimeUnit.MILLISECONDS) + val refreshInterval = config.getMilliseconds("refresh-interval").toInt apply(highest, Histogram.Precision(significantDigits), Scale.Unit, refreshInterval.millis, system) } diff --git a/kamon-core/src/test/scala/kamon/instrumentation/akka/ActorCellInstrumentationSpec.scala b/kamon-core/src/test/scala/kamon/instrumentation/akka/ActorCellInstrumentationSpec.scala index 0f682500..ee3857c3 100644 --- a/kamon-core/src/test/scala/kamon/instrumentation/akka/ActorCellInstrumentationSpec.scala +++ b/kamon-core/src/test/scala/kamon/instrumentation/akka/ActorCellInstrumentationSpec.scala @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. * ========================================================== */ -package kamon.instrumentation.akka +package kamon.trace.instrumentation -import akka.actor.{ Actor, ActorSystem, Props } -import akka.pattern.{ ask, pipe } -import akka.routing.RoundRobinPool -import akka.testkit.{ ImplicitSender, TestKit } -import akka.util.Timeout -import kamon.trace.TraceRecorder import org.scalatest.WordSpecLike +import akka.actor.{ Actor, Props, ActorSystem } +import akka.testkit.{ ImplicitSender, TestKit } +import kamon.trace.TraceRecorder +import akka.pattern.{ pipe, ask } +import akka.util.Timeout import scala.concurrent.duration._ +import akka.routing.{ RoundRobinRouter } class ActorCellInstrumentationSpec extends TestKit(ActorSystem("actor-cell-instrumentation-spec")) with WordSpecLike with ImplicitSender { @@ -75,7 +75,7 @@ class ActorCellInstrumentationSpec extends TestKit(ActorSystem("actor-cell-instr } trait RoutedEchoActorFixture extends EchoActorFixture { - override val ctxEchoActor = system.actorOf(Props[TraceContextEcho].withRouter(RoundRobinPool(nrOfInstances = 1))) + override val ctxEchoActor = system.actorOf(Props[TraceContextEcho].withRouter(RoundRobinRouter(nrOfInstances = 1))) } } diff --git a/kamon-core/src/test/scala/kamon/metric/ActorMetricsSpec.scala b/kamon-core/src/test/scala/kamon/metric/ActorMetricsSpec.scala index a05dc344..0029fd7c 100644 --- a/kamon-core/src/test/scala/kamon/metric/ActorMetricsSpec.scala +++ b/kamon-core/src/test/scala/kamon/metric/ActorMetricsSpec.scala @@ -19,16 +19,15 @@ import java.nio.LongBuffer import akka.instrumentation.ActorCellMetrics import kamon.metric.ActorMetricsTestActor._ -import kamon.metric.instrument.Histogram.MutableRecord import org.scalatest.{ WordSpecLike, Matchers } import akka.testkit.{ ImplicitSender, TestProbe, TestKitBase } import akka.actor._ import com.typesafe.config.ConfigFactory import scala.concurrent.duration._ -import kamon.metric.Subscriptions.TickMetricSnapshot import kamon.metric.ActorMetrics.{ ActorMetricsRecorder, ActorMetricSnapshot } -class ActorMetricsSpec extends TestKitBase with WordSpecLike with Matchers with ImplicitSender { +class ActorMetricsSpec extends TestKitBase with WordSpecLike with Matchers { + implicit def self = testActor implicit lazy val system: ActorSystem = ActorSystem("actor-metrics-spec", ConfigFactory.parseString( """ |kamon.metrics { diff --git a/kamon-core/src/test/scala/kamon/metric/SubscriptionsProtocolSpec.scala b/kamon-core/src/test/scala/kamon/metric/SubscriptionsProtocolSpec.scala index 9144725e..60923a2b 100644 --- a/kamon-core/src/test/scala/kamon/metric/SubscriptionsProtocolSpec.scala +++ b/kamon-core/src/test/scala/kamon/metric/SubscriptionsProtocolSpec.scala @@ -8,7 +8,8 @@ import kamon.metric.Subscriptions.TickMetricSnapshot import org.scalatest.{ Matchers, WordSpecLike } import scala.concurrent.duration._ -class SubscriptionsProtocolSpec extends TestKitBase with WordSpecLike with Matchers with ImplicitSender { +class SubscriptionsProtocolSpec extends TestKitBase with WordSpecLike with Matchers { + implicit def self = testActor implicit lazy val system: ActorSystem = ActorSystem("subscriptions-protocol-spec", ConfigFactory.parseString( """ |kamon.metrics { diff --git a/kamon-core/src/test/scala/kamon/metric/TickMetricSnapshotBufferSpec.scala b/kamon-core/src/test/scala/kamon/metric/TickMetricSnapshotBufferSpec.scala index 79c9c63b..27eb64e2 100644 --- a/kamon-core/src/test/scala/kamon/metric/TickMetricSnapshotBufferSpec.scala +++ b/kamon-core/src/test/scala/kamon/metric/TickMetricSnapshotBufferSpec.scala @@ -26,7 +26,8 @@ import akka.actor.ActorSystem import scala.concurrent.duration._ import kamon.metric.Subscriptions.TickMetricSnapshot -class TickMetricSnapshotBufferSpec extends TestKitBase with WordSpecLike with Matchers with ImplicitSender { +class TickMetricSnapshotBufferSpec extends TestKitBase with WordSpecLike with Matchers { + implicit def self = testActor implicit lazy val system: ActorSystem = ActorSystem("trace-metrics-spec", ConfigFactory.parseString( """ |kamon.metrics { diff --git a/kamon-core/src/test/scala/kamon/metric/TraceMetricsSpec.scala b/kamon-core/src/test/scala/kamon/metric/TraceMetricsSpec.scala index 8a87408d..23977971 100644 --- a/kamon-core/src/test/scala/kamon/metric/TraceMetricsSpec.scala +++ b/kamon-core/src/test/scala/kamon/metric/TraceMetricsSpec.scala @@ -9,7 +9,8 @@ import kamon.trace.TraceContext.SegmentIdentity import kamon.trace.TraceRecorder import org.scalatest.{ Matchers, WordSpecLike } -class TraceMetricsSpec extends TestKitBase with WordSpecLike with Matchers with ImplicitSender { +class TraceMetricsSpec extends TestKitBase with WordSpecLike with Matchers { + implicit def self = testActor implicit lazy val system: ActorSystem = ActorSystem("trace-metrics-spec", ConfigFactory.parseString( """ |kamon.metrics { diff --git a/kamon-core/src/test/scala/kamon/metric/UserMetricsSpec.scala b/kamon-core/src/test/scala/kamon/metric/UserMetricsSpec.scala index 8f1d06d8..66ee49ea 100644 --- a/kamon-core/src/test/scala/kamon/metric/UserMetricsSpec.scala +++ b/kamon-core/src/test/scala/kamon/metric/UserMetricsSpec.scala @@ -10,7 +10,8 @@ import kamon.metric.instrument.Histogram.MutableRecord import org.scalatest.{ Matchers, WordSpecLike } import scala.concurrent.duration._ -class UserMetricsSpec extends TestKitBase with WordSpecLike with Matchers with ImplicitSender { +class UserMetricsSpec extends TestKitBase with WordSpecLike with Matchers { + implicit def self = testActor implicit lazy val system: ActorSystem = ActorSystem("actor-metrics-spec", ConfigFactory.parseString( """ |kamon.metrics { diff --git a/kamon-core/src/test/scala/kamon/trace/TraceContextManipulationSpec.scala b/kamon-core/src/test/scala/kamon/trace/TraceContextManipulationSpec.scala index 4d0049f1..d073f68e 100644 --- a/kamon-core/src/test/scala/kamon/trace/TraceContextManipulationSpec.scala +++ b/kamon-core/src/test/scala/kamon/trace/TraceContextManipulationSpec.scala @@ -1,12 +1,13 @@ package kamon.trace import akka.actor.ActorSystem -import akka.testkit.{ ImplicitSender, TestKitBase } +import akka.testkit.TestKitBase import com.typesafe.config.ConfigFactory import kamon.trace.TraceContext.SegmentIdentity import org.scalatest.{ Matchers, WordSpecLike } -class TraceContextManipulationSpec extends TestKitBase with WordSpecLike with Matchers with ImplicitSender { +class TraceContextManipulationSpec extends TestKitBase with WordSpecLike with Matchers { + implicit def self = testActor implicit lazy val system: ActorSystem = ActorSystem("trace-metrics-spec", ConfigFactory.parseString( """ |kamon.metrics { |