Fix msan errors (#22641)

Signed-off-by: Yan Avlasov <[email protected]>

source/common/stats/allocator_impl.h

@@ -84,18 +84,6 @@ class AllocatorImpl : public Allocator {
   StatSet<Gauge> gauges_ ABSL_GUARDED_BY(mutex_);
   StatSet<TextReadout> text_readouts_ ABSL_GUARDED_BY(mutex_);
 
-  // Retain storage for deleted stats; these are no longer in maps because
-  // the matcher-pattern was established after they were created. Since the
-  // stats are held by reference in code that expects them to be there, we
-  // can't actually delete the stats.
-  //
-  // It seems like it would be better to have each client that expects a stat
-  // to exist to hold it as (e.g.) a CounterSharedPtr rather than a Counter&
-  // but that would be fairly complex to change.
-  std::vector<CounterSharedPtr> deleted_counters_ ABSL_GUARDED_BY(mutex_);
-  std::vector<GaugeSharedPtr> deleted_gauges_ ABSL_GUARDED_BY(mutex_);
-  std::vector<TextReadoutSharedPtr> deleted_text_readouts_ ABSL_GUARDED_BY(mutex_);
-
   template <typename StatType> using StatPointerSet = absl::flat_hash_set<StatType*>;
   // Stat pointers that participate in the flush to sink process.
   StatPointerSet<Counter> sinked_counters_ ABSL_GUARDED_BY(mutex_);
@@ -107,6 +95,18 @@ class AllocatorImpl : public Allocator {
   SymbolTable& symbol_table_;
 
   Thread::ThreadSynchronizer sync_;
+
+  // Retain storage for deleted stats; these are no longer in maps because
+  // the matcher-pattern was established after they were created. Since the
+  // stats are held by reference in code that expects them to be there, we
+  // can't actually delete the stats.
+  //
+  // It seems like it would be better to have each client that expects a stat
+  // to exist to hold it as (e.g.) a CounterSharedPtr rather than a Counter&
+  // but that would be fairly complex to change.
+  std::vector<CounterSharedPtr> deleted_counters_ ABSL_GUARDED_BY(mutex_);
+  std::vector<GaugeSharedPtr> deleted_gauges_ ABSL_GUARDED_BY(mutex_);
+  std::vector<TextReadoutSharedPtr> deleted_text_readouts_ ABSL_GUARDED_BY(mutex_);
 };
 
 } // namespace Stats

source/extensions/filters/udp/dns_filter/dns_parser.h

@@ -179,7 +179,8 @@ class DnsQueryContext {
   uint16_t response_code_;
   uint64_t retry_;
   uint16_t id_;
-  Network::DnsResolver::ResolutionStatus resolution_status_;
+  Network::DnsResolver::ResolutionStatus resolution_status_ =
+      Network::DnsResolver::ResolutionStatus::Success;
   DnsHeader header_;
   DnsHeader response_header_;
   DnsQueryPtrVec queries_;

test/integration/fake_resource_monitor.cc

@@ -2,18 +2,16 @@
 
 namespace Envoy {
 
-FakeResourceMonitor::~FakeResourceMonitor() { factory_.onMonitorDestroyed(this); }
+FakeResourceMonitor::~FakeResourceMonitor() { factory_.onMonitorDestroyed(); }
 
 void FakeResourceMonitor::updateResourceUsage(Server::ResourceUpdateCallbacks& callbacks) {
   Server::ResourceUsage usage;
   usage.resource_pressure_ = pressure_;
   callbacks.onSuccess(usage);
 }
 
-void FakeResourceMonitorFactory::onMonitorDestroyed(FakeResourceMonitor* monitor) {
-  ASSERT(monitor_ == monitor);
-  monitor_ = nullptr;
-}
+void FakeResourceMonitorFactory::onMonitorDestroyed() { monitor_ = nullptr; }
+
 Server::ResourceMonitorPtr FakeResourceMonitorFactory::createResourceMonitor(
     const Protobuf::Message&, Server::Configuration::ResourceMonitorFactoryContext& context) {
   auto monitor = std::make_unique<FakeResourceMonitor>(context.mainThreadDispatcher(), *this);

test/integration/fake_resource_monitor.h

@@ -42,7 +42,7 @@ class FakeResourceMonitorFactory : public Server::Configuration::ResourceMonitor
   }
 
   FakeResourceMonitor* monitor() const { return monitor_; }
-  void onMonitorDestroyed(FakeResourceMonitor* monitor);
+  void onMonitorDestroyed();
 
 private:
   FakeResourceMonitor* monitor_{nullptr};

test/mocks/stream_info/mocks.h

@@ -53,7 +53,7 @@ class MockUpstreamInfo : public UpstreamInfo {
   std::string failure_reason_;
   Upstream::HostDescriptionConstSharedPtr upstream_host_;
   FilterStateSharedPtr filter_state_;
-  uint64_t num_streams_;
+  uint64_t num_streams_ = 0;
   absl::optional<Http::Protocol> upstream_protocol_;
 };