diff options
Diffstat (limited to 'kamon-core/src/main/scala')
-rw-r--r-- | kamon-core/src/main/scala/kamon/instrumentation/akka/RoutedActorCellInstrumentation.scala | 143 | ||||
-rw-r--r-- | kamon-core/src/main/scala/kamon/metric/RouterMetrics.scala | 11 |
2 files changed, 1 insertions, 153 deletions
diff --git a/kamon-core/src/main/scala/kamon/instrumentation/akka/RoutedActorCellInstrumentation.scala b/kamon-core/src/main/scala/kamon/instrumentation/akka/RoutedActorCellInstrumentation.scala deleted file mode 100644 index f75080db..00000000 --- a/kamon-core/src/main/scala/kamon/instrumentation/akka/RoutedActorCellInstrumentation.scala +++ /dev/null @@ -1,143 +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 akka.instrumentation - -import akka.actor.{ActorRef, ActorSystem, Props} -import akka.dispatch.MessageDispatcher -import akka.routing.RoutedActorCell -import kamon.metric.RouterMetrics -import kamon.metric.RouterMetrics.RouterMetricsRecorder -import org.aspectj.lang.annotation._ - -@Aspect -class RoutedActorCellInstrumentation { - - @Pointcut("execution(akka.routing.RoutedActorCell.new(..)) && this(cell) && args(system, ref, routerProps, routerDispatcher, supervisor)") - def actorCellCreation(cell: RoutedActorCell, system: ActorSystem, ref: ActorRef, routerProps: Props, routerDispatcher: MessageDispatcher, supervisor: ActorRef ): Unit = {} - -// @After("actorCellCreation(cell, system, ref, routerProps, routerDispatcher, supervisor)") - @After("execution(akka.routing.RoutedActorCell.new(..)) && this(cell) && args(*, ref, *, *, *, *)") -// def afterCreation(cell: RoutedActorCell, system: ActorSystem, ref: ActorRef, routerProps: Props, routerDispatcher: MessageDispatcher, supervisor: ActorRef): Unit = { - def a(cell: RoutedActorCell, ref: ActorRef) = { - - print("adf;kjaskadjlfaj"+ ref) -// cell.router.routees -// val metricsExtension = Kamon(Metrics)(system) -// val metricIdentity = RouterMetrics(ref.path.elements.mkString("/")) -// val cellWithMetrics = cell.asInstanceOf[RoutedActorCellMetrics] -// -// cellWithMetrics.metricIdentity = metricIdentity -// cellWithMetrics.routerMetricsRecorder = metricsExtension.register(metricIdentity, RouterMetrics.Factory) - } -} - -trait RoutedActorCellMetrics { - var metricIdentity: RouterMetrics = _ - var routerMetricsRecorder: Option[RouterMetricsRecorder] = _ -} - -@Aspect -class RoutedActorCellMetricsIntoRoutedActorCellMixin { - - @DeclareMixin("akka.routing.RoutedActorCell") - def mixinRoutedActorCellMetricsToRoutedActorCell: RoutedActorCellMetrics = new RoutedActorCellMetrics {} -} - -// @Pointcut("(execution(* akka.actor.ActorCell.invoke(*)) || execution(* akka.routing.RoutedActorCell.sendMessage(*))) && this(cell) && args(envelope)") -// def invokingActorBehaviourAtActorCell(cell: ActorCell, envelope: Envelope) = {} -// -// @Around("invokingActorBehaviourAtActorCell(cell, envelope)") -// def aroundBehaviourInvoke(pjp: ProceedingJoinPoint, cell: ActorCell, envelope: Envelope): Any = { -// val timestampBeforeProcessing = System.nanoTime() -// val contextAndTimestamp = envelope.asInstanceOf[TraceContextAware] -// val cellWithMetrics = cell.asInstanceOf[ActorCellMetrics] -// -// try { -// TraceRecorder.withInlineTraceContextReplacement(contextAndTimestamp.traceContext) { -// pjp.proceed() -// } -// } finally { -// cellWithMetrics.actorMetricsRecorder.map { -// am ⇒ -// am.processingTime.record(System.nanoTime() - timestampBeforeProcessing) -// am.timeInMailbox.record(timestampBeforeProcessing - contextAndTimestamp.captureNanoTime) -// am.mailboxSize.decrement() -// } -// } -// } -// -// @Pointcut("execution(* akka.actor.ActorCell.sendMessage(*)) && this(cell)") -// def sendingMessageToActorCell(cell: ActorCell): Unit = {} -// -// @After("sendingMessageToActorCell(cell)") -// def afterSendMessageToActorCell(cell: ActorCell): Unit = { -// val cellWithMetrics = cell.asInstanceOf[ActorCellMetrics] -// cellWithMetrics.actorMetricsRecorder.map(am ⇒ am.mailboxSize.increment()) -// } -// -// @Pointcut("execution(* akka.actor.ActorCell.stop()) && this(cell)") -// def actorStop(cell: ActorCell): Unit = {} -// -// @After("actorStop(cell)") -// def afterStop(cell: ActorCell): Unit = { -// val cellWithMetrics = cell.asInstanceOf[ActorCellMetrics] -// -// cellWithMetrics.actorMetricsRecorder.map { p ⇒ -// Kamon(Metrics)(cell.system).unregister(cellWithMetrics.metricIdentity) -// } -// } -// -// @Pointcut("execution(* akka.actor.ActorCell.handleInvokeFailure(..)) && this(cell)") -// def actorInvokeFailure(cell: ActorCell): Unit = {} -// -// @Before("actorInvokeFailure(cell)") -// def beforeInvokeFailure(cell: ActorCell): Unit = { -// val cellWithMetrics = cell.asInstanceOf[ActorCellMetrics] -// -// cellWithMetrics.actorMetricsRecorder.map { -// am ⇒ am.errors.increment() -// } -// } -//} -// -//trait ActorCellMetrics { -// var metricIdentity: ActorMetrics = _ -// var actorMetricsRecorder: Option[ActorMetricsRecorder] = _ -//} -// -//@Aspect -//class ActorCellMetricsIntoActorCellMixin { -// -// @DeclareMixin("akka.actor.ActorCell") -// def mixinActorCellMetricsToActorCell: ActorCellMetrics = new ActorCellMetrics {} -//} -// -//@Aspect -//class TraceContextIntoEnvelopeMixin { -// -// @DeclareMixin("akka.dispatch.Envelope") -// def mixinTraceContextAwareToEnvelope: TraceContextAware = TraceContextAware.default -// -// @Pointcut("execution(akka.dispatch.Envelope.new(..)) && this(ctx)") -// def envelopeCreation(ctx: TraceContextAware): Unit = {} -// -// @After("envelopeCreation(ctx)") -// def afterEnvelopeCreation(ctx: TraceContextAware): Unit = { -// // Necessary to force the initialization of ContextAware at the moment of creation. -// ctx.traceContext -// } -//}
\ No newline at end of file diff --git a/kamon-core/src/main/scala/kamon/metric/RouterMetrics.scala b/kamon-core/src/main/scala/kamon/metric/RouterMetrics.scala index adb2a18b..9660b6ff 100644 --- a/kamon-core/src/main/scala/kamon/metric/RouterMetrics.scala +++ b/kamon-core/src/main/scala/kamon/metric/RouterMetrics.scala @@ -17,11 +17,7 @@ package kamon.metric import akka.actor.ActorSystem import com.typesafe.config.Config -<<<<<<< Updated upstream import kamon.metric.instrument.{ Counter, Histogram } -======= -import kamon.metric.instrument.{Counter, Histogram} ->>>>>>> Stashed changes case class RouterMetrics(name: String) extends MetricGroupIdentity { val category = RouterMetrics @@ -46,12 +42,7 @@ object RouterMetrics extends MetricGroupCategory { } } - case class RouterMetricSnapshot(processingTime: Histogram.Snapshot, timeInMailbox: Histogram.Snapshot, -<<<<<<< Updated upstream - errors: Counter.Snapshot) extends MetricGroupSnapshot { -======= - errors: Counter.Snapshot) extends MetricGroupSnapshot { ->>>>>>> Stashed changes + case class RouterMetricSnapshot(processingTime: Histogram.Snapshot, timeInMailbox: Histogram.Snapshot, errors: Counter.Snapshot) extends MetricGroupSnapshot { type GroupSnapshotType = RouterMetricSnapshot |