aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Topolnjak <ivantopo@gmail.com>2015-07-10 19:48:40 +0200
committerIvan Topolnjak <ivantopo@gmail.com>2015-07-10 19:48:40 +0200
commit3cb9613e46f7ce1dc166cdc3e52d91e025b555b0 (patch)
tree4df425a817607977061cb212fdfcb90523227bdf
parentda471e354ad1757a989ff40c06bafc1f7e332d17 (diff)
parentb522f98ab26ec2c97b617392225b84e7912d604a (diff)
downloadKamon-3cb9613e46f7ce1dc166cdc3e52d91e025b555b0.tar.gz
Kamon-3cb9613e46f7ce1dc166cdc3e52d91e025b555b0.tar.bz2
Kamon-3cb9613e46f7ce1dc166cdc3e52d91e025b555b0.zip
Merge pull request #229 from nilsga/master
! core: cleanup entity on removal
-rwxr-xr-x[-rw-r--r--]kamon-core/src/main/scala/kamon/metric/MetricsModule.scala7
1 files changed, 5 insertions, 2 deletions
diff --git a/kamon-core/src/main/scala/kamon/metric/MetricsModule.scala b/kamon-core/src/main/scala/kamon/metric/MetricsModule.scala
index ff622443..8b5a6188 100644..100755
--- a/kamon-core/src/main/scala/kamon/metric/MetricsModule.scala
+++ b/kamon-core/src/main/scala/kamon/metric/MetricsModule.scala
@@ -313,8 +313,11 @@ private[kamon] class MetricsModuleImpl(config: Config) extends MetricsModule {
}, _.cleanup).asInstanceOf[T]
}
- def removeEntity(entity: Entity): Boolean =
- _trackedEntities.remove(entity).isDefined
+ def removeEntity(entity: Entity): Boolean = {
+ val removedEntity = _trackedEntities.remove(entity)
+ removedEntity.foreach(_.cleanup)
+ removedEntity.isDefined
+ }
def find(entity: Entity): Option[EntityRecorder] =
_trackedEntities.get(entity)