code review

dmehala · dmehala · commit 9545d64206d2 · 2024-05-23T10:23:20.000+02:00
diff --git a/src/datadog/config_manager.cpp b/src/datadog/config_manager.cpp
@@ -98,7 +98,7 @@ std::vector<ConfigMetadata> ConfigManager::update(const ConfigUpdate& conf) {
 
   std::lock_guard<std::mutex> lock(mutex_);
 
-  auto rules = rules_;
+  decltype(rules_) rules;
 
   if (!conf.trace_sampling_rate) {
     auto found = default_metadata_.find(ConfigName::TRACE_SAMPLING_RATE);
@@ -132,10 +132,12 @@ std::vector<ConfigMetadata> ConfigManager::update(const ConfigUpdate& conf) {
       trace_sampling_rules_metadata.error = std::move(*error);
     } else {
       rules.merge(*maybe_rules);
-      metadata.emplace_back(std::move(trace_sampling_rules_metadata));
     }
+
+    metadata.emplace_back(std::move(trace_sampling_rules_metadata));
   }
 
+  rules.merge(rules_);
   trace_sampler_->set_rules(rules);
 
   if (!conf.tags) {
diff --git a/src/datadog/trace_sampler_config.cpp b/src/datadog/trace_sampler_config.cpp
@@ -134,7 +134,9 @@ Expected<TraceSamplerConfig> load_trace_sampler_env_config() {
 std::string to_string(const std::vector<TraceSamplerConfig::Rule> &rules) {
   nlohmann::json res;
   for (const auto &r : rules) {
-    res.emplace_back(r.to_json());
+    auto j = r.to_json();
+    j["sample_rate"] = r.sample_rate;
+    res.emplace_back(std::move(j));
   }
 
   return res.dump();
