From 204d14bcdf168fd8ccc1e5d7b84eb90d97064c7d Mon Sep 17 00:00:00 2001
From: João Ferreira <jtjeferreira@gmail.com>
Date: Sun, 15 Mar 2015 21:51:00 +0000
Subject: = play-example: update to latest version

---
 kamon-examples/kamon-play-example/app/Global.scala                | 8 +++++++-
 .../kamon-play-example/app/controllers/KamonPlayExample.scala     | 3 +--
 .../kamon-play-example/app/filters/TraceLocalFilter.scala         | 2 +-
 kamon-examples/kamon-play-example/conf/application.conf           | 2 +-
 kamon-examples/kamon-play-example/project/Build.scala             | 4 ++--
 kamon-examples/kamon-play-example/project/plugins.sbt             | 2 +-
 6 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/kamon-examples/kamon-play-example/app/Global.scala b/kamon-examples/kamon-play-example/app/Global.scala
index 535ea308..8d43fbdc 100644
--- a/kamon-examples/kamon-play-example/app/Global.scala
+++ b/kamon-examples/kamon-play-example/app/Global.scala
@@ -16,5 +16,11 @@
 
 import filters.TraceLocalFilter
 import play.api.mvc.WithFilters
+import play.api.Application
+import kamon.Kamon
 
-object Global extends WithFilters(TraceLocalFilter)
\ No newline at end of file
+object Global extends WithFilters(TraceLocalFilter) {
+  override def onStart(app: Application) {
+    Kamon.start()
+  }
+}
diff --git a/kamon-examples/kamon-play-example/app/controllers/KamonPlayExample.scala b/kamon-examples/kamon-play-example/app/controllers/KamonPlayExample.scala
index b3a8c11f..dea2b879 100644
--- a/kamon-examples/kamon-play-example/app/controllers/KamonPlayExample.scala
+++ b/kamon-examples/kamon-play-example/app/controllers/KamonPlayExample.scala
@@ -17,7 +17,6 @@ package controllers
 
 import filters.{TraceLocalContainer, TraceLocalKey}
 import kamon.Kamon
-import kamon.metric.UserMetrics
 import kamon.play.action.TraceName
 import kamon.trace.TraceLocal
 import play.api.Logger
@@ -56,7 +55,7 @@ import scala.concurrent._
 object KamonPlayExample extends Controller {
 
   val logger = Logger(this.getClass)
-  val counter = Kamon(UserMetrics)(Akka.system()).registerCounter("my-counter")
+  val counter = Kamon.metrics.counter("my-counter")
 
   def sayHello = Action.async {
     Future {
diff --git a/kamon-examples/kamon-play-example/app/filters/TraceLocalFilter.scala b/kamon-examples/kamon-play-example/app/filters/TraceLocalFilter.scala
index c1d5b92e..8a92aa66 100644
--- a/kamon-examples/kamon-play-example/app/filters/TraceLocalFilter.scala
+++ b/kamon-examples/kamon-play-example/app/filters/TraceLocalFilter.scala
@@ -16,7 +16,7 @@
 
 package filters
 
-import kamon.trace.{TraceRecorder, TraceLocal}
+import kamon.trace.TraceLocal
 import play.api.Logger
 import play.api.mvc.{Result, RequestHeader, Filter}
 import play.api.libs.concurrent.Execution.Implicits.defaultContext
diff --git a/kamon-examples/kamon-play-example/conf/application.conf b/kamon-examples/kamon-play-example/conf/application.conf
index 7d9fba80..e1b4d770 100644
--- a/kamon-examples/kamon-play-example/conf/application.conf
+++ b/kamon-examples/kamon-play-example/conf/application.conf
@@ -5,7 +5,7 @@ akka {
 
 kamon {
 
-  metrics {
+  metric {
     tick-interval = 1 second
   }
 
diff --git a/kamon-examples/kamon-play-example/project/Build.scala b/kamon-examples/kamon-play-example/project/Build.scala
index 080ef4a5..1896c932 100644
--- a/kamon-examples/kamon-play-example/project/Build.scala
+++ b/kamon-examples/kamon-play-example/project/Build.scala
@@ -20,7 +20,7 @@ object ApplicationBuild extends Build {
     )
 
   val defaultSettings = Seq(
-      scalaVersion := "2.10.4",
+      scalaVersion := "2.11.5",
       resolvers ++= resolutionRepos,
       scalacOptions := Seq(
         "-encoding",
@@ -35,7 +35,7 @@ object ApplicationBuild extends Build {
         "-Xlog-reflective-calls"
       ))
 
-  val kamonVersion = "0.3.4"
+  val kamonVersion = "0.3.6-125bee567e0b18ea5ec10f3a1fe76409673011d9"
 
   val dependencies = Seq(
     "io.kamon"    %% "kamon-core"           % kamonVersion,
diff --git a/kamon-examples/kamon-play-example/project/plugins.sbt b/kamon-examples/kamon-play-example/project/plugins.sbt
index 6f7c1c8b..b4f51541 100644
--- a/kamon-examples/kamon-play-example/project/plugins.sbt
+++ b/kamon-examples/kamon-play-example/project/plugins.sbt
@@ -5,5 +5,5 @@ logLevel := Level.Warn
 resolvers += "Typesafe repository" at "http://repo.typesafe.com/typesafe/releases/"
 
 // Use the Play sbt plugin for Play projects
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.3.4")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.3.8")
 
-- 
cgit v1.2.3