chore: log error when FDv2 filter key is invalid

Author: beekld

libs/server-sdk/src/data_systems/fdv2/fdv2_polling_impl.cpp

@@ -44,7 +44,8 @@ network::HttpRequest MakeFDv2PollRequest(
     config::built::ServiceEndpoints const& endpoints,
     config::built::HttpProperties const& http_properties,
     data_model::Selector const& selector,
-    std::optional<std::string> const& filter_key) {
+    std::optional<std::string> const& filter_key,
+    Logger const& logger) {
     config::builders::HttpPropertiesBuilder const builder(http_properties);
 
     auto parsed = boost::urls::parse_uri(endpoints.PollingBaseUrl());
@@ -65,8 +66,14 @@ network::HttpRequest MakeFDv2PollRequest(
     if (selector.value) {
         u.params().append({"basis", selector.value->state});
     }
-    if (filter_key && detail::ValidateFilterKey(*filter_key)) {
-        u.params().append({"filter", *filter_key});
+    if (filter_key) {
+        if (detail::ValidateFilterKey(*filter_key)) {
+            u.params().append({"filter", *filter_key});
+        } else {
+            LD_LOG(logger, LogLevel::kError)
+                << "data source config: provided filter is invalid, will "
+                   "request full environment instead";
+        }
     }
 
     return {std::string(u.buffer()), network::HttpMethod::kGet, builder.Build(),

libs/server-sdk/src/data_systems/fdv2/fdv2_polling_impl.hpp

@@ -19,7 +19,8 @@ network::HttpRequest MakeFDv2PollRequest(
     config::built::ServiceEndpoints const& endpoints,
     config::built::HttpProperties const& http_properties,
     data_model::Selector const& selector,
-    std::optional<std::string> const& filter_key);
+    std::optional<std::string> const& filter_key,
+    Logger const& logger);
 
 // Parse an HTTP response from the FDv2 polling endpoint through the protocol
 // handler and return the appropriate result. identity is used in log messages

libs/server-sdk/src/data_systems/fdv2/polling_initializer.cpp

@@ -20,7 +20,8 @@ FDv2PollingInitializer::FDv2PollingInitializer(
     : request_(MakeFDv2PollRequest(endpoints,
                                    http_properties,
                                    std::move(selector),
-                                   std::move(filter_key))),
+                                   std::move(filter_key),
+                                   logger)),
       requester_(executor, http_properties.Tls()),
       state_(std::make_shared<State>(logger)) {}
 

libs/server-sdk/src/data_systems/fdv2/polling_synchronizer.cpp

@@ -34,7 +34,7 @@ FDv2PollingSynchronizer::State::State(
 async::Future<network::HttpResult> FDv2PollingSynchronizer::State::Request(
     data_model::Selector const& selector) const {
     auto request = MakeFDv2PollRequest(endpoints_, http_properties_, selector,
-                                       filter_key_);
+                                       filter_key_, logger_);
 
     // Promise must be in a shared_ptr because Requester requires callbacks
     // to be copy-constructible (stored in std::function).

libs/server-sdk/src/data_systems/fdv2/streaming_synchronizer.cpp

@@ -172,8 +172,14 @@ void FDv2StreamingSynchronizer::State::OnConnect(HttpRequest* req) {
     if (latest_selector_.value) {
         u.params().set("basis", latest_selector_.value->state);
     }
-    if (filter_key_ && detail::ValidateFilterKey(*filter_key_)) {
-        u.params().set("filter", *filter_key_);
+    if (filter_key_) {
+        if (detail::ValidateFilterKey(*filter_key_)) {
+            u.params().set("filter", *filter_key_);
+        } else {
+            LD_LOG(logger_, LogLevel::kError)
+                << "data source config: provided filter is invalid, will "
+                   "request full environment instead";
+        }
     }
     req->target(u.encoded_target());
 }

libs/server-sdk/tests/fdv2_polling_impl_test.cpp

@@ -110,41 +110,45 @@ TEST(HandleFDv2PollResponseTest, NetworkErrorDoesNotSetFlag) {
 }
 
 TEST(MakeFDv2PollRequestTest, BaseWithTrailingSlashDoesNotProduceDoubleSlash) {
+    auto logger = MakeNullLogger();
     config::shared::built::ServiceEndpoints endpoints{"http://example.com/", "",
                                                       ""};
     auto props =
         config::shared::Defaults<config::shared::ServerSDK>::HttpProperties();
     auto req = MakeFDv2PollRequest(endpoints, props, data_model::Selector{},
-                                   std::nullopt);
+                                   std::nullopt, logger);
     EXPECT_EQ(req.Url(), "http://example.com/sdk/poll");
 }
 
 TEST(MakeFDv2PollRequestTest, BaseWithSubpathTrailingSlashJoinsCleanly) {
+    auto logger = MakeNullLogger();
     config::shared::built::ServiceEndpoints endpoints{
         "http://example.com/relay/", "", ""};
     auto props =
         config::shared::Defaults<config::shared::ServerSDK>::HttpProperties();
     auto req = MakeFDv2PollRequest(endpoints, props, data_model::Selector{},
-                                   std::nullopt);
+                                   std::nullopt, logger);
     EXPECT_EQ(req.Url(), "http://example.com/relay/sdk/poll");
 }
 
 TEST(MakeFDv2PollRequestTest, ValidFilterKeyIsIncluded) {
+    auto logger = MakeNullLogger();
     config::shared::built::ServiceEndpoints endpoints{"http://example.com", "",
                                                       ""};
     auto props =
         config::shared::Defaults<config::shared::ServerSDK>::HttpProperties();
     auto req = MakeFDv2PollRequest(endpoints, props, data_model::Selector{},
-                                   std::string{"my-filter_1.0"});
+                                   std::string{"my-filter_1.0"}, logger);
     EXPECT_EQ(req.Url(), "http://example.com/sdk/poll?filter=my-filter_1.0");
 }
 
 TEST(MakeFDv2PollRequestTest, InvalidFilterKeyIsDropped) {
+    auto logger = MakeNullLogger();
     config::shared::built::ServiceEndpoints endpoints{"http://example.com", "",
                                                       ""};
     auto props =
         config::shared::Defaults<config::shared::ServerSDK>::HttpProperties();
     auto req = MakeFDv2PollRequest(endpoints, props, data_model::Selector{},
-                                   std::string{"has spaces"});
+                                   std::string{"has spaces"}, logger);
     EXPECT_EQ(req.Url(), "http://example.com/sdk/poll");
 }