stats: add symbol table for future stat name encoding

include/envoy/stats/BUILD

@@ -14,6 +14,11 @@ envoy_cc_library(
     deps = ["//include/envoy/common:interval_set_interface"],
 )
 
+envoy_cc_library(
+    name = "symbol_table_interface",
+    hdrs = ["symbol_table.h"],
+)
+
 envoy_cc_library(
     name = "timespan",
     hdrs = ["timespan.h"],

include/envoy/stats/symbol_table.h

@@ -0,0 +1,50 @@
+#pragma once
+
+#include <memory>
+#include <string>
+#include <vector>
+
+#include "envoy/common/pure.h"
+
+namespace Envoy {
+namespace Stats {
+
+using Symbol = uint32_t;
+using SymbolVec = std::vector<Symbol>;
+
+/**
+ * Interface for storing a stat name, which is a wrapper around a SymbolVec.
+ */
+class StatName {
+public:
+  StatName() {}
+  virtual ~StatName(){};
+  virtual std::string toString() const PURE;
+  virtual SymbolVec toSymbols() const PURE;
+};
+
+using StatNamePtr = std::unique_ptr<StatName>;
+
+/**
+ * Interface for shortening and retrieving stat names.
+ * Guarantees that x = encode(x).toString() for any x.
+ *
+ * Even though the symbol table does manual reference counting, curr_counter_ is monotonically
+ * increasing. So encoding "foo", freeing the sole stat containing "foo", and then re-encoding "foo"
+ * will produce a different symbol each time.
+ */
+class SymbolTable {
+public:
+  virtual ~SymbolTable() {}
+
+  /**
+   * Encodes a stat name into a StatNamePtr. Expects the name to be period-delimited.
+   *
+   * @param name the stat name to encode.
+   * @return StatNamePtr a unique_ptr to the StatName class encapsulating the symbol vector.
+   */
+  virtual StatNamePtr encode(const std::string& name) PURE;
+};
+
+} // namespace Stats
+} // namespace Envoy

source/common/stats/BUILD

@@ -17,6 +17,7 @@ envoy_cc_library(
         "libcircllhist",
     ],
     deps = [
+        ":symbol_table_lib",
         "//include/envoy/common:time_interface",
         "//include/envoy/server:options_interface",
         "//include/envoy/stats:stats_interface",
@@ -33,6 +34,17 @@ envoy_cc_library(
     ],
 )
 
+envoy_cc_library(
+    name = "symbol_table_lib",
+    srcs = ["symbol_table_impl.cc"],
+    hdrs = ["symbol_table_impl.h"],
+    external_deps = ["abseil_base"],
+    deps = [
+        "//include/envoy/stats:symbol_table_interface",
+        "//source/common/common:assert_lib",
+    ],
+)
+
 envoy_cc_library(
     name = "thread_local_store_lib",
     srcs = ["thread_local_store.cc"],

source/common/stats/symbol_table_impl.cc

@@ -0,0 +1,76 @@
+#include "common/stats/symbol_table_impl.h"
+
+#include <memory>
+#include <unordered_map>
+#include <vector>
+
+#include "common/common/assert.h"
+
+namespace Envoy {
+namespace Stats {
+
+// TODO(ambuc): There is a possible performance optimization here for avoiding the encoding of IPs,
+// if they appear in stat names. We don't want to waste time symbolizing an integer as an integer,
+// if we can help it.
+StatNamePtr SymbolTableImpl::encode(const std::string& name) {
+  SymbolVec symbol_vec;
+  std::vector<std::string> name_vec = absl::StrSplit(name, '.');
+  symbol_vec.reserve(name_vec.size());
+  std::transform(name_vec.begin(), name_vec.end(), std::back_inserter(symbol_vec),
+                 [this](std::string x) { return toSymbol(x); });
+
+  return std::make_unique<StatNameImpl>(symbol_vec, this);
+}
+
+std::string SymbolTableImpl::decode(const SymbolVec& symbol_vec) const {
+  std::vector<std::string> name;
+  name.reserve(symbol_vec.size());
+  std::transform(symbol_vec.begin(), symbol_vec.end(), std::back_inserter(name),
+                 [this](Symbol x) { return fromSymbol(x); });
+  return absl::StrJoin(name, ".");
+}
+
+void SymbolTableImpl::free(const SymbolVec& symbol_vec) {
+  for (const Symbol symbol : symbol_vec) {
+    auto decode_search = decode_map_.find(symbol);
+    RELEASE_ASSERT(decode_search != decode_map_.end(), "");
+
+    std::string str = decode_search->second;
+    auto encode_search = encode_map_.find(str);
+    RELEASE_ASSERT(encode_search != encode_map_.end(), "");
+
+    ((encode_search->second).second)--;
+    if ((encode_search->second).second == 0) {
+      decode_map_.erase(decode_search);
+      encode_map_.erase(encode_search);
+    }
+  }
+}
+
+Symbol SymbolTableImpl::toSymbol(const std::string& str) {
+  Symbol result;
+  auto encode_insert = encode_map_.insert({str, std::make_pair(curr_counter_, 1)});
+  // If the insertion took place, we mirror the insertion in the decode_map.
+  if (encode_insert.second) {
+    auto decode_insert = decode_map_.insert({curr_counter_, str});
+    // We expect the decode_map to be in lockstep.
+    RELEASE_ASSERT(decode_insert.second, "");
+    result = curr_counter_;
+    ++curr_counter_;
+  } else {
+    // If the insertion didn't take place, return the actual value at that location
+    result = (encode_insert.first)->second.first;
+    // and up the refcount at that location
+    ++(encode_insert.first)->second.second;
+  }
+  return result;
+}
+
+std::string SymbolTableImpl::fromSymbol(const Symbol symbol) const {
+  auto search = decode_map_.find(symbol);
+  RELEASE_ASSERT(search != decode_map_.end(), "");
+  return search->second;
+}
+
+} // namespace Stats
+} // namespace Envoy

source/common/stats/symbol_table_impl.h

@@ -0,0 +1,78 @@
+#pragma once
+
+#include <algorithm>
+#include <memory>
+#include <string>
+#include <unordered_map>
+#include <vector>
+
+#include "envoy/common/exception.h"
+#include "envoy/stats/symbol_table.h"
+
+#include "common/common/assert.h"
+
+#include "absl/strings/str_join.h"
+#include "absl/strings/str_split.h"
+
+namespace Envoy {
+namespace Stats {
+
+class SymbolTableImpl : public SymbolTable {
+  friend class StatNameImpl;
+
+public:
+  StatNamePtr encode(const std::string& name) override;
+
+  // For testing purposes only.
+  size_t size() const { return sizeof(SymbolTableImpl) + encode_map_.size() + decode_map_.size(); }
+
+private:
+  /**
+   * Decodes a vector of symbols back into its period-delimited stat name.
+   * If decoding fails on any part of the symbol_vec, we release_assert and crash hard, since this
+   * should never happen, and we don't want to continue running with a corrupt stats set.
+   *
+   * @param symbol_vec the vector of symbols to decode.
+   * @return std::string the retrieved stat name.
+   */
+  std::string decode(const SymbolVec& symbol_vec) const;
+
+  /**
+   * Since SymbolTableImpl does manual reference counting, a client of SymbolTable (such as
+   * StatName) must manually call free(symbol_vec) when it is freeing the stat it represents. This
+   * way, the symbol table will grow and shrink dynamically, instead of being write-only.
+   *
+   * @return bool whether or not the total free operation was successful. Expected to be true.
+   */
+  void free(const SymbolVec& symbol_vec);
+
+  Symbol curr_counter_ = 0;
+
+  // Bimap implementation.
+  // The encode map stores both the symbol and the ref count of that symbol.
+  std::unordered_map<std::string, std::pair<Symbol, uint32_t>> encode_map_;
+  std::unordered_map<Symbol, std::string> decode_map_;
+
+  Symbol toSymbol(const std::string& str);
+  std::string fromSymbol(const Symbol symbol) const;
+};
+
+/**
+ * Implements RAII for Symbols, since the StatName destructor does the work of freeing its component
+ * symbols.
+ */
+class StatNameImpl : public StatName {
+public:
+  StatNameImpl(SymbolVec symbol_vec, SymbolTableImpl* symbol_table)
+      : symbol_vec_(symbol_vec), symbol_table_(symbol_table) {}
+  ~StatNameImpl() override { symbol_table_->free(symbol_vec_); }
+  std::string toString() const override { return symbol_table_->decode(symbol_vec_); }
+  SymbolVec toSymbols() const override { return symbol_vec_; }
+
+private:
+  SymbolVec symbol_vec_;
+  SymbolTableImpl* symbol_table_;
+};
+
+} // namespace Stats
+} // namespace Envoy

test/common/stats/BUILD

@@ -21,10 +21,22 @@ envoy_cc_test(
     ],
 )
 
+envoy_cc_test(
+    name = "symbol_table_test",
+    srcs = ["symbol_table_test.cc"],
+    deps = [
+        "//source/common/stats:symbol_table_lib",
+        "//test/mocks/stats:stats_mocks",
+        "//test/test_common:logging_lib",
+        "//test/test_common:utility_lib",
+    ],
+)
+
 envoy_cc_test(
     name = "thread_local_store_test",
     srcs = ["thread_local_store_test.cc"],
     deps = [
+        "//source/common/stats:symbol_table_lib",
         "//source/common/stats:thread_local_store_lib",
         "//test/mocks/event:event_mocks",
         "//test/mocks/server:server_mocks",