diff --git a/src/datadog/config_manager.cpp b/src/datadog/config_manager.cpp index 348c2e1d..df4a7896 100644 --- a/src/datadog/config_manager.cpp +++ b/src/datadog/config_manager.cpp @@ -124,7 +124,6 @@ ConfigManager::Update parse_dynamic_config(const nlohmann::json& j) { namespace rc = datadog::remote_config; ConfigManager::ConfigManager(const FinalizedTracerConfig& config, - const TracerSignature& tracer_signature, const std::shared_ptr& telemetry) : clock_(config.clock), default_metadata_(config.metadata), @@ -133,7 +132,6 @@ ConfigManager::ConfigManager(const FinalizedTracerConfig& config, rules_(config.trace_sampler.rules), span_defaults_(std::make_shared(config.defaults)), report_traces_(config.report_traces), - tracer_signature_(tracer_signature), telemetry_(telemetry) {} rc::Products ConfigManager::get_products() { return rc::product::APM_TRACING; } @@ -151,14 +149,6 @@ Optional ConfigManager::on_update(const Configuration& config) { const auto config_json = nlohmann::json::parse(config.content); - const auto& targeted_service = config_json.at("service_target"); - if (targeted_service.at("service").get() != - tracer_signature_.default_service || - targeted_service.at("env").get() != - tracer_signature_.default_environment) { - return "Wrong service targeted"; - } - auto config_update = parse_dynamic_config(config_json.at("lib_config")); auto config_metadata = apply_update(config_update); diff --git a/src/datadog/config_manager.h b/src/datadog/config_manager.h index e6c4cabf..280fb971 100644 --- a/src/datadog/config_manager.h +++ b/src/datadog/config_manager.h @@ -76,7 +76,6 @@ class ConfigManager : public remote_config::Listener { DynamicConfig> span_defaults_; DynamicConfig report_traces_; - const TracerSignature& tracer_signature_; std::shared_ptr telemetry_; private: @@ -86,7 +85,6 @@ class ConfigManager : public remote_config::Listener { public: ConfigManager(const FinalizedTracerConfig& config, - const TracerSignature& signature, const std::shared_ptr& telemetry); ~ConfigManager() override{}; diff --git a/src/datadog/tracer.cpp b/src/datadog/tracer.cpp index 321ce308..248f0b34 100644 --- a/src/datadog/tracer.cpp +++ b/src/datadog/tracer.cpp @@ -47,8 +47,8 @@ Tracer::Tracer(const FinalizedTracerConfig& config, tracer_telemetry_(std::make_shared( config.telemetry.enabled, config.clock, logger_, signature_, config.integration_name, config.integration_version)), - config_manager_(std::make_shared(config, signature_, - tracer_telemetry_)), + config_manager_( + std::make_shared(config, tracer_telemetry_)), collector_(/* see constructor body */), span_sampler_( std::make_shared(config.span_sampler, config.clock)), diff --git a/test/test_config_manager.cpp b/test/test_config_manager.cpp index ab0c2b4e..aa2f9f5c 100644 --- a/test/test_config_manager.cpp +++ b/test/test_config_manager.cpp @@ -29,8 +29,7 @@ CONFIG_MANAGER_TEST("remote configuration handling") { auto tracer_telemetry = std::make_shared( false, default_clock, nullptr, tracer_signature, "", ""); - ConfigManager config_manager(*finalize_config(config), tracer_signature, - tracer_telemetry); + ConfigManager config_manager(*finalize_config(config), tracer_telemetry); rc::Listener::Configuration config_update{/* id = */ "id", /* path = */ "", @@ -38,24 +37,6 @@ CONFIG_MANAGER_TEST("remote configuration handling") { /* version = */ 1, rc::product::Flag::APM_TRACING}; - SECTION( - "configuration updates targetting the wrong tracer reports an error") { - // clang-format off - auto test_case = GENERATE(values({ - R"({ "service_target": { "service": "not-testsvc", "env": "test" } })", - R"({ "service_target": { "service": "testsvc", "env": "not-test" } })" - })); - // clang-format on - - CAPTURE(test_case); - - config_update.content = test_case; - - // TODO: targetting wrong procut -> error - const auto err = config_manager.on_update(config_update); - CHECK(err); - } - SECTION("handling of `tracing_sampling_rate`") { // SECTION("invalid value") { // config_update.content = R"({ diff --git a/test/test_datadog_agent.cpp b/test/test_datadog_agent.cpp index 3cc125c4..532c088f 100644 --- a/test/test_datadog_agent.cpp +++ b/test/test_datadog_agent.cpp @@ -200,8 +200,7 @@ TEST_CASE("Remote Configuration", "[datadog_agent]") { finalized->telemetry.enabled, finalized->clock, finalized->logger, signature, "", ""); - auto config_manager = - std::make_shared(*finalized, signature, telemetry); + auto config_manager = std::make_shared(*finalized, telemetry); const auto& agent_config = std::get(finalized->collector);