aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Topolnak <itopolnak@despegar.com>2013-05-06 18:09:38 -0300
committerIvan Topolnak <itopolnak@despegar.com>2013-05-06 18:09:38 -0300
commit50cc3a5a6508e390746f590ea83e5473367dd59e (patch)
tree86654181e778889385a2d3c3167c363d8d8e23f6
parent2f81f03742860a0a57cebeea6f0160f3c0d80a48 (diff)
downloadKamon-50cc3a5a6508e390746f590ea83e5473367dd59e.tar.gz
Kamon-50cc3a5a6508e390746f590ea83e5473367dd59e.tar.bz2
Kamon-50cc3a5a6508e390746f590ea83e5473367dd59e.zip
fixed the metric being reported to newrelic
-rw-r--r--.gitignore4
-rw-r--r--project/Dependencies.scala3
-rw-r--r--src/main/resources/META-INF/aop.xml2
-rw-r--r--src/main/scala/akka/ActorAspect.scala1
-rw-r--r--src/main/scala/kamon/metric/NewRelicReporter.scala5
5 files changed, 11 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore
index f5b7d72a..a008d6b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,4 +10,6 @@ project/boot/
project/plugins/project/
# Scala-IDE specific
-.scala_dependencies \ No newline at end of file
+.scala_dependencies
+.idea
+.idea_modules
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index ab32fe6f..d64626f2 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -3,7 +3,8 @@ import sbt._
object Dependencies {
val resolutionRepos = Seq(
- "spray repo" at "http://repo.spray.io/"
+ "spray repo" at "http://repo.spray.io/",
+ "spray nightlies repo" at "http://nightlies.spray.io"
)
val sprayCan = "io.spray" % "spray-can" % "1.1-M7"
diff --git a/src/main/resources/META-INF/aop.xml b/src/main/resources/META-INF/aop.xml
index d678e4ad..b5e50721 100644
--- a/src/main/resources/META-INF/aop.xml
+++ b/src/main/resources/META-INF/aop.xml
@@ -3,7 +3,7 @@
<aspectj>
- <weaver options="-verbose"/>
+ <weaver options="-verbose -showWeaveInfo"/>
<aspects>
<aspect name="akka.ActorSystemAspect"/>
diff --git a/src/main/scala/akka/ActorAspect.scala b/src/main/scala/akka/ActorAspect.scala
index 2550752b..db96279c 100644
--- a/src/main/scala/akka/ActorAspect.scala
+++ b/src/main/scala/akka/ActorAspect.scala
@@ -14,6 +14,7 @@ class ActorAspect extends Metrics {
@Around("actorReceive() && this(actor)")
def around(pjp: ProceedingJoinPoint, actor: akka.actor.ActorCell): AnyRef = {
+ //println("The path is: "+actor.self.path.)
val actorName:String = actor.self.path.toString
markAndCountMeter(actorName){
diff --git a/src/main/scala/kamon/metric/NewRelicReporter.scala b/src/main/scala/kamon/metric/NewRelicReporter.scala
index fa6b29f3..7684a746 100644
--- a/src/main/scala/kamon/metric/NewRelicReporter.scala
+++ b/src/main/scala/kamon/metric/NewRelicReporter.scala
@@ -10,7 +10,10 @@ class NewRelicReporter(registry: MetricsRegistry, name: String) extends Abstract
def processMeter(name: MetricName, meter: Metered, context: String) {
println(s"Logging to NewRelic: ${meter.count()}")
- NewRelic.recordMetric("Custom/Actor/MessagesPerSecond", meter.count())
+ NewRelic.recordMetric("Custom/Actor/MessagesPerSecond", meter.meanRate().toFloat)
+
+
+
}