Merge pull request #5763 from Automattic/staging

Production release v20240730.0

logstash/class-logger.php

@@ -524,7 +524,7 @@ public static function process_entries_on_shutdown(): void {
 
 		// Process all entries.
 		foreach ( static::$entries as $entry ) {
-			if ( ! defined( 'VIP_GO_ENV' ) || ! VIP_GO_ENV ) {
+			if ( ! defined( 'VIP_GO_ENV' ) || ! VIP_GO_ENV || constant( 'VIP_GO_ENV' ) === 'local' ) {
 				static::maybe_wp_debug_log_entries( $entry );
 				continue; // Bypassing logstash log writing below in this case.
 			}
@@ -565,11 +565,6 @@ public static function maybe_wp_debug_log_entries( array $entry ): void {
 	 * @param array $entry Data.
 	 */
 	public static function wp_debug_log( array $entry ): void {
-		if ( defined( 'VIP_GO_ENV' ) && VIP_GO_ENV ) {
-			// Don't run this on VIP Go
-			return;
-		}
-
 		$log_path = WP_CONTENT_DIR . '/debug.log';
 		$log_path = is_string( WP_DEBUG_LOG ) && WP_DEBUG_LOG ? WP_DEBUG_LOG : $log_path;