.
diff --git a/src/cookbooks/normandy_events.md b/src/cookbooks/normandy_events.md
index 91bd1be49..85f481179 100644
--- a/src/cookbooks/normandy_events.md
+++ b/src/cookbooks/normandy_events.md
@@ -1,7 +1,18 @@
# Working with Normandy events
-A common request is to count the number of users who have
-enrolled or unenrolled from a SHIELD experiment.
+
+Normandy and SHIELD are older experimentation platforms
+at Mozilla, but are no longer in use. However, Normandy
+events are still in use (as of January 2025) by Jetstream
+for computing enrollments and exposures. Note that this
+will likely change in the near future because these events
+have been ported to Glean and legacy telemetry is being
+deprecated across the platform.
+
+For more up to date information on events used by Nimbus,
+see .
+
+
The [`events` table](../datasets/batch_view/events/reference.md)
includes Normandy enrollment and unenrollment events
@@ -15,12 +26,6 @@ or name (for add-on experiments).
Normandy events are described in detail in the
[Firefox source tree docs][normandy-doc].
-Note that addon studies do not have branch information in the events table,
-since addons, not Normandy, are responsible for branch assignment.
-For studies built with the obsolete [add-on utilities][`addon-utils`],
-branch assignments are published to the
-[shield_study] dataset.
-
## Counting pref-flip enrollment events by branch
The `event_map_values` column of enroll events contains a `branch` key,
@@ -68,5 +73,3 @@ ORDER BY 1, 2, 3
```
[normandy-doc]: https://firefox-source-docs.mozilla.org/toolkit/components/normandy/normandy/data-collection.html#enrollment
-[shield_study]: ../datasets/experiment_telemetry.md#telemetryshield_study
-[`addon-utils`]: https://github.com/mozilla/shield-studies-addon-utils
diff --git a/src/datasets/experiment_telemetry.md b/src/datasets/experiment_telemetry.md
index 3e9291d73..32f271290 100644
--- a/src/datasets/experiment_telemetry.md
+++ b/src/datasets/experiment_telemetry.md
@@ -1,11 +1,8 @@
-# Analyzing data from SHIELD studies
+# Accessing Experiment Telemetry
This article introduces the datasets that are useful for analyzing studies in Firefox.
-After reading this article,
-you should understand how to answer questions about
-study enrollment,
-identify telemetry from clients enrolled in an experiment,
-and locate telemetry from add-on studies.
+After reading this article, you should understand how to answer questions about
+experiment enrollment, and identify telemetry from clients enrolled in an experiment.
## Table of contents
@@ -27,7 +24,34 @@ the slug for add-on experiments is defined in the recipe by a field named `name`
You can find the slug associated with an experiment in Experimenter.
-## Tables
+## Tables (Glean)
+
+### `experiments` map (Glean)
+
+Glean tables include a `ping_info` column with `experiments` mapping from
+experiment slug to a struct containing information about the experiment,
+including `branch`.
+
+You can query for enrolled clients using a query like:
+
+```sql
+SELECT
+ -- ... some fields ...,
+ `mozfun.map.get_key`(ping_info.experiments, '{experiment_slug}').branch
+FROM
+ `moz-fx-data-shared-prod.firefox_desktop.metrics`
+WHERE
+ `mozfun.map.get_key`(ds.ping_info.experiments, '{experiment_slug}') IS NOT NULL
+ AND DATE(m.submission_timestamp) BETWEEN '' AND ''
+ AND normalized_channel = 'release'
+ -- AND ...other filters...
+```
+
+## Tables (Legacy Telemetry)
+
+As of January 2025, legacy telemetry is still used for enrollment and exposure
+events. However, while Glean adoption is in progress, these docs remain for
+the time being as reference.
### `experiments` map (ping tables)
@@ -85,47 +109,3 @@ The event schema is described
[in the Firefox source tree](https://hg.mozilla.org/mozilla-central/file/tip/toolkit/components/normandy/lib/TelemetryEvents.sys.mjs).
The `events` table is updated daily.
-
-### `telemetry.shield_study_addon`
-
-The `telemetry.shield_study_addon` table contains SHIELD telemetry from legacy add-on experiments,
-i.e. key-value pairs sent with the
-`browser.study.sendTelemetry()` method from the
-[SHIELD study add-on utilities](https://github.com/mozilla/shield-studies-addon-utils/)
-library.
-
-The `study_name` attribute of the `payload` column will contain the identifier
-registered with the SHIELD add-on utilities.
-This is set by the add-on; sometimes it takes the value of
-`applications.gecko.id` from the add-on's `manifest.json`.
-This is often not the same as the Normandy slug.
-
-The schema for shield-study-addon pings is described in the
-[`mozilla-pipeline-schemas` repository](https://github.com/mozilla-services/mozilla-pipeline-schemas/tree/master/schemas/telemetry/shield-study-addon).
-
-The key-value pairs are present in `data` attribute of the `payload` column.
-
-The `telemetry.shield_study_addon` table contains only full days of data.
-If you need access to data with lower latency, you can use the "live" table
-`telemetry_live.shield_study_addon_v4` which should have latency significantly
-less than 1 hour.
-
-### `telemetry.shield_study`
-
-The `telemetry.shield_study` dataset includes
-enrollment and unenrollment events for legacy add-on experiments only,
-sent by the [SHIELD study add-on utilities](https://github.com/mozilla/shield-studies-addon-utils/).
-
-The `study_name` attribute of the `payload` column will contain the identifier
-registered with the SHIELD add-on utilities.
-This is set by the add-on; sometimes it takes the value of
-`applications.gecko.id` from the add-on's `manifest.json`.
-This is often not the same as the Normandy slug.
-
-Normandy also emits its own enrollment and unenrollment events for these studies,
-which are available in the `events` table.
-
-The `telemetry.shield_study` table contains only full days of data.
-If you need access to data with lower latency, you can use the "live" table
-`telemetry_live.shield_study_v4` which should have latency significantly
-less than 1 hour.
diff --git a/src/tools/projects.md b/src/tools/projects.md
index 1cc16ff03..da4ab825f 100644
--- a/src/tools/projects.md
+++ b/src/tools/projects.md
@@ -80,9 +80,11 @@ See also [`data-docs`][docs] for documentation on datasets.
| [Hardware Report][hwreport_gh] | Firefox Hardware Report, [available here][hwreport] |
| [St. Mocli][stmocli] | A command-line interface to [STMO][stmo] |
| [probe-scraper] | Scrape and publish Telemetry probe data from Firefox |
-| [test-tube] | Compare data across branches in experiments |
| [experimenter] | A web application for managing experiments |
-| [St. Moab][stmoab] | Automatically generate Redash dashboard for A/B experiments |
+| [Jetstream] | Automated analysis for experiments |
+| [metric-hub] | Semantic layer for metric definitions |
+
+See also [What Data Tool Should I Use?][data-tools-wiki] for more information on Data Tools and their uses.
[tmo_gh]: https://github.com/mozilla/telemetry-dashboard
[glam]: https://github.com/mozilla/glam
@@ -91,16 +93,16 @@ See also [`data-docs`][docs] for documentation on datasets.
[redashstmo]: https://github.com/mozilla/redash-stmo
[taar]: https://github.com/mozilla/taar
[ensemble]: https://github.com/mozilla/ensemble
-[shield]: https://wiki.mozilla.org/index.php?title=Firefox/Shield
[tmo]: https://telemetry.mozilla.org
[stmo]: https://sql.telemetry.mozilla.org
[hwreport_gh]: https://github.com/mozilla/firefox-hardware-report
[hwreport]: https://data.firefox.com/dashboard/hardware
[stmocli]: https://github.com/mozilla/stmocli
[probe-scraper]: https://github.com/mozilla/probe-scraper
-[test-tube]: https://github.com/mozilla/firefox-test-tube
[experimenter]: https://github.com/mozilla/experimenter
-[stmoab]: https://github.com/mozilla/stmoab
+[jetstream]: https://github.com/mozilla/jetstream
+[metric-hub]: https://github.com/mozilla/metric-hub
+[data-tools-wiki]: https://mozilla-hub.atlassian.net/wiki/spaces/DATA/pages/375750774/Data+Tools
## Legacy projects