Merge pull request #446 from pjfanning/issue-443

[issue 443] actor system terminate

3 files changed, 34 insertions, 4 deletions

diff --git a/kamon-core/src/main/scala/kamon/ActorSystemTools.scala b/kamon-core/src/main/scala/kamon/ActorSystemTools.scala
new file mode 100644
index 00000000..31c8e7e7
--- /dev/null
+++ b/kamon-core/src/main/scala/kamon/ActorSystemTools.scala
@@ -0,0 +1,30 @@
+/* =========================================================================================
+ * Copyright © 2013-2016 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 kamon
+
+import scala.util.control.NonFatal
+
+import akka.actor.ActorSystem
+
+object ActorSystemTools {
+  //first try akka 2.4 system terminate() and then failover to akka 2.3 system shutdown()
+  private[kamon] def terminateActorSystem(system: ActorSystem): Unit = {
+    try {
+      system.terminate()
+    } catch {
+      case NonFatal(e) => system.shutdown()
+    }
+  }
+}
diff --git a/kamon-core/src/main/scala/kamon/Kamon.scala b/kamon-core/src/main/scala/kamon/Kamon.scala
index 61480073..c02d0505 100644
--- a/kamon-core/src/main/scala/kamon/Kamon.scala
+++ b/kamon-core/src/main/scala/kamon/Kamon.scala
@@ -76,7 +76,7 @@ object Kamon {
 
     def shutdown(): Unit = {
       if (started) {
-        actorSystem.shutdown()
+        ActorSystemTools.terminateActorSystem(actorSystem)
       }
     }
 
diff --git a/kamon-core/src/test/scala/kamon/testkit/BaseKamonSpec.scala b/kamon-core/src/test/scala/kamon/testkit/BaseKamonSpec.scala
index a615dde4..995f15fa 100644
--- a/kamon-core/src/test/scala/kamon/testkit/BaseKamonSpec.scala
+++ b/kamon-core/src/test/scala/kamon/testkit/BaseKamonSpec.scala
@@ -19,7 +19,7 @@ package kamon.testkit
 import akka.actor.ActorSystem
 import akka.testkit.{ImplicitSender, TestKitBase}
 import com.typesafe.config.Config
-import kamon.Kamon
+import kamon.{ActorSystemTools, Kamon}
 import kamon.metric.{Entity, EntitySnapshot, SubscriptionsDispatcher}
 import kamon.trace.TraceContext
 import kamon.util.LazyActorRef
@@ -27,7 +27,7 @@ import org.scalatest.{BeforeAndAfterAll, Matchers, WordSpecLike}
 
 abstract class BaseKamonSpec(actorSystemName: String) extends TestKitBase with WordSpecLike with Matchers with ImplicitSender with BeforeAndAfterAll {
   lazy val collectionContext = Kamon.metrics.buildDefaultCollectionContext
-  implicit lazy val system: ActorSystem = {
+  override implicit lazy val system: ActorSystem = {
     Kamon.start(mergedConfig)
     ActorSystem(actorSystemName, mergedConfig)
   }
@@ -65,6 +65,6 @@ abstract class BaseKamonSpec(actorSystemName: String) extends TestKitBase with W
 
   override protected def afterAll(): Unit = {
     Kamon.shutdown()
-    system.shutdown()
+    ActorSystemTools.terminateActorSystem(system)
   }
 }