From 8f23d7e85e2ef8739159a4fb895a4a6f8c4eedef Mon Sep 17 00:00:00 2001 From: Nils-Helge Garli Hegvik Date: Wed, 8 Jul 2015 12:50:25 +0200 Subject: ! core: cleanup entity on removal --- kamon-core/src/main/scala/kamon/metric/MetricsModule.scala | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) mode change 100644 => 100755 kamon-core/src/main/scala/kamon/metric/MetricsModule.scala (limited to 'kamon-core') diff --git a/kamon-core/src/main/scala/kamon/metric/MetricsModule.scala b/kamon-core/src/main/scala/kamon/metric/MetricsModule.scala old mode 100644 new mode 100755 index ff622443..8b5a6188 --- 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) -- cgit v1.2.3