deprecate activity_stream metrics and update jestream defintions (#1257)

Author: jaredsnyder

definitions/firefox_desktop.toml

@@ -340,6 +340,7 @@ friendly_name = "Clicked Pocket organic recs in New Tab"
 description = """
     Counts the number of Pocket rec clicks made by each client.
 """
+deprecated = true
 
 
 [metrics.pocket_spoc_clicks]
@@ -353,6 +354,8 @@ friendly_name = "Clicked Pocket sponsored content in New Tab"
 description = """
     Counts the number of Pocket sponsored content clicks made by each client.
 """
+deprecated = true
+
 
 
 [metrics.days_of_use]
@@ -526,6 +529,8 @@ friendly_name = "Disabled Pocket in New Tab"
 description = """
     Counts the number of clicks to disable Pocket in New Tab made by each client.
 """
+deprecated = true
+
 
 
 [metrics.disable_pocket_spocs_clicks]
@@ -540,6 +545,8 @@ description = """
     Counts the number of clicks to disable Pocket sponsored content
     in New Tab made by each client.
 """
+deprecated = true
+
 
 
 [metrics.content_shutdown_crashes]
@@ -1950,6 +1957,8 @@ from_expression = """(
 experiments_column_type = "native"
 friendly_name = "Activity Stream Events"
 description = "Activity Stream Event pings"
+deprecated = true
+
 
 [data_sources.clients_first_seen_v2]
 from_expression = "moz-fx-data-shared-prod.telemetry_derived.clients_first_seen_v2" # TODO: Replace with view

jetstream/definitions/firefox_desktop.toml

@@ -48,10 +48,10 @@
 [metrics.connect_fxa.statistics.deciles]
 
 
-[metrics.pocket_rec_clicks.statistics.bootstrap_mean]
+[metrics.organic_pocket_clicks.statistics.bootstrap_mean]
 
 
-[metrics.pocket_spoc_clicks.statistics.bootstrap_mean]
+[metrics.sponsored_pocket_clicks.statistics.bootstrap_mean]
 
 
 [metrics.days_of_use.statistics.bootstrap_mean]
@@ -65,10 +65,10 @@ drop_highest = 0
 [metrics.qualified_cumulative_days_of_use.statistics.deciles]
 
 
-[metrics.disable_pocket_clicks.statistics.bootstrap_mean]
+[metrics.newtab_pocket_enabled.statistics.bootstrap_mean]
 
 
-[metrics.disable_pocket_spocs_clicks.statistics.bootstrap_mean]
+[metrics.newtab_sponsored_pocket_stories_enabled.statistics.bootstrap_mean]
 
 [metrics.imported_bookmarks.statistics.binomial]
 [metrics.imported_bookmarks_count.statistics.bootstrap_mean]