Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes assertion thrown in debug builds when generating Brave Ads console log report #4774

Merged
merged 1 commit into from
Feb 27, 2020
Merged

Fixes assertion thrown in debug builds when generating Brave Ads console log report #4774

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 23 additions & 31 deletions vendor/bat-native-ads/src/bat/ads/internal/reports.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ Reports::Reports(
AdsImpl* ads)
: is_first_run_(true),
ads_(ads) {
DCHECK(ads_);
}

Reports::~Reports() = default;
Expand All @@ -29,37 +30,33 @@ std::string Reports::GenerateAdNotificationEventReport(
rapidjson::StringBuffer buffer;
rapidjson::Writer<rapidjson::StringBuffer> writer(buffer);

const std::string timestamp = Time::Timestamp();

writer.StartObject();

if (is_first_run_) {
is_first_run_ = false;

writer.StartObject();

writer.String("data");
writer.StartObject();

writer.String("type");
writer.String("restart");

writer.String("timestamp");
auto time_stamp = Time::Timestamp();
writer.String(time_stamp.c_str());

writer.EndObject();
writer.String(timestamp.c_str());

writer.EndObject();
}

writer.StartObject();

writer.String("data");
writer.StartObject();

writer.String("type");
writer.String("notify");

writer.String("timestamp");
auto time_stamp = Time::Timestamp();
writer.String(time_stamp.c_str());
writer.String(timestamp.c_str());

writer.String("eventType");
switch (event_type) {
Expand Down Expand Up @@ -125,8 +122,8 @@ std::string Reports::GenerateConfirmationEventReport(
writer.String("confirmation");

writer.String("timestamp");
auto time_stamp = Time::Timestamp();
writer.String(time_stamp.c_str());
const std::string timestamp = Time::Timestamp();
writer.String(timestamp.c_str());

writer.String("creativeInstanceId");
writer.String(creative_instance_id.c_str());
Expand Down Expand Up @@ -155,8 +152,8 @@ std::string Reports::GenerateLoadEventReport(
writer.String("load");

writer.String("timestamp");
auto time_stamp = Time::Timestamp();
writer.String(time_stamp.c_str());
const std::string timestamp = Time::Timestamp();
writer.String(timestamp.c_str());

writer.String("tabId");
writer.Int(info.tab_id);
Expand Down Expand Up @@ -211,8 +208,8 @@ std::string Reports::GenerateBackgroundEventReport() const {
writer.String("background");

writer.String("timestamp");
auto time_stamp = Time::Timestamp();
writer.String(time_stamp.c_str());
const std::string timestamp = Time::Timestamp();
writer.String(timestamp.c_str());

writer.EndObject();

Expand All @@ -234,8 +231,8 @@ std::string Reports::GenerateForegroundEventReport() const {
writer.String("foreground");

writer.String("timestamp");
auto time_stamp = Time::Timestamp();
writer.String(time_stamp.c_str());
const std::string timestamp = Time::Timestamp();
writer.String(timestamp.c_str());

writer.EndObject();

Expand All @@ -258,8 +255,8 @@ std::string Reports::GenerateBlurEventReport(
writer.String("blur");

writer.String("timestamp");
auto time_stamp = Time::Timestamp();
writer.String(time_stamp.c_str());
const std::string timestamp = Time::Timestamp();
writer.String(timestamp.c_str());

writer.String("tabId");
writer.Int(info.tab_id);
Expand All @@ -285,8 +282,8 @@ std::string Reports::GenerateDestroyEventReport(
writer.String("destroy");

writer.String("timestamp");
auto time_stamp = Time::Timestamp();
writer.String(time_stamp.c_str());
const std::string timestamp = Time::Timestamp();
writer.String(timestamp.c_str());

writer.String("tabId");
writer.Int(info.tab_id);
Expand All @@ -312,8 +309,8 @@ std::string Reports::GenerateFocusEventReport(
writer.String("focus");

writer.String("timestamp");
auto time_stamp = Time::Timestamp();
writer.String(time_stamp.c_str());
const std::string timestamp = Time::Timestamp();
writer.String(timestamp.c_str());

writer.String("tabId");
writer.Int(info.tab_id);
Expand All @@ -326,11 +323,6 @@ std::string Reports::GenerateFocusEventReport(
}

std::string Reports::GenerateSettingsEventReport() const {
DCHECK(ads_);
if (!ads_) {
return "Failed to generate settings event report";
}

rapidjson::StringBuffer buffer;
rapidjson::Writer<rapidjson::StringBuffer> writer(buffer);

Expand All @@ -343,8 +335,8 @@ std::string Reports::GenerateSettingsEventReport() const {
writer.String("settings");

writer.String("timestamp");
auto time_stamp = Time::Timestamp();
writer.String(time_stamp.c_str());
const std::string timestamp = Time::Timestamp();
writer.String(timestamp.c_str());

writer.String("settings");
writer.StartObject();
Expand Down