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

Jump to bottom

Disabling metrics reporting; Updating ad-block deps to fix audit_deps error; Updating crypto deps to fix audit_deps error; #2029

Merged
merged 6 commits into from
Mar 26, 2019
Merged

Disabling metrics reporting; Updating ad-block deps to fix audit_deps error; Updating crypto deps to fix audit_deps error; #2029

merged 6 commits into from
Mar 26, 2019
+48 −3

Conversation

jumde
Copy link
Contributor

@jumde jumde commented Mar 22, 2019 •
edited
Loading

fix brave/brave-browser#3816
fix brave/brave-browser#3871
fix brave/brave-browser#3877
fix brave/brave-browser#3878

Description

  1. Disabling metrics reporting to avoid sending UMA metrics to google.
  2. Updating DEPS to fix npm audit error by js-yaml in sync, crypto and ad-block

Submitter Checklist:

  • Submitted a ticket for my issue if one did not already exist.
  • Used Github auto-closing keywords in the commit message.
  • Added/updated tests for this change (for new code or code which already has tests).
  • Verified that these changes build without errors on
    • Windows
    • macOS
    • Linux
  • Verified that these changes pass automated tests (npm test brave_unit_tests && npm test brave_browser_tests && npm run test-security) on
    • Windows
    • macOS
    • Linux
  • Verified that all lint errors/warnings are resolved (npm run lint)
  • Ran git rebase master (if needed).
  • Ran git rebase -i to squash commits (if needed).
  • Tagged reviewers and labelled the pull request as needed.
  • Request a security/privacy review as needed.
  • Add appropriate QA labels (QA/Yes or QA/No) to include the closed issue in milestone

Test Plan:

Reviewer Checklist:

  • New files have MPL-2.0 license header.
  • Request a security/privacy review as needed.
  • Adequate test coverage exists to prevent regressions
  • Verify test plan is specified in PR before merging to source

@jumde jumde self-assigned this Mar 22, 2019
jumde
jumde commented Mar 22, 2019
View reviewed changes
browser/metrics/metrics_reporting_util.cc Outdated
@@ -18,7 +18,7 @@ bool GetDefaultPrefValueForMetricsReporting() {
case version_info::Channel::CANARY:
return true;
case version_info::Channel::UNKNOWN:
return false;
return true;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TO-DO: This is for testing on Debug builds. Remove before merge.

Copy link
Member

@simonhong simonhong Mar 22, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you don't need this change for testing after enabling crash report via settings.
Ah,, debug build only returns false.

@simonhong
Copy link
Member

simonhong commented Mar 22, 2019 •
edited
Loading

Is this side-effect of #1985?
Right. #1985 makes metrics reporting on by default for dev/nightly channel.
We didn't see that this because default is off so far.

@pilgrim-brave pilgrim-brave marked this pull request as ready for review March 22, 2019 13:13
pilgrim-brave
pilgrim-brave previously approved these changes Mar 22, 2019
View reviewed changes
@jumde jumde force-pushed the fix_3816 branch 2 times, most recently from d7afe57 to 6e9931e Compare March 22, 2019 19:00
@simonhong
Copy link
Member

simonhong commented Mar 22, 2019 •
edited
Loading

LGTM. When you remove the code for testing. I'll approve. (Deleting code dismisses previous approve)

@jumde jumde force-pushed the fix_3816 branch 2 times, most recently from 0f34541 to 0f0a02e Compare March 24, 2019 22:37
@jumde jumde changed the title WIP: Issue 3816: Disabling metrics reporting WIP: Disabling metrics reporting; Updating ad-block deps to fix audit_deps error; Updating crypto deps to fix audit_deps error; Mar 25, 2019
@jumde
Copy link
Contributor Author

jumde commented Mar 25, 2019

npm run test-security works on DEBUG with the change in browser/metrics/metrics_reporting_util.cc. Change is reverted and PR builder is in progress.

@jumde jumde changed the title WIP: Disabling metrics reporting; Updating ad-block deps to fix audit_deps error; Updating crypto deps to fix audit_deps error; Disabling metrics reporting; Updating ad-block deps to fix audit_deps error; Updating crypto deps to fix audit_deps error; Mar 25, 2019
@bsclifton bsclifton mentioned this pull request Mar 25, 2019
Merged
19 tasks
@simonhong simonhong mentioned this pull request Mar 25, 2019
Closed
@jumde jumde merged commit 27c5932 into master Mar 26, 2019
@jumde jumde added this to the 0.64.x - Nightly milestone Mar 26, 2019
@jumde
Copy link
Contributor Author

jumde commented Mar 26, 2019

PR builder passed here: https://staging.ci.brave.com/job/brave-browser-build-pr/job/fix_3816/15/

jumde added a commit that referenced this pull request Mar 26, 2019
@jumde
Merge pull request #2029 from brave/fix_3816
cff249c 
Disabling metrics reporting; Updating ad-block deps to fix audit_deps error; Updating crypto deps to fix audit_deps error;
@jumde jumde mentioned this pull request Mar 26, 2019
Merged
19 tasks
jumde added a commit that referenced this pull request Mar 26, 2019
@jumde
Merge pull request #2029 from brave/fix_3816
24c9541 
Disabling metrics reporting; Updating ad-block deps to fix audit_deps error; Updating crypto deps to fix audit_deps error;
@jumde jumde mentioned this pull request Mar 26, 2019
Merged
19 tasks
@mihaiplesa mihaiplesa deleted the fix_3816 branch March 26, 2019 09:43
@jumde jumde modified the milestones: 0.64.x - Nightly, 0.62.x - Beta Mar 26, 2019
@jumde jumde modified the milestones: 0.64.x - Nightly, 0.62.x - Beta Mar 26, 2019
@jumde
Copy link
Contributor Author

jumde commented Mar 26, 2019

Part of this PR was uplifted to 0.62/0.63 (disabling metrics services), so tagged this PR with 0.62.x milestone to reflect the same. cc: @bsclifton

@bsclifton
Copy link
Member

@jumde left the PR as 0.64.x since it was merged against master

Looking at the issues though, looks like those are properly assigned 😄

bsclifton pushed a commit that referenced this pull request Mar 27, 2019
@jumde @bsclifton
Revert "Merge pull request #2029 from brave/fix_3816"
e882cec 
This reverts commit 27c5932, reversing
changes made to 2a6fe67.
This was referenced Mar 27, 2019
Merged
Closed
@jumde jumde mentioned this pull request Mar 27, 2019
Merged
19 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@simonhong simonhong simonhong approved these changes

@pilgrim-brave pilgrim-brave pilgrim-brave left review comments

@bbondy bbondy Awaiting requested review from bbondy

Assignees

@jumde jumde

Labels
None yet
Projects
None yet
Milestone
0.64.x - Release
4 participants
@jumde @simonhong @bsclifton @pilgrim-brave