1 files changed, 7 insertions, 6 deletions
diff --git a/kamon-core/src/main/scala/kamon/Kamon.scala b/kamon-core/src/main/scala/kamon/Kamon.scala
index e83f6a5c..6e0a260d 100644
--- a/kamon-core/src/main/scala/kamon/Kamon.scala
+++ b/kamon-core/src/main/scala/kamon/Kamon.scala
@@ -15,18 +15,17 @@
 
 package kamon
 
-import com.typesafe.config.{Config, ConfigFactory}
-import kamon.metric._
-import kamon.trace._
-import kamon.util.{Filters, Registration}
-
-import scala.concurrent.Future
 import java.time.Duration
 import java.util.concurrent.{Executors, ScheduledExecutorService, ScheduledThreadPoolExecutor}
 
+import com.typesafe.config.{Config, ConfigFactory}
 import kamon.context.{Codecs, Context, Key, Storage}
+import kamon.metric._
+import kamon.trace._
+import kamon.util.{Filters, Registration}
 import org.slf4j.LoggerFactory
 
+import scala.concurrent.Future
 import scala.util.Try
 
 
@@ -45,6 +44,8 @@ object Kamon extends MetricLookup with ReporterRegistry with Tracer {
   private val _contextCodec = new Codecs(_config)
   private var _onReconfigureHooks = Seq.empty[OnReconfigureHook]
 
+  sys.addShutdownHook(() => _scheduler.shutdown())
+
   def environment: Environment =
     _environment