X-Git-Url: https://git.sesse.net/?p=nageru;a=blobdiff_plain;f=shared%2Fmetrics.cpp;fp=shared%2Fmetrics.cpp;h=91b03e83483e1335d85d747dca730d607ff10438;hp=248da38a277992289e9ae703bd1442f16ce077e5;hb=76a40fb903cb2d9b47473d48c5eaad97d957d6e7;hpb=a686614f5976c9ca8b3a7e6248cdeb8c5f2c66ec

diff --git a/shared/metrics.cpp b/shared/metrics.cpp
index 248da38..91b03e8 100644
--- a/shared/metrics.cpp
+++ b/shared/metrics.cpp
@@ -106,6 +106,23 @@ void Metrics::remove(const string &name, const vector<pair<string, string>> &lab
 	metrics.erase(it);
 }
 
+void Metrics::remove_if_exists(const string &name, const vector<pair<string, string>> &labels)
+{
+	lock_guard<mutex> lock(mu);
+	auto it = metrics.find(MetricKey(name, labels));
+	if (it == metrics.end()) {
+		return;
+	}
+
+	// If this is the last metric with this name, remove the type as well.
+	if (!((it != metrics.begin() && prev(it)->first.name == name) ||
+	      (it != metrics.end() && next(it) != metrics.end() && next(it)->first.name == name))) {
+		types.erase(name);
+	}
+
+	metrics.erase(it);
+}
+
 string Metrics::serialize() const
 {
 	stringstream ss;