3 files changed, 3 insertions, 53 deletions
diff --git a/kamon-core/src/main/scala-2.11/kamon/ActorSystemTools.scala b/kamon-core/src/main/scala-2.11/kamon/ActorSystemTools.scala
deleted file mode 100644
index 01dd4234..00000000
--- a/kamon-core/src/main/scala-2.11/kamon/ActorSystemTools.scala
+++ /dev/null
@@ -1,25 +0,0 @@
-/* =========================================================================================
- * 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 {
-  private[kamon] def terminateActorSystem(system: ActorSystem): Unit = {
-    system.shutdown()
-  }
-}
diff --git a/kamon-core/src/main/scala-2.12/kamon/ActorSystemTools.scala b/kamon-core/src/main/scala-2.12/kamon/ActorSystemTools.scala
deleted file mode 100644
index 762201d5..00000000
--- a/kamon-core/src/main/scala-2.12/kamon/ActorSystemTools.scala
+++ /dev/null
@@ -1,25 +0,0 @@
-/* =========================================================================================
- * 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 akka.actor.ActorSystem
-
-import scala.util.control.NonFatal
-
-object ActorSystemTools {
-  private[kamon] def terminateActorSystem(system: ActorSystem): Unit = {
-    system.terminate()
-  }
-}
diff --git a/kamon-core/src/main/scala-2.10/kamon/ActorSystemTools.scala b/kamon-core/src/main/scala/kamon/ActorSystemTools.scala
index 01dd4234..5e7149ce 100644
--- a/kamon-core/src/main/scala-2.10/kamon/ActorSystemTools.scala
+++ b/kamon-core/src/main/scala/kamon/ActorSystemTools.scala
@@ -14,12 +14,12 @@
  */
 package kamon
 
-import scala.util.control.NonFatal
-
 import akka.actor.ActorSystem
 
 object ActorSystemTools {
   private[kamon] def terminateActorSystem(system: ActorSystem): Unit = {
-    system.shutdown()
+    // Use system.shutdown() if it exists (akka 2.4 and lower), system.terminate() otherwise (akka 2.5+)
+    system.getClass.getMethods.find(_.getName == "shutdown").map(_.invoke(system))
+      .getOrElse(system.getClass.getMethod("terminate").invoke(system))
   }
 }