aboutsummaryrefslogtreecommitdiff
path: root/kamon-newrelic/src/main/scala/kamon/newrelic/AgentJsonProtocol.scala
diff options
context:
space:
mode:
authorDiego Parra <diegolparra@gmail.com>2013-11-26 15:54:10 -0300
committerDiego Parra <diegolparra@gmail.com>2013-11-26 15:54:10 -0300
commit5e0b032bfef9509e64af2960452aed44b6e6cb22 (patch)
tree464573c5093b966eaddc65b52244bb1b50c03857 /kamon-newrelic/src/main/scala/kamon/newrelic/AgentJsonProtocol.scala
parentdad8547a63d65a5b929346310d53ba2ab45d615c (diff)
downloadKamon-5e0b032bfef9509e64af2960452aed44b6e6cb22.tar.gz
Kamon-5e0b032bfef9509e64af2960452aed44b6e6cb22.tar.bz2
Kamon-5e0b032bfef9509e64af2960452aed44b6e6cb22.zip
added scalariform
Diffstat (limited to 'kamon-newrelic/src/main/scala/kamon/newrelic/AgentJsonProtocol.scala')
-rw-r--r--kamon-newrelic/src/main/scala/kamon/newrelic/AgentJsonProtocol.scala23
1 files changed, 9 insertions, 14 deletions
diff --git a/kamon-newrelic/src/main/scala/kamon/newrelic/AgentJsonProtocol.scala b/kamon-newrelic/src/main/scala/kamon/newrelic/AgentJsonProtocol.scala
index b133aee0..da8199ab 100644
--- a/kamon-newrelic/src/main/scala/kamon/newrelic/AgentJsonProtocol.scala
+++ b/kamon-newrelic/src/main/scala/kamon/newrelic/AgentJsonProtocol.scala
@@ -25,18 +25,16 @@ object AgentJsonProtocol extends DefaultJsonProtocol {
JsArray(
JsObject(
"agent_version" -> JsString("3.1.0"),
- "app_name" -> JsArray(JsString(obj.appName)),
- "host" -> JsString(obj.host),
- "identifier" -> JsString(s"java:${obj.appName}"),
- "language" -> JsString("java"),
- "pid" -> JsNumber(obj.pid)
- )
- )
+ "app_name" -> JsArray(JsString(obj.appName)),
+ "host" -> JsString(obj.host),
+ "identifier" -> JsString(s"java:${obj.appName}"),
+ "language" -> JsString("java"),
+ "pid" -> JsNumber(obj.pid)))
}
import NewRelicMetric._
- implicit def listWriter[T : JsonWriter] = new JsonWriter[List[T]] {
+ implicit def listWriter[T: JsonWriter] = new JsonWriter[List[T]] {
def write(list: List[T]) = JsArray(list.map(_.toJson))
}
@@ -46,16 +44,14 @@ object AgentJsonProtocol extends DefaultJsonProtocol {
JsArray(
JsObject(
"name" -> JsString(id.name) // TODO Include scope
- ),
+ ),
JsArray(
JsNumber(data.callCount),
JsNumber(data.total),
JsNumber(data.totalExclusive),
JsNumber(data.min),
JsNumber(data.max),
- JsNumber(data.sumOfSquares)
- )
- )
+ JsNumber(data.sumOfSquares)))
}
}
@@ -65,7 +61,6 @@ object AgentJsonProtocol extends DefaultJsonProtocol {
JsNumber(obj.runId),
JsNumber(obj.start),
JsNumber(obj.end),
- obj.metrics.toJson
- )
+ obj.metrics.toJson)
}
}