Improve the logging/noticing of Legacy REST API usages

plugins/woocommerce/changelog/43851-improve-legacy-rest-api-usage-logging

@@ -0,0 +1,4 @@
+Significance: patch
+Type: update
+
+Improve the logging/noticing of Legacy REST API usages

plugins/woocommerce/includes/admin/class-wc-admin-notices.php

@@ -147,8 +147,9 @@ private static function maybe_add_legacy_api_removal_notice() {
 					),
 					sprintf(
 					// translators: Placeholders are URLs.
-						wpautop( wp_kses_data( __( 'The WooCommerce Legacy REST API, <a href="%1$s">currently enabled in this site</a>, will be removed in WooCommerce 9.0. A separate WooCommerce extension will be available to keep it enabled. <b><a target="_blank" href="%2$s">Learn more about this change.</a></b>', 'woocommerce' ) ) ),
+						wpautop( __( 'The WooCommerce Legacy REST API, <a href="%1$s">currently enabled in this site</a>, will be removed in WooCommerce 9.0. <a target="_blank" href="%2$s">A separate WooCommerce extension is available</a> to keep it enabled. <b><a target="_blank" href="%3$s">Learn more about this change.</a></b>', 'woocommerce' ) ),
 						admin_url( 'admin.php?page=wc-settings&tab=advanced&section=legacy_api' ),
+						'https://wordpress.org/plugins/woocommerce-legacy-rest-api/',
 						'https://developer.woo.com/2023/10/03/the-legacy-rest-api-will-move-to-a-dedicated-extension-in-woocommerce-9-0/'
 					)
 				)
@@ -166,8 +167,9 @@ private static function maybe_add_legacy_api_removal_notice() {
 					),
 					sprintf(
 					// translators: Placeholders are URLs.
-						wpautop( wp_kses_data( __( 'The WooCommerce Legacy REST API will be removed in WooCommerce 9.0, and this will cause <a href="%1$s">webhooks on this site that are configured to use the Legacy REST API</a> to stop working. A separate WooCommerce extension will be available to allow these webhooks to keep using the Legacy REST API without interruption. You can also edit these webhooks to use the current REST API version to generate the payload instead. <b><a target="_blank" href="%2$s">Learn more about this change.</a></b>', 'woocommerce' ) ) ),
+						wpautop( __( 'The WooCommerce Legacy REST API will be removed in WooCommerce 9.0, and this will cause <a href="%1$s">webhooks on this site that are configured to use the Legacy REST API</a> to stop working. <a target="_blank" href="%2$s">A separate WooCommerce extension is available</a> to allow these webhooks to keep using the Legacy REST API without interruption. You can also edit these webhooks to use the current REST API version to generate the payload instead. <b><a target="_blank" href="%3$s">Learn more about this change.</a></b>', 'woocommerce' ) ),
 						admin_url( 'admin.php?page=wc-settings&tab=advanced&section=webhooks&legacy=true' ),
+						'https://wordpress.org/plugins/woocommerce-legacy-rest-api/',
 						'https://developer.woo.com/2023/10/03/the-legacy-rest-api-will-move-to-a-dedicated-extension-in-woocommerce-9-0/'
 					)
 				)

plugins/woocommerce/includes/admin/settings/class-wc-settings-advanced.php

@@ -395,9 +395,10 @@ protected function get_settings_for_legacy_api_section() {
 			$enable_legacy_api_setting['desc_tip'] = sprintf(
 			// translators: Placeholders are URLs.
 				__(
-					'⚠️ <b>️The Legacy REST API will be removed in WooCommerce 9.0.</b> A separate WooCommerce extension will soon be available to keep it enabled. You can check Legacy REST API usages in <b><a target="_blank" href="%1$s">the WooCommerce log files</a></b> (file names start with <code>legacy_rest_api_usages</code>). <b><a target="_blank" href="%2$s">Learn more about this change.</a></b>',
+					'⚠️ <b>️The Legacy REST API will be removed in WooCommerce 9.0.</b> <a target="_blank" href="%1$s">A separate WooCommerce extension is available</a> to keep it enabled. You can check Legacy REST API usages in <b><a target="_blank" href="%2$s">the WooCommerce log files</a></b> (file names start with <code>legacy_rest_api_usages</code>). <b><a target="_blank" href="%3$s">Learn more about this change.</a></b>',
 					'woocommerce'
 				),
+				'https://wordpress.org/plugins/woocommerce-legacy-rest-api/',
 				admin_url( 'admin.php?page=wc-status&tab=logs' ),
 				'https://developer.woo.com/2023/10/03/the-legacy-rest-api-will-move-to-a-dedicated-extension-in-woocommerce-9-0/'
 			);

plugins/woocommerce/includes/legacy/class-wc-legacy-api.php

@@ -114,7 +114,14 @@ private function maybe_log_rest_api_request( string $route, ?string $user_agent
 		 * @since 8.5.0
 		 */
 		if ( apply_filters( 'woocommerce_log_legacy_rest_api_usages', true ) ) {
-			wc_get_logger()->info( 'Version: ' . WC_API_REQUEST_VERSION . ", Route: $route, User agent: $user_agent", array( 'source' => 'legacy_rest_api_usages' ) );
+            $user_agent = sanitize_text_field( wp_unslash( $user_agent ) );
+            $route = sanitize_text_field( wp_unslash( $route ) );
+            $info = 'Version: ' . WC_API_REQUEST_VERSION . ", Route: $route, User agent: $user_agent";
+            $ip_address = WC_Geolocation::get_ip_address();
+            if( '' !== $ip_address ) {
+                $info .= ", IP: $ip_address";
+            }
+			wc_get_logger()->info( $info, array( 'source' => 'legacy_rest_api_usages' ) );
 		}
 	}