Bug 1820334 - Make the metrics_yamls and ping_yamls lists deterministically... (2c36d764) · Commits · clairehurst / Tor Browser

toolkit/components/glean/metrics_index.py

+16 −12

Original line number	Original line	Diff line number	Diff line
	@@ -70,13 +70,15 @@ test_metrics = [

	# The list of all Glean metrics.yaml files, relative to the top src dir.		# The list of all Glean metrics.yaml files, relative to the top src dir.
	# ONLY TO BE MODIFIED BY FOG PEERS!		# ONLY TO BE MODIFIED BY FOG PEERS!
	metrics_yamls = set(		metrics_yamls = sorted(
			set(
	gecko_metrics		gecko_metrics
	+ firefox_desktop_metrics		+ firefox_desktop_metrics
	+ background_update_metrics		+ background_update_metrics
	+ background_tasks_metrics		+ background_tasks_metrics
	+ test_metrics		+ test_metrics
	)		)
			)

	# Pings that are sent by Gecko and everyone using Gecko		# Pings that are sent by Gecko and everyone using Gecko
	# (Firefox Desktop, Firefox for Android, Focus for Android, etc.).		# (Firefox Desktop, Firefox for Android, Focus for Android, etc.).
	@@ -127,13 +129,15 @@ pings_by_app_id = {

	# The list of all Glean pings.yaml files, relative to the top src dir.		# The list of all Glean pings.yaml files, relative to the top src dir.
	# ONLY TO BE MODIFIED BY FOG PEERS!		# ONLY TO BE MODIFIED BY FOG PEERS!
	pings_yamls = set(		pings_yamls = sorted(
			set(
	gecko_pings		gecko_pings
	+ firefox_desktop_pings		+ firefox_desktop_pings
	+ background_update_pings		+ background_update_pings
	+ background_tasks_pings		+ background_tasks_pings
	+ test_pings		+ test_pings
	)		)
			)

	# The list of tags that are allowed in the above to files, and their		# The list of tags that are allowed in the above to files, and their
	# descriptions. Currently we restrict to a set scraped from bugzilla		# descriptions. Currently we restrict to a set scraped from bugzilla