[Merge M87] About flags for conditional logging in Feed V1 and V2
(cherry picked from commit 5c4e4d0e42c41c8d2aa3a920f7a07b4ba1f25b3f)
Bug: 1138034
Change-Id: Ie695a12b14ec58a240ec3242a5c27958ad4e4405
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2463717
Commit-Queue: Vincent Boisselle <[email protected]>
Reviewed-by: Dan H <[email protected]>
Cr-Original-Commit-Position: refs/heads/master@{#816798}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2476776
Reviewed-by: Vincent Boisselle <[email protected]>
Cr-Commit-Position: refs/branch-heads/4280@{#420}
Cr-Branched-From: ea420fb963f9658c9969b6513c56b8f47efa1a2a-refs/heads/master@{#812852}
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index be90820..5e4e844 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -3523,6 +3523,18 @@
{"report-feed-user-actions", flag_descriptions::kReportFeedUserActionsName,
flag_descriptions::kReportFeedUserActionsDescription, kOsAndroid,
FEATURE_VALUE_TYPE(feed::kReportFeedUserActions)},
+ {"interest-feed-v1-clicks-and-views-cond-upload",
+ flag_descriptions::InterestFeedV1ClickAndViewActionsConditionalUploadName,
+ flag_descriptions::
+ InterestFeedV1ClickAndViewActionsConditionalUploadDescription,
+ kOsAndroid,
+ FEATURE_VALUE_TYPE(feed::kInterestFeedV1ClicksAndViewsConditionalUpload)},
+ {"interest-feed-v2-clicks-and-views-cond-upload",
+ flag_descriptions::InterestFeedV2ClickAndViewActionsConditionalUploadName,
+ flag_descriptions::
+ InterestFeedV2ClickAndViewActionsConditionalUploadDescription,
+ kOsAndroid,
+ FEATURE_VALUE_TYPE(feed::kInterestFeedV2ClicksAndViewsConditionalUpload)},
{"offlining-recent-pages", flag_descriptions::kOffliningRecentPagesName,
flag_descriptions::kOffliningRecentPagesDescription, kOsAndroid,
FEATURE_VALUE_TYPE(offline_pages::kOffliningRecentPagesFeature)},
diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
index 4448983e..352f10d3 100644
--- a/chrome/browser/flag-metadata.json
+++ b/chrome/browser/flag-metadata.json
@@ -2914,11 +2914,21 @@
"expiry_milestone": 90
},
{
+ "name": "interest-feed-v1-clicks-and-views-cond-upload",
+ "owners": [ "//chrome/android/feed/OWNERS", "[email protected]" ],
+ "expiry_milestone": 90
+ },
+ {
"name": "interest-feed-v2",
"owners": [ "//chrome/android/feed/OWNERS", "[email protected]" ],
"expiry_milestone": 95
},
{
+ "name": "interest-feed-v2-clicks-and-views-cond-upload",
+ "owners": [ "//chrome/android/feed/OWNERS", "[email protected]" ],
+ "expiry_milestone": 90
+ },
+ {
"name": "ios-breadcrumbs",
"owners": [ "michaeldo", "bling-flags" ],
// Breadcrumbs is not a launching feature, but rather a tool used on
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
index 8696da9..82f73c7 100644
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
@@ -2867,6 +2867,18 @@
"Allow the user to provide feedback from a feed card.";
const char kInterestFeedFeedbackName[] = "Interest Feed Feedback";
+const char InterestFeedV1ClickAndViewActionsConditionalUploadName[] =
+ "Interest Feed V1 clicks/views conditional upload";
+const char InterestFeedV1ClickAndViewActionsConditionalUploadDescription[] =
+ "Only enable the upload of clicks/views in Feed V1 after reaching "
+ "conditions.";
+
+const char InterestFeedV2ClickAndViewActionsConditionalUploadName[] =
+ "Interest Feed V2 clicks/views conditional upload";
+const char InterestFeedV2ClickAndViewActionsConditionalUploadDescription[] =
+ "Only enable the upload of clicks/views in Feed V2 after reaching "
+ "conditions.";
+
const char kMessagesForAndroidInfrastructureName[] = "Messages infrastructure";
const char kMessagesForAndroidInfrastructureDescription[] =
"When enabled, will initialize Messages UI infrastructure";
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
index f5db14b..195d3c5 100644
--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
@@ -1652,6 +1652,14 @@
extern const char kInterestFeedFeedbackName[];
extern const char kInterestFeedFeedbackDescription[];
+extern const char InterestFeedV1ClickAndViewActionsConditionalUploadName[];
+extern const char
+ InterestFeedV1ClickAndViewActionsConditionalUploadDescription[];
+
+extern const char InterestFeedV2ClickAndViewActionsConditionalUploadName[];
+extern const char
+ InterestFeedV2ClickAndViewActionsConditionalUploadDescription[];
+
extern const char kMessagesForAndroidInfrastructureName[];
extern const char kMessagesForAndroidInfrastructureDescription[];
diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums.xml
index 44b1896..d4b6fc5 100644
--- a/tools/metrics/histograms/enums.xml
+++ b/tools/metrics/histograms/enums.xml
@@ -41192,6 +41192,8 @@
<int value="-1925453192" label="BlockInsecurePrivateNetworkRequests:enabled"/>
<int value="-1925117279" label="disable-quic-https"/>
<int value="-1925106340" label="CameraSystemWebApp:disabled"/>
+ <int value="-1924837577"
+ label="InterestFeedV1ClickAndViewActionsConditionalUpload:enabled"/>
<int value="-1921593903" label="ImeInputLogicHmm:disabled"/>
<int value="-1920912991" label="PermissionChip:disabled"/>
<int value="-1919683750" label="EnableOopPrintDrivers:disabled"/>
@@ -43375,6 +43377,8 @@
<int value="286717452" label="ContextualSearchDebug:disabled"/>
<int value="287932297" label="AutofillSettingsCardTypeSplit:enabled"/>
<int value="288012253" label="CrostiniFiles:enabled"/>
+ <int value="288354568"
+ label="InterestFeedV2ClickAndViewActionsConditionalUpload:disabled"/>
<int value="288755982"
label="AutofillEnableLocalCardMigrationForNonSyncUser:enabled"/>
<int value="291389947" label="PercentBasedScrolling:disabled"/>
@@ -43965,6 +43969,8 @@
<int value="877059804" label="AutofillPreventMixedFormsFilling:disabled"/>
<int value="877235225" label="GlobalMediaControlsForChromeOS:enabled"/>
<int value="877238334" label="WebUITabStripTabDragIntegration:enabled"/>
+ <int value="877257918"
+ label="InterestFeedV2ClickAndViewActionsConditionalUpload:enabled"/>
<int value="878773995" label="ChromeHomeBottomNavLabels:disabled"/>
<int value="879699575" label="disable-gesture-tap-highlight"/>
<int value="879992337" label="disable-pull-to-refresh-effect"/>
@@ -44730,6 +44736,8 @@
<int value="1646498561" label="OfflineBookmarks:disabled"/>
<int value="1649121568" label="DynamicTcmallocTuning:disabled"/>
<int value="1651141490" label="SaveEditedPDFForm:enabled"/>
+ <int value="1652798696"
+ label="InterestFeedV1ClickAndViewActionsConditionalUpload:disabled"/>
<int value="1654445970" label="EphemeralTabUsingBottomSheet:enabled"/>
<int value="1657713458" label="disable-virtual-keyboard-overscroll"/>
<int value="1658644418" label="disable-app-list-voice-search"/>
