Google Analytics: remove the module and switch to is_active flag

projects/plugins/jetpack/_inc/client/traffic/index.jsx

@@ -54,7 +54,7 @@ export class Traffic extends React.Component {
 			foundRelated = this.props.isModuleFound( 'related-posts' ),
 			foundVerification = this.props.isModuleFound( 'verification-tools' ),
 			foundSitemaps = this.props.isModuleFound( 'sitemaps' ),
-			foundAnalytics = this.props.isModuleFound( 'google-analytics' ),
+			foundAnalytics = this.props.isWoASite && this.props.isModuleFound( 'google-analytics' ),
 			foundBlaze = this.props.isModuleFound( 'blaze' );
 
 		if ( ! this.props.searchTerm && ! this.props.active ) {

projects/plugins/jetpack/changelog/delete-jetpack-module-google-analytics

@@ -0,0 +1,4 @@
+Significance: major
+Type: other
+
+Google Analytics: remove the module and its remnants.

projects/plugins/jetpack/composer.json

@@ -28,7 +28,6 @@
 		"automattic/jetpack-device-detection": "@dev",
 		"automattic/jetpack-error": "@dev",
 		"automattic/jetpack-forms": "@dev",
-		"automattic/jetpack-google-analytics": "@dev",
 		"automattic/jetpack-image-cdn": "@dev",
 		"automattic/jetpack-import": "@dev",
 		"automattic/jetpack-ip": "@dev",

projects/plugins/jetpack/json-endpoints/class.wpcom-json-api-site-settings-endpoint.php

@@ -5,7 +5,6 @@
  * @package automattic/jetpack
  */
 
-use Automattic\Jetpack\Google_Analytics\GA_Manager;
 use Automattic\Jetpack\Waf\Brute_Force_Protection\Brute_Force_Protection_Shared_Functions;
 
 new WPCOM_JSON_API_Site_Settings_Endpoint(
@@ -595,38 +594,6 @@ protected function get_locale( $key ) {
 		return false;
 	}
 
-	/**
-	 * Get GA tracking code.
-	 *
-	 * @deprecated 13.6
-	 */
-	protected function get_google_analytics() {
-		if ( class_exists( GA_Manager::class ) ) {
-			$option_name = GA_Manager::get_instance()->get_google_analytics_option_name();
-		} else {
-			$option_name = $this->get_google_analytics_option_name();
-		}
-
-		return get_option( $option_name );
-	}
-
-	/**
-	 * Get GA tracking code option name.
-	 *
-	 * @deprecated 13.6
-	 */
-	protected function get_google_analytics_option_name() {
-		if ( class_exists( GA_Manager::class ) ) {
-			return GA_Manager::get_instance()->get_google_analytics_option_name();
-		}
-
-		/** This filter is documented in class.json-api-endpoints.php */
-		$is_jetpack  = true === apply_filters( 'is_jetpack_site', false, get_current_blog_id() );
-		$option_name = $is_jetpack ? 'jetpack_wga' : 'wga';
-
-		return $option_name;
-	}
-
 	/**
 	 * Updates site settings for authorized users
 	 *

projects/plugins/jetpack/json-endpoints/class.wpcom-json-api-site-settings-v1-3-endpoint.php

@@ -1,6 +1,5 @@
 <?php // phpcs:ignore WordPress.Files.FileName.InvalidClassFileName
 
-use Automattic\Jetpack\Google_Analytics\GA_Manager;
 
 new WPCOM_JSON_API_Site_Settings_V1_3_Endpoint(
 	array(
@@ -137,53 +136,4 @@ protected function get_defaults() {
 			'ec_track_add_to_cart' => false,
 		);
 	}
-
-	/**
-	 * Filter the parent's response to include the fields
-	 * added to 1.3 (and their defaults)
-	 *
-	 * @deprecated 13.6
-	 *
-	 * @param array $settings - the settings array.
-	 *
-	 * @return array
-	 */
-	public function filter_site_settings_endpoint_get( $settings ) {
-		if ( class_exists( GA_Manager::class ) ) {
-			$option_name = GA_Manager::get_instance()->get_google_analytics_option_name();
-		} else {
-			// @phan-suppress-next-line PhanDeprecatedFunction
-			$option_name = $this->get_google_analytics_option_name();
-		}
-
-		$option          = get_option( $option_name, array() );
-		$settings['wga'] = wp_parse_args( $option, $this->get_defaults() );
-		return $settings;
-	}
-
-	/**
-	 * Filter the parent's response to consume our new fields
-	 *
-	 * @param array $wga - Array of existing Google Analytics settings.
-	 * @param array $new_values - the new values we're adding.
-	 *
-	 * @deprecated 13.6
-	 *
-	 * @return array
-	 */
-	public function filter_update_google_analytics( $wga, $new_values ) {
-		$wga_keys = array_keys( $this->get_defaults() );
-		foreach ( $wga_keys as $wga_key ) {
-			// Skip code since the parent class has handled it
-			if ( 'code' === $wga_key ) {
-				continue;
-			}
-			// All our new keys are booleans, so let's coerce each key's value
-			// before updating the value in settings
-			if ( array_key_exists( $wga_key, $new_values ) ) {
-				$wga[ $wga_key ] = WPCOM_JSON_API::is_truthy( $new_values[ $wga_key ] );
-			}
-		}
-		return $wga;
-	}
 }