overall improvements

dmehala · dmehala · commit 23bb27cc653b · 2024-05-23T11:24:15.000+02:00
- report remote trace sample rate as RULE instead of REMOTE_RULE for legacy reasons
- update REMOTE_RULES and REMOTE_ADAPTIVE_RULE values to match the spec
- report default sample rate for telemetry
- add _dd.psr for new remote rules
diff --git a/src/datadog/config_manager.cpp b/src/datadog/config_manager.cpp
@@ -112,7 +112,7 @@ std::vector<ConfigMetadata> ConfigManager::update(const ConfigUpdate& conf) {
         ConfigMetadata::Origin::REMOTE_CONFIG);
 
     auto rate = Rate::from(*conf.trace_sampling_rate);
-    rules[catch_all] = TraceSamplerRate{*rate, SamplingMechanism::REMOTE_RULE};
+    rules[catch_all] = TraceSamplerRate{*rate, SamplingMechanism::RULE};
 
     metadata.emplace_back(std::move(trace_sampling_metadata));
   }
@@ -137,7 +137,7 @@ std::vector<ConfigMetadata> ConfigManager::update(const ConfigUpdate& conf) {
     metadata.emplace_back(std::move(trace_sampling_rules_metadata));
   }
 
-  rules.merge(rules_);
+  rules.insert(rules_.cbegin(), rules_.cend());
   trace_sampler_->set_rules(rules);
 
   if (!conf.tags) {
diff --git a/src/datadog/sampling_mechanism.h b/src/datadog/sampling_mechanism.h
@@ -61,10 +61,10 @@ enum class SamplingMechanism {
   // Reserved for future use.
   OTLP_RULE = 9,
   // Sampling rule configured by user via remote configuration.
-  REMOTE_RULE = 10,
+  REMOTE_RULE = 11,
   // Adaptive sampling rule automatically computed by Datadog backend and sent
   // via remote configuration.
-  REMOTE_ADAPTIVE_RULE = 11,
+  REMOTE_ADAPTIVE_RULE = 12,
 };
 
 }  // namespace tracing
diff --git a/src/datadog/trace_sampler_config.cpp b/src/datadog/trace_sampler_config.cpp
@@ -197,6 +197,9 @@ Expected<FinalizedTraceSamplerConfig> finalize_config(
     result.metadata[ConfigName::TRACE_SAMPLING_RATE] = ConfigMetadata(
         ConfigName::TRACE_SAMPLING_RATE, to_string(*sample_rate, 1),
         ConfigMetadata::Origin::CODE);
+  } else {
+    result.metadata[ConfigName::TRACE_SAMPLING_RATE] = ConfigMetadata(
+        ConfigName::TRACE_SAMPLING_RATE, "1.0", ConfigMetadata::Origin::CODE);
   }
 
   // If `sample_rate` was specified, then it translates to a "catch-all" rule
diff --git a/src/datadog/trace_segment.cpp b/src/datadog/trace_segment.cpp
@@ -230,7 +230,10 @@ void TraceSegment::span_finished() {
         decision.mechanism == int(SamplingMechanism::DEFAULT)) {
       local_root.numeric_tags[tags::internal::agent_sample_rate] =
           *decision.configured_rate;
-    } else if (decision.mechanism == int(SamplingMechanism::RULE)) {
+    } else if (decision.mechanism == int(SamplingMechanism::RULE) ||
+               decision.mechanism == int(SamplingMechanism::REMOTE_RULE) ||
+               decision.mechanism ==
+                   int(SamplingMechanism::REMOTE_ADAPTIVE_RULE)) {
       local_root.numeric_tags[tags::internal::rule_sample_rate] =
           *decision.configured_rate;
       if (decision.limiter_effective_rate) {

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ std::vector<ConfigMetadata> ConfigManager::update(const ConfigUpdate& conf) {`
`112`	`112`	`ConfigMetadata::Origin::REMOTE_CONFIG);`
`113`	`113`
`114`	`114`	`auto rate = Rate::from(*conf.trace_sampling_rate);`
`115`		`- rules[catch_all] = TraceSamplerRate{*rate, SamplingMechanism::REMOTE_RULE};`
	`115`	`+ rules[catch_all] = TraceSamplerRate{*rate, SamplingMechanism::RULE};`
`116`	`116`
`117`	`117`	`metadata.emplace_back(std::move(trace_sampling_metadata));`
`118`	`118`	`}`
`@@ -137,7 +137,7 @@ std::vector<ConfigMetadata> ConfigManager::update(const ConfigUpdate& conf) {`
`137`	`137`	`metadata.emplace_back(std::move(trace_sampling_rules_metadata));`
`138`	`138`	`}`
`139`	`139`
`140`		`- rules.merge(rules_);`
	`140`	`+ rules.insert(rules_.cbegin(), rules_.cend());`
`141`	`141`	`trace_sampler_->set_rules(rules);`
`142`	`142`
`143`	`143`	`if (!conf.tags) {`
Original file line number	Diff line number	Diff line change
`@@ -197,6 +197,9 @@ Expected<FinalizedTraceSamplerConfig> finalize_config(`
`197`	`197`	`result.metadata[ConfigName::TRACE_SAMPLING_RATE] = ConfigMetadata(`
`198`	`198`	`ConfigName::TRACE_SAMPLING_RATE, to_string(*sample_rate, 1),`
`199`	`199`	`ConfigMetadata::Origin::CODE);`
	`200`	`+ } else {`
	`201`	`+ result.metadata[ConfigName::TRACE_SAMPLING_RATE] = ConfigMetadata(`
	`202`	`+ ConfigName::TRACE_SAMPLING_RATE, "1.0", ConfigMetadata::Origin::CODE);`
`200`	`203`	`}`
`201`	`204`
`202`	`205`	// If `sample_rate` was specified, then it translates to a "catch-all" rule