Copy metrics while accept

ref:e23a9eb7d1d1bc875bdf136ed30b9605db304bb8

1 files changed, 13 insertions, 6 deletions

diff --git a/library/cpp/monlib/metrics/metric_registry.cpp b/library/cpp/monlib/metrics/metric_registry.cpp
index 3d7ffd40cf..2c64a23ead 100644
--- a/library/cpp/monlib/metrics/metric_registry.cpp
+++ b/library/cpp/monlib/metrics/metric_registry.cpp
@@ -180,7 +180,7 @@ namespace NMonitoring {
         }
 
         {
-            IMetricPtr metric = MakeHolder<TMetric>(std::forward<Args>(args)...);
+            IMetricPtr metric = MakeIntrusive<TMetric>(std::forward<Args>(args)...);
 
             TWriteGuard g{*Lock_};
             // decltype(Metrics_)::iterator breaks build on windows
@@ -215,17 +215,24 @@ namespace NMonitoring {
             consumer->OnLabelsEnd();
         }
 
+        TVector<std::pair<ILabelsPtr, IMetricPtr>> tmpMetrics;
+
         {
             TReadGuard g{*Lock_};
+            tmpMetrics.reserve(Metrics_.size());
             for (const auto& it: Metrics_) {
-                ILabels* labels = it.first.Get();
-                IMetric* metric = it.second.Get();
-                ConsumeMetric(time, consumer, metric, [&]() {
-                    ConsumeLabels(consumer, *labels);
-                });
+                tmpMetrics.push_back(it);
             }
         }
 
+        for (const auto& it: tmpMetrics) {
+            ILabels* labels = it.first.Get();
+            IMetric* metric = it.second.Get();
+            ConsumeMetric(time, consumer, metric, [&]() {
+                ConsumeLabels(consumer, *labels);
+            });
+        }
+
         consumer->OnStreamEnd();
     }