split remote configs in game and annotation cfgs

Author: Gogoshika-ga

source/gameanalytics/GAState.cpp

@@ -411,7 +411,7 @@ namespace gameanalytics
                 out["user_id"] = getUserId();
 
                 // remote configs configurations
-                if(getInstance()._gameRemoteConfigsJson.is_object() && !getInstance()._gameRemoteConfigsJson.empty())
+                if(getInstance()._trackingRemoteConfigsJson.is_array() && !getInstance()._trackingRemoteConfigsJson.empty())
                 {
                     out["configurations_v3"] = getInstance().getRemoteConfigAnnotations();
                 }
@@ -910,10 +910,34 @@ namespace gameanalytics
             return contents.dump(JSON_PRINT_INDENT);
         }
 
+        void GAState::buildRemoteConfigsJsons(const json& remoteCfgs)
+        {
+            _gameRemoteConfigsJson = json::array();
+            _trackingRemoteConfigsJson = json::array();
+
+            for (const auto& configuration : remoteCfgs)
+            {
+                _gameRemoteConfigsJson.push_back({
+                        {"key", configuration["key"]},
+                        {"value", configuration["value"]}
+                });
+
+                _trackingRemoteConfigsJson.push_back({
+                    {"key", configuration["key"]},
+                    {"id", configuration["id"]},
+                    {"vsn", configuration["vsn"]}
+                });
+            }
+
+            logging::GALogger::d("Remote configs: %s", _gameRemoteConfigsJson.dump(JSON_PRINT_INDENT).c_str());
+            logging::GALogger::d("Remote configs for tracking: %s", _trackingRemoteConfigsJson.dump(JSON_PRINT_INDENT).c_str());
+            logging::GALogger::i("Remote configs ready with %zu configurations", _gameRemoteConfigsJson.size());
+        }
+
         void GAState::populateConfigurations(json& sdkConfig)
         {
-            std::lock_guard<std::recursive_mutex> guard(_mtx);
-            _gameRemoteConfigsJson = {};
+    
+            json _tempRemoteConfigsJson = {};
 
             try
             {
@@ -933,13 +957,15 @@ namespace gameanalytics
 
                             if (!key.empty() && configuration.contains("value") && client_ts_adjusted > start_ts && client_ts_adjusted < end_ts)
                             {
-                                _gameRemoteConfigsJson[key] = configuration;
+                                _tempRemoteConfigsJson[key] = configuration;
                                 logging::GALogger::d("configuration added: %s", configuration.dump(JSON_PRINT_INDENT).c_str());
                             }
                         }
                     }
                 }
 
+                buildRemoteConfigsJsons(_tempRemoteConfigsJson);
+
                 _remoteConfigsIsReady = true;
 
                 std::string const configStr = _gameRemoteConfigsJson.dump();
@@ -1160,18 +1186,7 @@ namespace gameanalytics
 
         json GAState::getRemoteConfigAnnotations()
         {
-            json configs;
-            for(json& obj : _gameRemoteConfigsJson)
-            {
-                json cfg;
-                cfg["vsn"] = utilities::getOptionalValue<int>(obj, "vsn", 0);
-                cfg["key"] = utilities::getOptionalValue<std::string>(obj, "key", "");
-                cfg["id"] = utilities::getOptionalValue<std::string>(obj, "id", "");
-
-                configs.push_back(cfg);
-            }
-
-            return configs;
+            return _trackingRemoteConfigsJson;
         }
     }
 }

source/gameanalytics/GAState.h

@@ -210,6 +210,8 @@ namespace gameanalytics
 
             void addErrorEvent(EGAErrorSeverity severity, std::string const& message);
 
+            void buildRemoteConfigsJsons(const json& remoteCfgs);
+            
             threading::GAThreading  _gaThread;
             events::GAEvents        _gaEvents;
             device::GADevice        _gaDevice;