refactor: remove non-native config telemetry reporting

Remove AdditionalConfigEntry and related code. C++ should not report
telemetry for configs it doesn't consume (DD_PROFILING_ENABLED,
DD_LOGS_INJECTION, etc.). Only configs that go through
resolve_and_record_config() are reported in telemetry.

Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com>

Author: bm1549

include/datadog/telemetry/configuration.h

@@ -1,6 +1,5 @@
 #pragma once
 
-#include <datadog/config.h>
 #include <datadog/expected.h>
 #include <datadog/optional.h>
 #include <datadog/telemetry/product.h>
@@ -45,18 +44,6 @@ struct Configuration {
   std::vector<Product> products;
 };
 
-// Represents a configuration entry for a key that is not natively consumed
-// by dd-trace-cpp (e.g. DD_LOGS_INJECTION, DD_PROFILING_ENABLED).  These
-// entries come from stable configuration files and are reported in telemetry
-// so that the backend knows about all configured values and their origins.
-struct AdditionalConfigEntry {
-  std::string name;  // DD_* key name, used as the telemetry config name
-  std::string value;
-  tracing::ConfigMetadata::Origin origin;
-  tracing::Optional<std::string>
-      config_id;  // fleet policy ID if origin is fleet
-};
-
 struct FinalizedConfiguration {
   bool debug;
   bool enabled;
@@ -68,9 +55,6 @@ struct FinalizedConfiguration {
   std::string integration_version;
   std::vector<Product> products;
 
-  // Non-native stable config entries to include in telemetry.
-  std::vector<AdditionalConfigEntry> additional_config_entries;
-
   // Onboarding metadata coming from `DD_INSTRUMENTATION_INSTALL_*` environment
   // variables.
   tracing::Optional<std::string> install_id;

src/datadog/telemetry/telemetry_impl.cpp

@@ -599,39 +599,7 @@ std::string Telemetry::app_started_payload() {
     /// assumes telemetry event can only be generated from a tracer. The
     /// assumption is that the tracing product is always enabled and there
     /// is no need to declare it.
-    if (product.name == Product::Name::tracing) {
-      // Also emit additional (non-native) stable config entries for this
-      // product.  These use string-based names instead of ConfigName enum.
-      for (const auto& entry : config_.additional_config_entries) {
-        auto j = nlohmann::json{
-            {"name", entry.name}, {"value", entry.value}, {"seq_id", 1}};
-        switch (entry.origin) {
-          case tracing::ConfigMetadata::Origin::LOCAL_STABLE_CONFIG:
-            j["origin"] = "local_stable_config";
-            break;
-          case tracing::ConfigMetadata::Origin::FLEET_STABLE_CONFIG:
-            j["origin"] = "fleet_stable_config";
-            if (entry.config_id) {
-              j["config_id"] = *entry.config_id;
-            }
-            break;
-          case tracing::ConfigMetadata::Origin::ENVIRONMENT_VARIABLE:
-            j["origin"] = "env_var";
-            break;
-          case tracing::ConfigMetadata::Origin::CODE:
-            j["origin"] = "code";
-            break;
-          case tracing::ConfigMetadata::Origin::REMOTE_CONFIG:
-            j["origin"] = "remote_config";
-            break;
-          case tracing::ConfigMetadata::Origin::DEFAULT:
-            j["origin"] = "default";
-            break;
-        }
-        configuration_json.emplace_back(std::move(j));
-      }
-      continue;
-    }
+    if (product.name == Product::Name::tracing) continue;
 
     auto p = nlohmann::json{
         {to_string(product.name),

src/datadog/tracer_config.cpp

@@ -6,7 +6,6 @@
 #include <cassert>
 #include <string>
 #include <unordered_map>
-#include <unordered_set>
 #include <vector>
 
 #include "datadog/optional.h"
@@ -561,63 +560,7 @@ Expected<FinalizedTracerConfig> finalize_config(const TracerConfig& user_config,
     final_config.collector = user_config.collector;
   }
 
-  // Build additional config entries for stable config keys that are NOT
-  // natively consumed by dd-trace-cpp.  These are reported in telemetry so
-  // the backend sees all configured values and their origins.
-  {
-    // The set of DD_* keys already handled by the 5-arg
-    // resolve_and_record_config (which includes stable config sources).
-    // Keys only handled by the 3-arg version (env+user only) are NOT
-    // listed here, so their stable config values get picked up below.
-    static const std::unordered_set<std::string> native_keys = {
-        "DD_SERVICE",
-        "DD_ENV",
-        "DD_VERSION",
-        "DD_TRACE_STARTUP_LOGS",
-        "DD_TRACE_ENABLED",
-        "DD_TRACE_128_BIT_TRACEID_GENERATION_ENABLED",
-        "DD_APM_TRACING_ENABLED",
-    };
-
-    // Collect all unique keys from both stable configs.
-    std::unordered_set<std::string> seen_keys;
-    for (const auto& [key, _] : stable_configs.local.values) {
-      seen_keys.insert(key);
-    }
-    for (const auto& [key, _] : stable_configs.fleet.values) {
-      seen_keys.insert(key);
-    }
 
-    for (const auto& key : seen_keys) {
-      if (native_keys.count(key)) continue;
-
-      // Determine the winning source.
-      // Precedence: fleet_stable > local_stable (env not checked for
-      // non-native keys since dd-trace-cpp doesn't consume them).
-      auto fleet_val = stable_configs.fleet.lookup(key);
-      auto local_val = stable_configs.local.lookup(key);
-      // We don't check actual env vars here for non-native keys because
-      // dd-trace-cpp doesn't consume them from the environment.
-
-      if (fleet_val) {
-        telemetry::AdditionalConfigEntry entry;
-        entry.name = key;
-        entry.value = *fleet_val;
-        entry.origin = ConfigMetadata::Origin::FLEET_STABLE_CONFIG;
-        entry.config_id = stable_configs.fleet.config_id;
-        final_config.telemetry.additional_config_entries.push_back(
-            std::move(entry));
-      } else if (local_val) {
-        telemetry::AdditionalConfigEntry entry;
-        entry.name = key;
-        entry.value = *local_val;
-        entry.origin = ConfigMetadata::Origin::LOCAL_STABLE_CONFIG;
-        // Local stable config does not have a config_id attached.
-        final_config.telemetry.additional_config_entries.push_back(
-            std::move(entry));
-      }
-    }
-  }
 
   return final_config;
 }