Skip to content
This repository has been archived by the owner on Feb 20, 2023. It is now read-only.

[Uplift 97] For #22870: Renew metrics set to expire in February #23496

Merged
merged 2 commits into from
Jan 31, 2022
Merged

[Uplift 97] For #22870: Renew metrics set to expire in February #23496

merged 2 commits into from
Jan 31, 2022

Conversation

eliserichards
Copy link

For #22870
Note: this uplift also includes tags

Pull Request checklist

  • Tests: This PR includes thorough tests or an explanation of why it does not
  • Screenshots: This PR includes screenshots or GIFs of the changes made or an explanation of why it does not
  • Accessibility: The code in this PR follows accessibility best practices or does not include any user facing features. In addition, it includes a screenshot of a successful accessibility scan to ensure no new defects are added to the product.

To download an APK when reviewing a PR:

  1. click on Show All Checks,
  2. click Details next to "Taskcluster (pull_request)" after it appears and then finishes with a green checkmark,
  3. click on the "Fenix - assemble" task, then click "Run Artifacts".
  4. the APK links should be on the left side of the screen, named for each CPU architecture

Elise Richards and others added 2 commits January 31, 2022 12:03
For mozilla-mobile#22870: Renew/remove metrics set to expire in Febru…
65af0dc 
…ary (mozilla-mobile#23453)

* For mozilla-mobile#22870: Renew/remove metrics set to expire in February

* Add data review and add notification owner for never expire metrics
@rocketsroger
Close mozilla-mobile#22956: Define "tags" for metrics in the app repo…
260f0b8 
…sitory

Co-authored-by: William Lachance <wlach@protonmail.com>

Define "tags" for metrics in the app repository

Using the new "tags" feature in Glean, we can remove most of the
manual process/pain of defining tags in a seperate Glean annotations
repository (see: https://github.com/mozilla-mobile/fenix/wiki/Add-a-Glean-Annotation-for-an-event)
and just put them beside the metrics themselves. This should make it
much easier to keep this metadata up to date, since it can be added
in the same pull request as the instrumentation itself.

To keep the list of tags up to date with the Fenix issue labels, a new
script `update-glean-tags.py` has been added to the repository. It
should not need to be run often.

This pull request uses a scraped version of the defined tags in the
Glean annotations repository. After it lands, we can remove those and
just use the tagging information here as the main source of information.
@eliserichards eliserichards requested review from a team as code owners January 31, 2022 20:15
@eliserichards eliserichards mentioned this pull request Jan 31, 2022
Merged
6 tasks
@eliserichards eliserichards linked an issue Jan 31, 2022 that may be closed by this pull request
Renew telemetry for February #22870
Closed
2 tasks
@eliserichards eliserichards reopened this Jan 31, 2022
@rvandermeulen rvandermeulen merged commit 08790a0 into mozilla-mobile:releases_v97.0.0 Jan 31, 2022
@eliserichards eliserichards changed the title [Uplift] For #22870: Renew metrics set to expire in February [Uplift 97] For #22870: Renew metrics set to expire in February Jan 31, 2022
@eliserichards
Copy link
Author

@Mergifyio backport releases_v96.0.0

mergify bot pushed a commit that referenced this pull request Jan 31, 2022
[Uplift] For #22870: Renew metrics set to expire in February (#23496)
414c417 
* For #22870: Renew/remove metrics set to expire in February (#23453)

* For #22870: Renew/remove metrics set to expire in February

* Add data review and add notification owner for never expire metrics

* Close #22956: Define "tags" for metrics in the app repository

Co-authored-by: William Lachance <wlach@protonmail.com>

Define "tags" for metrics in the app repository

Using the new "tags" feature in Glean, we can remove most of the
manual process/pain of defining tags in a seperate Glean annotations
repository (see: https://github.com/mozilla-mobile/fenix/wiki/Add-a-Glean-Annotation-for-an-event)
and just put them beside the metrics themselves. This should make it
much easier to keep this metadata up to date, since it can be added
in the same pull request as the instrumentation itself.

To keep the list of tags up to date with the Fenix issue labels, a new
script `update-glean-tags.py` has been added to the repository. It
should not need to be run often.

This pull request uses a scraped version of the defined tags in the
Glean annotations repository. After it lands, we can remove those and
just use the tagging information here as the main source of information.

Co-authored-by: Roger Yang <royang@mozilla.com>
(cherry picked from commit 08790a0)
@mergify
Copy link
Contributor

mergify bot commented Jan 31, 2022

backport releases_v96.0.0

✅ Backports have been created

@mergify mergify bot mentioned this pull request Jan 31, 2022
Closed
lillabldv added a commit to karmaSearch/fenix that referenced this pull request Mar 26, 2022
@lillabldv
Merge branch 'releases_v97.0.0' into karma_main
c3431fa 
* releases_v97.0.0: (455 commits)
  Automatic version bump CLOSED TREE NO BUG a=release
  Bump version to 97.3.0.
  Update to Android-Components 97.0.13.
  Automatic version bump CLOSED TREE NO BUG a=release
  Update to Android-Components 97.0.12.
  Bump version to 97.2.0.
  Automatic version bump CLOSED TREE NO BUG a=release
  Fix signing format for mozillaonline builds (mozilla-mobile#23603)
  Update to Android-Components 97.0.11.
  Automatic version bump CLOSED TREE NO BUG a=release
  Update to Android-Components 97.0.10. (mozilla-mobile#23519)
  Issue mozilla-mobile#22256: Ignore intermittent editCustomSearchEngineTest
  No issue: Update PWA package name in mainMenuInstallPWATest (mozilla-mobile#23335)
  For mozilla-mobile#23426:Changed expiring perf probes to never expire (mozilla-mobile#23515)
  Bump version to 97.1.0.
  [Uplift] For mozilla-mobile#22870: Renew metrics set to expire in February (mozilla-mobile#23496)
  Strings - app/src/main/res/values-zh-rCN/strings.xml
  Strings - app/src/main/res/values-tr/strings.xml
  Strings - app/src/main/res/values-tg/strings.xml
  Strings - app/src/main/res/values-sk/strings.xml
  ...

# Conflicts:
#	app/metrics.yaml
#	app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
#	app/src/main/java/org/mozilla/fenix/FenixApplication.kt
#	app/src/main/java/org/mozilla/fenix/components/Core.kt
#	app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarView.kt
#	app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
#	app/src/main/java/org/mozilla/fenix/home/HomeFragmentStore.kt
#	app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt
#	app/src/main/java/org/mozilla/fenix/home/recentbookmarks/controller/RecentBookmarksController.kt
#	app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlAdapter.kt
#	app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlInteractor.kt
#	app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlView.kt
#	app/src/main/java/org/mozilla/fenix/home/topsites/TopSiteItemViewHolder.kt
#	app/src/main/java/org/mozilla/fenix/theme/FirefoxTheme.kt
#	app/src/main/res/drawable-xhdpi/ic_logo_wordmark_normal.png
#	app/src/main/res/drawable-xhdpi/ic_logo_wordmark_private.png
#	app/src/main/res/drawable-xxhdpi/ic_logo_wordmark_private.png
#	app/src/main/res/drawable-xxxhdpi/ic_logo_wordmark_private.png
#	app/src/main/res/drawable/ic_baidu.png
#	app/src/main/res/drawable/ic_jd.png
#	app/src/main/res/drawable/ic_pdd.png
#	app/src/main/res/drawable/ic_tc.png
#	app/src/main/res/layout/top_site_item.xml
#	app/src/main/res/values-ar/strings.xml
#	app/src/main/res/values-be/strings.xml
#	app/src/main/res/values-bg/strings.xml
#	app/src/main/res/values-bn/strings.xml
#	app/src/main/res/values-ca/strings.xml
#	app/src/main/res/values-co/strings.xml
#	app/src/main/res/values-cs/strings.xml
#	app/src/main/res/values-cy/strings.xml
#	app/src/main/res/values-da/strings.xml
#	app/src/main/res/values-de/strings.xml
#	app/src/main/res/values-dsb/strings.xml
#	app/src/main/res/values-el/strings.xml
#	app/src/main/res/values-en-rCA/strings.xml
#	app/src/main/res/values-en-rGB/strings.xml
#	app/src/main/res/values-es-rAR/strings.xml
#	app/src/main/res/values-es-rCL/strings.xml
#	app/src/main/res/values-es-rES/strings.xml
#	app/src/main/res/values-es-rMX/strings.xml
#	app/src/main/res/values-es/strings.xml
#	app/src/main/res/values-eu/strings.xml
#	app/src/main/res/values-fa/strings.xml
#	app/src/main/res/values-fi/strings.xml
#	app/src/main/res/values-fr/strings.xml
#	app/src/main/res/values-fy-rNL/strings.xml
#	app/src/main/res/values-gd/strings.xml
#	app/src/main/res/values-gn/strings.xml
#	app/src/main/res/values-hi-rIN/strings.xml
#	app/src/main/res/values-hr/strings.xml
#	app/src/main/res/values-hsb/strings.xml
#	app/src/main/res/values-hu/strings.xml
#	app/src/main/res/values-hy-rAM/strings.xml
#	app/src/main/res/values-ia/strings.xml
#	app/src/main/res/values-in/strings.xml
#	app/src/main/res/values-is/strings.xml
#	app/src/main/res/values-it/strings.xml
#	app/src/main/res/values-iw/strings.xml
#	app/src/main/res/values-ja/strings.xml
#	app/src/main/res/values-ka/strings.xml
#	app/src/main/res/values-kab/strings.xml
#	app/src/main/res/values-kk/strings.xml
#	app/src/main/res/values-kmr/strings.xml
#	app/src/main/res/values-ko/strings.xml
#	app/src/main/res/values-lt/strings.xml
#	app/src/main/res/values-nb-rNO/strings.xml
#	app/src/main/res/values-night/colors.xml
#	app/src/main/res/values-nl/strings.xml
#	app/src/main/res/values-nn-rNO/strings.xml
#	app/src/main/res/values-oc/strings.xml
#	app/src/main/res/values-pa-rIN/strings.xml
#	app/src/main/res/values-pl/strings.xml
#	app/src/main/res/values-pt-rBR/strings.xml
#	app/src/main/res/values-pt-rPT/strings.xml
#	app/src/main/res/values-rm/strings.xml
#	app/src/main/res/values-ru/strings.xml
#	app/src/main/res/values-sat/strings.xml
#	app/src/main/res/values-sk/strings.xml
#	app/src/main/res/values-sl/strings.xml
#	app/src/main/res/values-sq/strings.xml
#	app/src/main/res/values-sr/strings.xml
#	app/src/main/res/values-su/strings.xml
#	app/src/main/res/values-sv-rSE/strings.xml
#	app/src/main/res/values-te/strings.xml
#	app/src/main/res/values-tg/strings.xml
#	app/src/main/res/values-th/strings.xml
#	app/src/main/res/values-tr/strings.xml
#	app/src/main/res/values-tt/strings.xml
#	app/src/main/res/values-uk/strings.xml
#	app/src/main/res/values-ur/strings.xml
#	app/src/main/res/values-uz/strings.xml
#	app/src/main/res/values-vi/strings.xml
#	app/src/main/res/values-zh-rCN/strings.xml
#	app/src/main/res/values-zh-rTW/strings.xml
#	app/src/main/res/values/colors.xml
#	app/src/main/res/values/strings.xml
#	app/src/main/res/values/styles.xml
#	app/src/release/res/drawable-hdpi/fenix_search_widget.png
#	app/src/release/res/mipmap-hdpi/ic_launcher.png
#	app/src/release/res/mipmap-xhdpi/ic_launcher.png
#	app/src/release/res/mipmap-xxhdpi/ic_launcher.png
#	app/src/release/res/mipmap-xxxhdpi/ic_launcher.png
#	app/src/test/java/org/mozilla/fenix/components/history/PagedHistoryProviderTest.kt
#	app/src/test/java/org/mozilla/fenix/home/DefaultSessionControlControllerTest.kt
#	app/src/test/java/org/mozilla/fenix/home/SessionControlInteractorTest.kt
#	app/src/test/java/org/mozilla/fenix/home/recentbookmarks/DefaultRecentBookmarksControllerTest.kt
#	app/src/test/java/org/mozilla/fenix/home/recentvisits/interactor/RecentVisitsInteractorTest.kt
#	app/src/test/java/org/mozilla/fenix/home/sessioncontrol/SessionControlViewTest.kt
#	buildSrc/src/main/java/AndroidComponents.kt
#	version.txt
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@rocketsroger rocketsroger rocketsroger approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Renew telemetry for February
3 participants
@eliserichards @rocketsroger @rvandermeulen