Report span sampler values

Author: anna-git

include/datadog/span_sampler_config.h

@@ -37,7 +37,9 @@ struct SpanSamplerConfig {
 
 class FinalizedSpanSamplerConfig {
   friend Expected<FinalizedSpanSamplerConfig> finalize_config(
-      const SpanSamplerConfig&, Logger&);
+      const SpanSamplerConfig&, Logger&,
+      std::unordered_map<ConfigName, std::vector<ConfigMetadata>>*
+          telemetry_configs);
   friend class FinalizedTracerConfig;
 
   FinalizedSpanSamplerConfig() = default;
@@ -52,8 +54,10 @@ class FinalizedSpanSamplerConfig {
   std::unordered_map<ConfigName, ConfigMetadata> metadata;
 };
 
-Expected<FinalizedSpanSamplerConfig> finalize_config(const SpanSamplerConfig&,
-                                                     Logger&);
+Expected<FinalizedSpanSamplerConfig> finalize_config(
+    const SpanSamplerConfig&, Logger&,
+    std::unordered_map<ConfigName, std::vector<ConfigMetadata>>*
+        telemetry_configs);
 
 std::string to_string(const FinalizedSpanSamplerConfig::Rule&);
 

src/datadog/span_sampler_config.cpp

@@ -221,27 +221,33 @@ Expected<SpanSamplerConfig> load_span_sampler_env_config(Logger &logger) {
 SpanSamplerConfig::Rule::Rule(const SpanMatcher &base) : SpanMatcher(base) {}
 
 Expected<FinalizedSpanSamplerConfig> finalize_config(
-    const SpanSamplerConfig &user_config, Logger &logger) {
+    const SpanSamplerConfig &user_config, Logger &logger,
+    std::unordered_map<ConfigName, std::vector<ConfigMetadata>>
+        *telemetry_configs) {
   Expected<SpanSamplerConfig> env_config = load_span_sampler_env_config(logger);
   if (auto error = env_config.if_error()) {
     return *error;
   }
 
   FinalizedSpanSamplerConfig result;
 
-  std::vector<SpanSamplerConfig::Rule> rules;
+  // Convert to Optional for resolve_and_record_config
+  Optional<std::vector<SpanSamplerConfig::Rule>> env_rules;
   if (!env_config->rules.empty()) {
-    rules = env_config->rules;
-    result.metadata[ConfigName::SPAN_SAMPLING_RULES] =
-        ConfigMetadata(ConfigName::SPAN_SAMPLING_RULES, to_string(rules),
-                       ConfigMetadata::Origin::ENVIRONMENT_VARIABLE);
-  } else if (!user_config.rules.empty()) {
-    rules = user_config.rules;
-    result.metadata[ConfigName::SPAN_SAMPLING_RULES] =
-        ConfigMetadata(ConfigName::SPAN_SAMPLING_RULES, to_string(rules),
-                       ConfigMetadata::Origin::CODE);
+    env_rules = env_config->rules;
+  }
+  Optional<std::vector<SpanSamplerConfig::Rule>> user_rules;
+  if (!user_config.rules.empty()) {
+    user_rules = user_config.rules;
   }
 
+  std::vector<SpanSamplerConfig::Rule> rules = resolve_and_record_config(
+      env_rules, user_rules, telemetry_configs, &result.metadata,
+      ConfigName::SPAN_SAMPLING_RULES, nullptr,
+      [](const std::vector<SpanSamplerConfig::Rule> &r) {
+        return to_string(r);
+      });
+
   for (const auto &rule : rules) {
     auto maybe_rate = Rate::from(rule.sample_rate);
     if (auto *error = maybe_rate.if_error()) {

src/datadog/tracer_config.cpp

@@ -429,8 +429,8 @@ Expected<FinalizedTracerConfig> finalize_config(const TracerConfig &user_config,
     return std::move(trace_sampler_config.error());
   }
 
-  if (auto span_sampler_config =
-          finalize_config(user_config.span_sampler, *logger)) {
+  if (auto span_sampler_config = finalize_config(
+          user_config.span_sampler, *logger, &all_sources_configs)) {
     final_config.metadata.merge(span_sampler_config->metadata);
     final_config.span_sampler = std::move(*span_sampler_config);
   } else {