Fix Jetpack heartbeat deactivation jobs cleanup (#41117)

* Add heartbeat deactivation on site disconnection * changelog Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/12866773609 Upstream-Ref: Automattic/jetpack@b816b8e
Automattic · Jan 20, 2025 · b63855c · b63855c
1 parent 1cca840
commit b63855c
Show file tree

Hide file tree

Showing 7 changed files with 111 additions and 106 deletions.
diff --git a/jetpack_vendor/automattic/jetpack-connection/CHANGELOG.md b/jetpack_vendor/automattic/jetpack-connection/CHANGELOG.md
@@ -12,6 +12,9 @@ This is an alpha version! The changes listed here are not final.
 ### Changed
 - Moved WPCOM_REST_API_Proxy_Request trait to the connection package
 
+### Fixed
+- Add heartbeat deactivation on site disconnection.
+
 ## [6.2.2] - 2025-01-06
 ### Added
 - Added tests to increase code coverage. [#39963]

diff --git a/jetpack_vendor/automattic/jetpack-connection/src/class-manager.php b/jetpack_vendor/automattic/jetpack-connection/src/class-manager.php
@@ -2190,6 +2190,8 @@ public function disconnect_site( $disconnect_wpcom = true, $ignore_connected_plu
 
 		( new Nonce_Handler() )->clean_all();
 
+		Heartbeat::init()->deactivate();
+
 		/**
 		 * Fires before a site is disconnected.
 		 *

diff --git a/jetpack_vendor/i18n-map.php b/jetpack_vendor/i18n-map.php
@@ -26,7 +26,7 @@
     ),
     'jetpack-connection' => array(
       'path' => 'jetpack_vendor/automattic/jetpack-connection',
-      'ver' => '6.3.0-alpha1736931456',
+      'ver' => '6.3.0-alpha1737371572',
     ),
     'jetpack-explat' => array(
       'path' => 'jetpack_vendor/automattic/jetpack-explat',

diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
@@ -7,7 +7,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-a8c-mc-stats",
-                "reference": "6864b7ac578a010c841244b3c427819fe59edd52"
+                "reference": "12784f8601a6182c8bf6a1186252e6c66a606d60"
             },
             "require": {
                 "php": ">=7.2"
@@ -63,7 +63,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-admin-ui",
-                "reference": "bf8cf35de55da0c56602dac17c62687c4f09538d"
+                "reference": "98a3023dd1192288cfe42d45b4b7d4eced8b4d2c"
             },
             "require": {
                 "php": ">=7.2"
@@ -131,7 +131,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-assets",
-                "reference": "84a573f832cac97dcba2dd883d95b0506abdd45e"
+                "reference": "f9824167e19a30ec132e6975d139051ea6ea9b51"
             },
             "require": {
                 "automattic/jetpack-constants": "^3.0.1",
@@ -203,7 +203,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-autoloader",
-                "reference": "802e98e9b8ceb27ccc9468940e4fa69931ea5125"
+                "reference": "eed465ced0effb9b9a73652999905e89e81699cb"
             },
             "require": {
                 "composer-plugin-api": "^2.2",
@@ -274,7 +274,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-boost-core",
-                "reference": "96b03d987c020171d106e6f026ed9f81f37d0a9a"
+                "reference": "868891116474193c8ee7ef750667f17b6c4e288b"
             },
             "require": {
                 "automattic/jetpack-connection": "^6.3.0-alpha",
@@ -345,7 +345,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-boost-speed-score",
-                "reference": "a3817669d6f215bf7150bc29302e247657698080"
+                "reference": "0c81d6963c91b9218913ff9b5909f0d5a767dba9"
             },
             "require": {
                 "automattic/jetpack-boost-core": "^0.3.3",
@@ -424,7 +424,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-composer-plugin",
-                "reference": "6e6def28fbb4b3ae28d1817c831d3158bb92f368"
+                "reference": "c44304e31db4b556519ae306936b23d2c9d226ed"
             },
             "require": {
                 "composer-plugin-api": "^2.2",
@@ -487,7 +487,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-config",
-                "reference": "260df9a97d87a1d4ae3639c1550f1e9f4d84802b"
+                "reference": "2eda92c8f5c4c969c2913a888d3fcff062bd7339"
             },
             "require": {
                 "php": ">=7.2"
@@ -557,12 +557,12 @@
         },
         {
             "name": "automattic/jetpack-connection",
-            "version": "6.3.0-alpha.1736931456",
-            "version_normalized": "6.3.0.0-alpha1736931456",
+            "version": "6.3.0-alpha.1737371572",
+            "version_normalized": "6.3.0.0-alpha1737371572",
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-connection",
-                "reference": "25ae54dccc06f38d1586be16a8abf90f71ee2642"
+                "reference": "3e0b777faee4241c45af15df6e732550d8b5441f"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "^3.0.0",
@@ -655,7 +655,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-constants",
-                "reference": "28067df7f8cea617a008e62c1c6d562bac4905ec"
+                "reference": "7cc8390d08cf892cdeeb8a582a4bdbb6d95dc0d9"
             },
             "require": {
                 "php": ">=7.2"
@@ -712,7 +712,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-device-detection",
-                "reference": "84e38248519303f5bf954081e503a18ed51218aa"
+                "reference": "d9af5e8dfba40b37f3f0c9599d44fb474d50e3bd"
             },
             "require": {
                 "php": ">=7.2"
@@ -768,7 +768,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-explat",
-                "reference": "d6cb4126a9e14601c56bf30686e8a5ca15192bce"
+                "reference": "e64c718b6f77de23d87c7bc7f3d2d488591fd27e"
             },
             "require": {
                 "automattic/jetpack-connection": "^6.3.0-alpha",
@@ -846,7 +846,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-ip",
-                "reference": "0978ec2632bc49376b120854614eef58c4a54ce4"
+                "reference": "f0f471d1b08b8c54c2737c2ce6d3a4842886958f"
             },
             "require": {
                 "php": ">=7.2"
@@ -907,7 +907,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-jitm",
-                "reference": "8f4b6a171c4c305bfec5db1d1bbfca619f3cd60b"
+                "reference": "363e6a190c704c14ae358412a79eb8e7b622487b"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "^3.0.0",
@@ -985,7 +985,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-licensing",
-                "reference": "7a0d40136f32c3e6906a1bc1c94286fbbd0207f0"
+                "reference": "364cf2011c32d80525bc8f091d30874c31c867d7"
             },
             "require": {
                 "automattic/jetpack-connection": "^6.3.0-alpha",
@@ -1050,7 +1050,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-logo",
-                "reference": "031443af9e7d8e015e11054c25202f955fc23f8f"
+                "reference": "2a3e0aedbaf397483f14b16f3de437a9e4d6430c"
             },
             "require": {
                 "php": ">=7.2"
@@ -1106,7 +1106,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-my-jetpack",
-                "reference": "a42b3cceff9413fcfa41a328a6dbc758145fd9b8"
+                "reference": "f060a554fda05163f99d95a52f163b61f81a2ef9"
             },
             "require": {
                 "automattic/jetpack-admin-ui": "^0.5.1",
@@ -1211,7 +1211,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-password-checker",
-                "reference": "df9cb23c444682ceeebe27b1130bccac2515fb82"
+                "reference": "8a6d7f6b776e593fa82055fc1d571d17b4c70063"
             },
             "require": {
                 "php": ">=7.2"
@@ -1275,7 +1275,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-plans",
-                "reference": "ee7c9a0b606c0529d8d76924252fc93415bda250"
+                "reference": "10d7b4cd6c94a51ced0266e75677acd36d32c63d"
             },
             "require": {
                 "automattic/jetpack-connection": "^6.3.0-alpha",
@@ -1346,7 +1346,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-plugins-installer",
-                "reference": "2a335125b65f298e9e8abee459a387ae8849b1d9"
+                "reference": "c382463d1db6484bd62399d24b58fc4d0290791f"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "^3.0.0",
@@ -1405,7 +1405,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-protect-models",
-                "reference": "dcba173df4f0256363ac3be66be0cc643922424e"
+                "reference": "eab992f9525ab6515fcc1ccbbfc5174d14025f99"
             },
             "require": {
                 "php": ">=7.2"
@@ -1478,7 +1478,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-protect-status",
-                "reference": "9bfd71e669cf2e56f24bd4894889442dd45a9386"
+                "reference": "8ef532a2bbad90885c7cedad13be3a880e5291fe"
             },
             "require": {
                 "automattic/jetpack-connection": "^6.3.0-alpha",
@@ -1556,7 +1556,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-redirect",
-                "reference": "03af399cf7e7381174f47890e1622702ed349dbd"
+                "reference": "43132f5794980dba1cadfeaaa5faca1cf53690be"
             },
             "require": {
                 "automattic/jetpack-status": "^5.0.1",
@@ -1614,7 +1614,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-roles",
-                "reference": "7bdf50efb565105a4ee993d76e248f70673083fc"
+                "reference": "fad367f68625725d557e42b82ce674b07dca8170"
             },
             "require": {
                 "php": ">=7.2"
@@ -1671,7 +1671,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-status",
-                "reference": "1362e3dc90013d977e11fca6c8cbd2bff29d193d"
+                "reference": "430dad49315f8ca01521e4f0f8b65bd53a10f82a"
             },
             "require": {
                 "automattic/jetpack-constants": "^3.0.1",
@@ -1738,7 +1738,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-sync",
-                "reference": "6127d391ef2ad1935f88823061fc193cbadd15f5"
+                "reference": "3cc048701051155461a8541445013b1f36b5bf08"
             },
             "require": {
                 "automattic/jetpack-connection": "^6.3.0-alpha",
-Original file line number
+Diff line change
@@ Expand Up @@
     		( new Nonce_Handler() )->clean_all();
+    		Heartbeat::init()->deactivate();
     		/**
     		 * Fires before a site is disconnected.
     		 *
@@ Expand Down @@