Shutting down verification after mutex

Author: pablomartinezbernardo

src/datadog/telemetry/telemetry_impl.cpp

@@ -243,17 +243,18 @@ Telemetry::Telemetry(Telemetry&& rhs)
       logger_(std::move(rhs.logger_)),
       telemetry_endpoint_(std::move(rhs.telemetry_endpoint_)),
       tracer_signature_(std::move(rhs.tracer_signature_)),
-      http_client_(rhs.http_client_),
+      http_client_(std::move(rhs.http_client_)),
       clock_(std::move(rhs.clock_)),
       scheduler_(std::move(rhs.scheduler_)),
+      shutting_down_(rhs.shutting_down_.load(std::memory_order_relaxed)),
       counters_(std::move(rhs.counters_)),
       counters_snapshot_(std::move(rhs.counters_snapshot_)),
       rates_(std::move(rhs.rates_)),
       rates_snapshot_(std::move(rhs.rates_snapshot_)),
       distributions_(std::move(rhs.distributions_)),
       seq_id_(rhs.seq_id_),
-      config_seq_ids_(rhs.config_seq_ids_),
-      host_info_(rhs.host_info_) {
+      config_seq_ids_(std::move(rhs.config_seq_ids_)),
+      host_info_(std::move(rhs.host_info_)) {
   cancel_tasks(rhs.tasks_);
   schedule_tasks();
 }
@@ -738,13 +739,13 @@ void Telemetry::capture_metrics() {
 
 void Telemetry::log(std::string message, telemetry::LogLevel level,
                     Optional<std::string> stacktrace) {
-  if (shutting_down_.load(std::memory_order_acquire)) {
-    return;
-  }
   auto timestamp = std::chrono::duration_cast<std::chrono::seconds>(
                        clock_().wall.time_since_epoch())
                        .count();
   std::lock_guard l{log_mutex_};
+  if (shutting_down_.load(std::memory_order_acquire)) {
+    return;
+  }
   logs_.emplace_back(
       telemetry::LogMessage{std::move(message), level, stacktrace, timestamp});
 }
@@ -755,10 +756,10 @@ void Telemetry::increment_counter(const Counter& id) {
 
 void Telemetry::increment_counter(const Counter& id,
                                   const std::vector<std::string>& tags) {
+  std::lock_guard l{counter_mutex_};
   if (shutting_down_.load(std::memory_order_acquire)) {
     return;
   }
-  std::lock_guard l{counter_mutex_};
   counters_[{id, tags}] += 1;
 }
 
@@ -768,10 +769,10 @@ void Telemetry::decrement_counter(const Counter& id) {
 
 void Telemetry::decrement_counter(const Counter& id,
                                   const std::vector<std::string>& tags) {
+  std::lock_guard l{counter_mutex_};
   if (shutting_down_.load(std::memory_order_acquire)) {
     return;
   }
-  std::lock_guard l{counter_mutex_};
   auto& v = counters_[{id, tags}];
   if (v > 0) v -= 1;
 }
@@ -783,10 +784,10 @@ void Telemetry::set_counter(const Counter& id, uint64_t value) {
 void Telemetry::set_counter(const Counter& id,
                             const std::vector<std::string>& tags,
                             uint64_t value) {
+  std::lock_guard l{counter_mutex_};
   if (shutting_down_.load(std::memory_order_acquire)) {
     return;
   }
-  std::lock_guard l{counter_mutex_};
   counters_[{id, tags}] = value;
 }
 
@@ -796,10 +797,10 @@ void Telemetry::set_rate(const Rate& id, uint64_t value) {
 
 void Telemetry::set_rate(const Rate& id, const std::vector<std::string>& tags,
                          uint64_t value) {
+  std::lock_guard l{rate_mutex_};
   if (shutting_down_.load(std::memory_order_acquire)) {
     return;
   }
-  std::lock_guard l{rate_mutex_};
   rates_[{id, tags}] = value;
 }
 
@@ -810,10 +811,10 @@ void Telemetry::add_datapoint(const Distribution& id, uint64_t value) {
 void Telemetry::add_datapoint(const Distribution& id,
                               const std::vector<std::string>& tags,
                               uint64_t value) {
+  std::lock_guard l{distributions_mutex_};
   if (shutting_down_.load(std::memory_order_acquire)) {
     return;
   }
-  std::lock_guard l{distributions_mutex_};
   distributions_[{id, tags}].emplace_back(value);
 }