fix: Fix a wrapper support issue where the wrapper header didn't properly handle a missing version.

Author: kinyoklion

contract-tests/data-model/include/data_model/data_model.hpp

@@ -143,6 +143,13 @@ struct ConfigHooksParams {
 
 NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT(ConfigHooksParams, hooks);
 
+struct ConfigWrapper {
+    std::string name;
+    std::string version;
+};
+
+NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT(ConfigWrapper, name, version);
+
 struct ConfigParams {
     std::string credential;
     std::optional<uint32_t> startWaitTimeMs;
@@ -156,6 +163,7 @@ struct ConfigParams {
     std::optional<ConfigTLSParams> tls;
     std::optional<ConfigProxyParams> proxy;
     std::optional<ConfigHooksParams> hooks;
+    std::optional<ConfigWrapper> wrapper;
 };
 
 NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT(ConfigParams,
@@ -170,7 +178,8 @@ NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT(ConfigParams,
                                                 tags,
                                                 tls,
                                                 proxy,
-                                                hooks);
+                                                hooks,
+                                                wrapper);
 
 struct ContextSingleParams {
     std::optional<std::string> kind;

contract-tests/server-contract-tests/src/entity_manager.cpp

@@ -145,6 +145,15 @@ std::optional<std::string> EntityManager::create(ConfigParams const& in) {
         }
     }
 
+    if (in.wrapper) {
+        if (!in.wrapper->name.empty()) {
+            config_builder.HttpProperties().WrapperName(in.wrapper->name);
+        }
+        if (!in.wrapper->version.empty()) {
+            config_builder.HttpProperties().WrapperVersion(in.wrapper->version);
+        }
+    }
+
     auto config = config_builder.Build();
     if (!config) {
         LD_LOG(logger_, LogLevel::kWarn)

contract-tests/server-contract-tests/src/main.cpp

@@ -50,6 +50,7 @@ int main(int argc, char* argv[]) {
         srv.add_capability("client-prereq-events");
         srv.add_capability("evaluation-hooks");
         srv.add_capability("track-hooks");
+        srv.add_capability("wrapper");
 
         net::signal_set signals{ioc, SIGINT, SIGTERM};
 

libs/common/src/config/http_properties_builder.cpp

@@ -133,8 +133,12 @@ template <typename SDK>
 built::HttpProperties HttpPropertiesBuilder<SDK>::Build() const {
     if (!wrapper_name_.empty()) {
         std::map<std::string, std::string> headers_with_wrapper(base_headers_);
-        headers_with_wrapper["X-LaunchDarkly-Wrapper"] =
-            wrapper_name_ + "/" + wrapper_version_;
+        if (wrapper_version_.empty()) {
+            headers_with_wrapper["X-LaunchDarkly-Wrapper"] = wrapper_name_;
+        } else {
+            headers_with_wrapper["X-LaunchDarkly-Wrapper"] =
+                wrapper_name_ + "/" + wrapper_version_;
+        }
         return {connect_timeout_,  read_timeout_,        write_timeout_,
                 response_timeout_, headers_with_wrapper, tls_.Build(), proxy_};
     }