Skip to content

Commit 3b16f48

Browse files
committed
adapt to the new structures
1 parent 9f1d409 commit 3b16f48

File tree

2 files changed

+11
-8
lines changed

2 files changed

+11
-8
lines changed

src/datadog/telemetry/telemetry_impl.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -587,11 +587,12 @@ std::string Telemetry::app_started_payload() {
587587

588588
for (const auto& product : config_.products) {
589589
auto& configurations = product.configurations;
590-
for (const auto& [_, config_metadata] : configurations) {
590+
for (const auto& [_, config_metadatas] : configurations) {
591591
// if (config_metadata.value.empty()) continue;
592-
593-
configuration_json.emplace_back(
594-
generate_configuration_field(config_metadata));
592+
for (const auto& config_metadata : config_metadatas) {
593+
configuration_json.emplace_back(
594+
generate_configuration_field(config_metadata));
595+
}
595596
}
596597

597598
/// NOTE(@dmehala): Telemetry API is tightly related to APM tracing and

src/datadog/trace_sampler_config.cpp

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -225,10 +225,12 @@ Expected<FinalizedTraceSamplerConfig> finalize_config(
225225
result.rules.emplace_back(std::move(finalized_rule));
226226
}
227227

228-
const auto [origin, max_per_second] =
229-
pick(env_config->max_per_second, config.max_per_second, 100);
230-
result.metadata[ConfigName::TRACE_SAMPLING_LIMIT] = ConfigMetadata(
231-
ConfigName::TRACE_SAMPLING_LIMIT, std::to_string(max_per_second), origin);
228+
std::unordered_map<ConfigName, std::vector<ConfigMetadata>>
229+
telemetry_configs_tmp;
230+
double max_per_second = pick(
231+
env_config->max_per_second, config.max_per_second, &telemetry_configs_tmp,
232+
&result.metadata, ConfigName::TRACE_SAMPLING_LIMIT, 100.0,
233+
[](const double &d) { return std::to_string(d); });
232234

233235
const auto allowed_types = {FP_NORMAL, FP_SUBNORMAL};
234236
if (!(max_per_second > 0) ||

0 commit comments

Comments
 (0)