CPP-818 - Add configuration properties to Insights startup message

Author: Michael Fero

cpp-driver/gtests/src/unit/tests/test_cluster.cpp

@@ -315,6 +315,8 @@ class ClusterUnitTest : public EventLoopTest {
       return ClusterMetadataResolver::Ptr(new LocalDcClusterMetadataResolver(local_dc_));
     }
 
+    virtual const char* name() const { return "LocalDc"; }
+
   private:
     String local_dc_;
   };

cpp-driver/gtests/src/unit/tests/test_session.cpp

@@ -253,6 +253,8 @@ class SessionUnitTest : public EventLoopTest {
       return ClusterMetadataResolver::Ptr(new LocalDcClusterMetadataResolver(local_dc_));
     }
 
+    virtual const char* name() const { return "LocalDc"; }
+
   private:
     String local_dc_;
   };

cpp-driver/src/cloud_secure_connection_config.cpp

@@ -208,6 +208,8 @@ class CloudClusterMetadataResolverFactory : public ClusterMetadataResolverFactor
         settings.control_connection_settings.connection_settings.connect_timeout_ms));
   }
 
+  virtual const char* name() const { return "Cloud"; }
+
 private:
   String host_;
   int port_;

cpp-driver/src/cluster_metadata_resolver.hpp

@@ -71,6 +71,7 @@ class ClusterMetadataResolverFactory : public RefCounted<ClusterMetadataResolver
 
   virtual ~ClusterMetadataResolverFactory() {}
   virtual ClusterMetadataResolver::Ptr new_instance(const ClusterSettings& settings) const = 0;
+  virtual const char* name() const = 0;
 };
 
 /**
@@ -81,6 +82,7 @@ class ClusterMetadataResolverFactory : public RefCounted<ClusterMetadataResolver
 class DefaultClusterMetadataResolverFactory : public ClusterMetadataResolverFactory {
 public:
   virtual ClusterMetadataResolver::Ptr new_instance(const ClusterSettings& settings) const;
+  virtual const char* name() const { return "Default"; }
 };
 
 }}} // namespace datastax::internal::core

src/client_insights.cpp

@@ -499,6 +499,10 @@ class StartupMessageHandler : public RefCounted<StartupMessageHandler> {
     writer.Bool(config_.prepare_on_up_or_add_host());
     writer.Key("noCompact");
     writer.Bool(config_.no_compact());
+    writer.Key("cloudSecureConnectBundleLoaded");
+    writer.Bool(config_.cloud_secure_connection_config().is_loaded());
+    writer.Key("clusterMetadataResolver");
+    writer.String(config_.cluster_metadata_resolver_factory()->name());
     writer.EndObject(); // configuration
 
     writer.EndObject(); // otherOptions

tests/src/unit/tests/test_client_insights.cpp

@@ -387,7 +387,7 @@ TEST_F(ClientInsightsUnitTest, StartupData) {
     ASSERT_TRUE(value.HasMember("configuration"));
     const json::Value& configuration = value["configuration"];
     ASSERT_TRUE(configuration.IsObject());
-    ASSERT_EQ(24u, configuration.MemberCount());
+    ASSERT_EQ(26u, configuration.MemberCount());
     ASSERT_TRUE(configuration.HasMember("protocolVersion"));
     ASSERT_EQ(config_.protocol_version().value(), configuration["protocolVersion"].GetInt());
     ASSERT_TRUE(configuration.HasMember("useBetaProtocol"));
@@ -441,6 +441,12 @@ TEST_F(ClientInsightsUnitTest, StartupData) {
     ASSERT_EQ(config_.prepare_on_up_or_add_host(), configuration["prepareOnUpOrAddHost"].GetBool());
     ASSERT_TRUE(configuration.HasMember("noCompact"));
     ASSERT_EQ(config_.no_compact(), configuration["noCompact"].GetBool());
+    ASSERT_TRUE(configuration.HasMember("cloudSecureConnectBundleLoaded"));
+    ASSERT_EQ(config_.cloud_secure_connection_config().is_loaded(),
+              configuration["cloudSecureConnectBundleLoaded"].GetBool());
+    ASSERT_TRUE(configuration.HasMember("clusterMetadataResolver"));
+    ASSERT_STREQ(config_.cluster_metadata_resolver_factory()->name(),
+                 configuration["clusterMetadataResolver"].GetString());
   }
   { // platform info
     ASSERT_TRUE(data.HasMember("platformInfo"));