From e27eabb07a78f1c99ecd97fc3361de712cf74c4b Mon Sep 17 00:00:00 2001
From: Jonathan Mendez <jmendez@mozilla.com>
Date: Tue, 21 Jul 2026 15:13:05 -0500
Subject: [PATCH] Bug 2056566 - For enterprise addon install complete event,
 inherit keys from install event. Add missing key

---
 .../mozapps/extensions/AddonManager.sys.mjs   |  2 +
 toolkit/mozapps/extensions/metrics.yaml       | 72 +------------------
 2 files changed, 4 insertions(+), 70 deletions(-)

diff --git a/toolkit/mozapps/extensions/AddonManager.sys.mjs b/toolkit/mozapps/extensions/AddonManager.sys.mjs
index d21b63e0c6b4..7dbf1f9b27cd 100644
--- a/toolkit/mozapps/extensions/AddonManager.sys.mjs
+++ b/toolkit/mozapps/extensions/AddonManager.sys.mjs
@@ -5921,6 +5921,8 @@ AMTelemetry = {
           updated_from,
           install_origins,
           step: extraVars?.step,
+          // will be undefined for non-site permission addons
+          site_permission: install.newSitePerm,
         })
       );
       GleanPings.enterprise.submit();
diff --git a/toolkit/mozapps/extensions/metrics.yaml b/toolkit/mozapps/extensions/metrics.yaml
index d6c3296c6dbf..0f1cfeea91e6 100644
--- a/toolkit/mozapps/extensions/metrics.yaml
+++ b/toolkit/mozapps/extensions/metrics.yaml
@@ -248,7 +248,7 @@ addons_manager:
       - interaction
     notification_emails:
       - addons-dev-internal@mozilla.com
-    extra_keys:
+    extra_keys: &install_update_extra_keys
       addon_id:
         description: Id of the addon (when available).
         type: string
@@ -345,78 +345,10 @@ addons_manager:
       - security-telemetry@mozilla.org
       - enterprise-telemetry@mozilla.org
     extra_keys:
-      addon_id:
-        description: Id of the addon (when available).
-        type: string
+      <<: *install_update_extra_keys
       addon_name:
         description: Name of the addon (when available).
         type: string
-      addon_type:
-        description: |
-          Addon type, one of: extension, theme, locale, dictionary,
-          sitepermission, siteperm_deprecated, other, unknown.
-        type: string
-      install_id:
-        description: |
-          Shared by events related to the same install or update flow.
-        type: string
-      download_time:
-        description: The number of ms needed to complete the download.
-        type: quantity
-      error:
-        description: |
-          The AddonManager error related to an install or update failure.
-        type: string
-      source:
-        description: |
-          The source that originally triggered the installation, one
-          of: "about:addons", "about:debugging", "about:preferences",
-          "amo", "browser-import", "disco", "distribution",
-          "extension", "enterprise-policy", "file-url",
-          "geckoview-app", "gmp-plugin", "internal", "plugin",
-          "rtamo", "siteperm-addon-provider" "sync", "system-addon",
-          "temporary-addon", "unknown", "about:editprofile", "about:newprofile",
-          "nimbus-newtabTrainhopAddon".
-          For events with method set to "sideload", the source value
-          is derived from the XPIProvider location name (e.g. possible
-          values are "app-builtin", "app-global", "app-profile",
-          "app-system-addons", "app-system-defaults",
-          "app-system-local", "app-system-profile",
-          "app-system-share", "app-system-user", "winreg-app-user",
-          "winreg-app-gobal").
-        type: string
-      source_method:
-        description: |
-          The method used by the source to install the add-on
-          (included when the source can use more than one, e.g.
-          install events with source "about:addons" may have
-          "install-from-file" or "url" as method), one of: "amWebAPI",
-          "drag-and-drop", "installTrigger", "install-from-file",
-          "link", "management-webext-api", "sideload", "onboarding",
-          "synthetic-install", "url", "product-updates".
-        type: string
-      num_strings:
-        description: |
-          The number of permission description strings in the
-          extension permission doorhanger.
-        type: quantity
-      updated_from:
-        description: |
-          Determine if an update has been requested by the user or
-          the application ("app" / "user").
-        type: string
-      install_origins:
-        description: |
-          This flag indicates whether install_origins is defined in
-          the addon manifest. ("1" / "0")
-        type: string
-      step:
-        description: |
-          The current step in the install or update flow: started,
-          postponed, cancelled, failed, permissions_prompt, completed,
-          site_warning, site_blocked,install_disabled_warning,
-          download_started, download_completed, download_failed
-        type: string
     expires: never
     send_in_pings:
       - enterprise