Intermediate changes

commit_hash:22b4cddd0210b5fc08b8327407d825258ad7cc4b

Author: robot-piglet

yt/yt/library/profiling/solomon/remote.cpp

@@ -73,7 +73,6 @@ void FromProto(THistogramSnapshot* histogram, const NProto::THistogramSnapshot&
 TRemoteRegistry::TRemoteRegistry(TSolomonRegistry* registry)
     : Registry_(registry)
 {
-    TagRename_.emplace_back();
 }
 
 void TRemoteRegistry::Transfer(const NProto::TSensorDump& dump)
@@ -89,11 +88,20 @@ void TRemoteRegistry::Transfer(const NProto::TSensorDump& dump)
         }
     }
 
-    for (TTagId tagId = TagRename_.size(); tagId < dump.tags().size(); tagId++) {
+    TTagIdList tagRename(dump.tags().size());
+    for (TTagId tagId = 1; tagId < dump.tags().size(); tagId++) {
         const auto& remoteTag = dump.tags()[tagId];
-        TagRename_.push_back(Registry_->TagRegistry_.Encode(TTag{remoteTag.key(), remoteTag.value()}));
+        tagRename[tagId] = Registry_->TagRegistry_.Encode(TTag{remoteTag.key(), remoteTag.value()});
     }
 
+    auto renameTags = [&tagRename] (const TTagIdList& tags) {
+        TTagIdList renamed;
+        for (auto tag : tags) {
+            renamed.push_back(tagRename[tag]);
+        }
+        return renamed;
+    };
+
     auto oldSensors = std::move(Sensors_);
     Sensors_ = {};
 
@@ -114,7 +122,7 @@ void TRemoteRegistry::Transfer(const NProto::TSensorDump& dump)
             for (const auto& tagId : projection.tag_ids()) {
                 tagIds.push_back(tagId);
             }
-            tagIds = RenameTags(tagIds);
+            tagIds = renameTags(tagIds);
 
             auto transferValue = [&] (auto cube, ESensorType type, auto value) {
                 sensorSet->InitializeType(type);
@@ -197,15 +205,6 @@ void TRemoteRegistry::DoDetach(const THashMap<std::string, TRemoteSensorSet>& se
     }
 }
 
-TTagIdList TRemoteRegistry::RenameTags(const TTagIdList& tags)
-{
-    TTagIdList renamed;
-    for (auto tag : tags) {
-        renamed.push_back(TagRename_[tag]);
-    }
-    return renamed;
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 
 } // namespace NYT::NProfiling

yt/yt/library/profiling/solomon/remote.h

@@ -9,8 +9,6 @@
 
 #include <util/generic/hash_set.h>
 
-#include <deque>
-
 namespace NYT::NProfiling {
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -36,16 +34,13 @@ class TRemoteRegistry final
 private:
     TSolomonRegistry* Registry_ = nullptr;
 
-    std::deque<TTagId> TagRename_;
-
     struct TRemoteSensorSet
     {
         THashSet<std::pair<ESensorType, TTagIdList>> UsedTags;
     };
 
     THashMap<std::string, TRemoteSensorSet> Sensors_;
 
-    TTagIdList RenameTags(const TTagIdList& tags);
     void DoDetach(const THashMap<std::string, TRemoteSensorSet>& sensors);
 };
 

yt/yt/library/profiling/unittests/solomon_ut.cpp

@@ -812,6 +812,66 @@ TEST(TSolomonRegistry, TestRemoteTransfer)
     ASSERT_TRUE(sensors.Counters.empty());
 }
 
+TEST(TSolomonRegistry, TestRemoteTransferWithDistinctTags)
+{
+    auto impl = New<TSolomonRegistry>();
+    impl->SetWindowSize(12);
+
+    TRemoteRegistry remoteRegistry(impl.Get());
+    const auto& tagRegistry = impl->GetTagRegistry();
+
+    auto buildSensorDump = [] (const std::string& tagsPrefix, int tagsCount, const std::string& sensor, i64 value) {
+        NProto::TSensorDump dump;
+
+        dump.add_tags();
+        for (TTagId tagId = 1; tagId <= tagsCount; ++tagId) {
+            auto value = std::to_string(tagId);
+
+            auto* tag = dump.add_tags();
+            tag->set_key(tagsPrefix + value);
+            tag->set_value(value);
+        }
+
+        auto* cube = dump.add_cubes();
+        cube->set_name(sensor);
+
+        auto* projection = cube->add_projections();
+        for (TTagId tagId = 1; tagId <= tagsCount; ++tagId) {
+            projection->add_tag_ids(tagId);
+        }
+        projection->set_has_value(true);
+        projection->set_counter(value);
+
+        return dump;
+    };
+
+    auto transferAndCollect = [&] (const std::string& tagsPrefix, int tagsCount, const std::string& sensor, i64 value) {
+        auto dump = buildSensorDump(tagsPrefix, tagsCount, sensor, value);
+        remoteRegistry.Transfer(dump);
+
+        impl->Collect();
+        return ReadSensors(impl);
+    };
+
+    // First collect to prepare registry for subsequent transfers.
+    impl->Collect();
+
+    auto sensors = transferAndCollect("a", 3, "s1", 1);
+    ASSERT_EQ(1, std::ssize(sensors.Counters));
+    ASSERT_EQ(1, sensors.Counters["s1{a1=1;a2=2;a3=3}"]);
+    ASSERT_EQ(3, tagRegistry.GetSize());
+
+    sensors = transferAndCollect("b", 2, "s2", 2);
+    ASSERT_EQ(1, std::ssize(sensors.Counters));
+    ASSERT_EQ(2, sensors.Counters["s2{b1=1;b2=2}"]);
+    ASSERT_EQ(5, tagRegistry.GetSize());
+
+    sensors = transferAndCollect("b", 4, "s2", 3);
+    ASSERT_EQ(1, std::ssize(sensors.Counters));
+    ASSERT_EQ(3, sensors.Counters["s2{b1=1;b2=2;b3=3;b4=4}"]);
+    ASSERT_EQ(7, tagRegistry.GetSize());
+}
+
 TEST(TSolomonRegistry, ExtensionTag)
 {
     auto impl = New<TSolomonRegistry>();