PR Changes

Author: ZahidZafar

examples/example_integration.cpp

@@ -2,27 +2,26 @@
 #include <chrono>
 #include <random>
 #include <iostream>
-using namespace std;
-
-
 #include "countly.hpp"
 
+using namespace std;
+
 void printLog(Countly::LogLevel level, const string& msg) {
 	string lvl = "[DEBUG]";
 	switch (level) {
-	case Countly::LogLevel::DEBUG/* constant-expression */:
+	case Countly::LogLevel::DEBUG:
 		lvl = "[Debug]";
 		break;
 	case Countly::LogLevel::INFO:
 		lvl = "[INFO]";
 		break;
-		case Countly::LogLevel::WARNING:
+	case Countly::LogLevel::WARNING:
 		lvl = "[WARNING]";
 		break;
-		case Countly::LogLevel::ERROR:
+	case Countly::LogLevel::ERROR:
 		lvl = "[ERROR]";
 		break;
-		case Countly::LogLevel::FATAL:
+	case Countly::LogLevel::FATAL:
 		lvl = "[FATAL]";
 		break;
 
@@ -39,7 +38,7 @@ int main() {
 	cout<<"Sample App"<<endl;
 	Countly& ct = Countly::getInstance();
 	ct.alwaysUsePost(true);
-	ct.setDeviceID("zahidzafar");
+	ct.setDeviceID("test-device-id");
 
 	void (*logger_function)(Countly::LogLevel level, const std::string& message);
 	logger_function = printLog;
@@ -48,7 +47,7 @@ int main() {
 	ct.SetMetrics("Windows 10", "10.22", "Mac", "800x600", "Carrier", "1.0");
 	ct.setCustomUserDetails({{"Account Type", "Basic"}, {"Employer", "Company4"}});
 	// Server and port
-	ct.Start("8c1d653f8f474be24958b282d5e9b4c4209ee552", "https://master.count.ly", 443);
+	ct.Start("YOUR_APP_KEY", "https://try.count.ly", 443);
 	ct.SetMaxEventsPerMessage(10);
 	ct.SetMinUpdatePeriod(10);
 	ct.setUpdateInterval(15);
@@ -60,6 +59,7 @@ int main() {
 		cout<<"2) Event with count and sum"<<endl;
 		cout<<"3) Event with count, sum, duration"<<endl;
 		cout<<"4) Event with sum, count, duration and segmentation"<<endl;
+		cout<<"5) Update Session"<<endl;
 		cout<<"0) Exit"<<endl;
 		int a;
 		cin>>a;
@@ -81,17 +81,20 @@ int main() {
 			ct.RecordEvent("Event with sum, count, duration and segmentation", segmentation, 1, 0, 10);
 			break;
 		}
+		case 5:
+			ct.updateSession();
+			break;
 		case 0:
 			flag = false;
 			break;
-		
 		default:
 			cout<<"Option not found!"<<endl;
 			break;
 		}
 	}
 
 	ct.updateSession();
+	ct.stop();
 
 	return 0;
 }

include/countly.hpp

@@ -21,7 +21,7 @@ using json = nlohmann::json;
 
 #define COUNTLY_SDK_NAME "cpp-native-unknown"
 #define COUNTLY_SDK_VERSION "0.1.0"
-#define COUNTLY_API_VERSION "19.8.0"
+#define COUNTLY_API_VERSION "21.11.0"
 #define COUNTLY_POST_THRESHOLD 2000
 #define COUNTLY_KEEPALIVE_INTERVAL 3000
 #define COUNTLY_MAX_EVENTS_DEFAULT 200

src/countly.cpp

@@ -182,7 +182,7 @@ void Countly::setDeviceID(const std::string& value, bool same_user) {
 
 void Countly::start(const std::string& app_key, const std::string& host, int port, bool start_thread) {
 	mutex.lock();
-	log(Countly::LogLevel::DEBUG, "[Countly][start]");
+	log(Countly::LogLevel::INFO, "[Countly][start]");
 	this->host = host;
 	if (host.find("http://") == 0) {
 		use_https = false;
@@ -370,7 +370,7 @@ void Countly::flushEvents(std::chrono::seconds timeout) {
 
 bool Countly::beginSession() {
 	mutex.lock();
-	log(Countly::LogLevel::DEBUG, "[Countly][beginSession]");
+	log(Countly::LogLevel::INFO, "[Countly][beginSession]");
 	if (began_session) {
 		mutex.unlock();
 		return true;
@@ -410,7 +410,7 @@ bool Countly::beginSession() {
 }
 
 bool Countly::updateSession() {
-	log(Countly::LogLevel::DEBUG, "[Countly][updateSession]");
+	log(Countly::LogLevel::INFO, "[Countly][updateSession]");
 
 	mutex.lock();
 	if (!began_session) {
@@ -490,7 +490,8 @@ bool Countly::updateSession() {
 				mutex.unlock();
 				return false;
 			}
-			last_sent = Countly::getTimestamp();
+
+			last_sent += duration;
 		}
 
 		mutex.unlock();
@@ -509,7 +510,7 @@ bool Countly::updateSession() {
 		return false;
 	}
 
-	last_sent = Countly::getTimestamp();
+	last_sent += duration;
 
 #ifndef COUNTLY_USE_SQLITE
 	event_queue.clear();
@@ -534,7 +535,7 @@ bool Countly::updateSession() {
 }
 
 bool Countly::endSession() {
-	log(Countly::LogLevel::DEBUG, "[Countly][endSession]");
+	log(Countly::LogLevel::INFO, "[Countly][endSession]");
 	const std::chrono::system_clock::time_point now = Countly::getTimestamp();
 	const auto timestamp = std::chrono::duration_cast<std::chrono::seconds>(now.time_since_epoch());
 	const auto duration = std::chrono::duration_cast<std::chrono::seconds>(getSessionDuration(now));
@@ -631,7 +632,7 @@ static size_t countly_curl_write_callback(void *data, size_t byte_size, size_t n
 Countly::HTTPResponse Countly::sendHTTP(std::string path, std::string data) {
 	bool use_post = always_use_post || (data.size() > COUNTLY_POST_THRESHOLD);
 
-log(Countly::LogLevel::INFO, "[Countly][sendHTTP] data: "+ data);
+log(Countly::LogLevel::DEBUG, "[Countly][sendHTTP] data: "+ data);
 	if (!salt.empty()) {
 		unsigned char checksum[SHA256_DIGEST_LENGTH];
 		std::string salted_data = data + salt;
@@ -768,7 +769,7 @@ log(Countly::LogLevel::INFO, "[Countly][sendHTTP] data: "+ data);
 			curl_easy_setopt(curl, CURLOPT_POSTFIELDS, data.c_str());
 		}
 
-		log(Countly::LogLevel::INFO, "[Countly][sendHTTP] request: " + full_url_stream.str());
+		log(Countly::LogLevel::DEBUG, "[Countly][sendHTTP] request: " + full_url_stream.str());
 
 		std::string full_url = full_url_stream.str();
 		curl_easy_setopt(curl, CURLOPT_URL, full_url.c_str());
@@ -790,7 +791,7 @@ log(Countly::LogLevel::INFO, "[Countly][sendHTTP] data: "+ data);
 		curl_easy_cleanup(curl);
 	}
 #endif
-	log(Countly::LogLevel::INFO, "[Countly][sendHTTP] response: " + response.data.dump());
+	log(Countly::LogLevel::DEBUG, "[Countly][sendHTTP] response: " + response.data.dump());
 	return response;
 #endif
 
@@ -808,7 +809,7 @@ std::chrono::system_clock::duration Countly::getSessionDuration() {
 }
 
 void Countly::updateLoop() {
-	log(Countly::LogLevel::INFO, "[Countly][updateLoop]");
+	log(Countly::LogLevel::DEBUG, "[Countly][updateLoop]");
 	mutex.lock();
 	running = true;
 	mutex.unlock();