Skip to content

Commit

Permalink
Stats: increase timeout to 20s (#33549)
Browse files Browse the repository at this point in the history
* increase fetch stats timeout to 20s

* changelog

Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/6541003121
  • Loading branch information
kangzj authored and matticbot committed Oct 17, 2023
1 parent 63a4204 commit 6ee15ef
Show file tree
Hide file tree
Showing 7 changed files with 68 additions and 60 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"automattic/jetpack-identity-crisis": "^0.10.7",
"automattic/jetpack-my-jetpack": "^3.8.2",
"automattic/jetpack-search": "^0.39.2",
"automattic/jetpack-stats": "^0.6.5",
"automattic/jetpack-stats": "^0.6.6-alpha",
"automattic/jetpack-status": "^1.18.5",
"automattic/jetpack-sync": "^1.58.0",
"automattic/jetpack-plugins-installer": "^0.2.5"
Expand Down
8 changes: 8 additions & 0 deletions jetpack_vendor/automattic/jetpack-stats/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [0.6.6-alpha] - unreleased

This is an alpha version! The changes listed here are not final.

### Fixed
- Stats: increase timeout to 20s

## [0.6.5] - 2023-08-28
### Changed
- Updated package dependencies. [#32605]
Expand Down Expand Up @@ -96,6 +103,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed
- Fixing static method which was called without self reference. [#26640]

[0.6.6-alpha]: https://github.com/Automattic/jetpack-stats/compare/v0.6.5...v0.6.6-alpha
[0.6.5]: https://github.com/Automattic/jetpack-stats/compare/v0.6.4...v0.6.5
[0.6.4]: https://github.com/Automattic/jetpack-stats/compare/v0.6.3...v0.6.4
[0.6.3]: https://github.com/Automattic/jetpack-stats/compare/v0.6.2...v0.6.3
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,7 @@ protected function fetch_remote_stats( $endpoint, $args ) {
if ( is_array( $args ) && ! empty( $args ) ) {
$endpoint .= '?' . http_build_query( $args );
}
$response = Client::wpcom_json_api_request_as_blog( $endpoint, self::STATS_REST_API_VERSION );
$response = Client::wpcom_json_api_request_as_blog( $endpoint, self::STATS_REST_API_VERSION, array( 'timeout' => 20 ) );
$response_code = wp_remote_retrieve_response_code( $response );
$response_body = wp_remote_retrieve_body( $response );

Expand Down
2 changes: 1 addition & 1 deletion jetpack_vendor/i18n-map.php
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
),
'jetpack-stats' => array(
'path' => 'jetpack_vendor/automattic/jetpack-stats',
'ver' => '0.6.5',
'ver' => '0.6.6-alpha1697503455',
),
'jetpack-sync' => array(
'path' => 'jetpack_vendor/automattic/jetpack-sync',
Expand Down
52 changes: 26 additions & 26 deletions vendor/composer/installed.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-a8c-mc-stats",
"reference": "9fdd41f523d6e3a4bae2946ced8bedf95edbcbd3"
"reference": "8eed116e17cb5ccf69d7574dda09615dcd5c7a1d"
},
"require-dev": {
"automattic/jetpack-changelogger": "^3.3.11",
Expand Down Expand Up @@ -57,7 +57,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-admin-ui",
"reference": "11abff35f79d9b83580dcc8ac7ee6213f379f355"
"reference": "df9c059d5bc488b68a8073af69782ec5c563fb7c"
},
"require-dev": {
"automattic/jetpack-changelogger": "^3.3.11",
Expand Down Expand Up @@ -119,7 +119,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-assets",
"reference": "e9c7e0d76fc66214f4f2073a8d8892a1d02ff82b"
"reference": "a1235a3f22cfa0d5555d71c4cb020172ab03e704"
},
"require": {
"automattic/jetpack-constants": "^1.6.23"
Expand Down Expand Up @@ -187,7 +187,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-autoloader",
"reference": "059d1d7871957a3c03cf59162155918c4e0fa4fc"
"reference": "88c2cde217bfbd779a7fe0c547e54a622e901f8a"
},
"require": {
"composer-plugin-api": "^1.1 || ^2.0"
Expand Down Expand Up @@ -252,7 +252,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-composer-plugin",
"reference": "0b2ab537fd7034823d5dcc18e07be57302e67a12"
"reference": "90c2e7810852b5bcff653d778120a6269b02953a"
},
"require": {
"composer-plugin-api": "^2.1.0"
Expand Down Expand Up @@ -311,7 +311,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-config",
"reference": "ba8a895fb14ab1554def8b61d55bffbcf16bd12e"
"reference": "6540e9893fb75c32a8f6da6d23a837751bc1cfef"
},
"require-dev": {
"automattic/jetpack-changelogger": "^3.3.11"
Expand Down Expand Up @@ -353,7 +353,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-connection",
"reference": "4c2960bde297b536cae39bc83180f014c3764901"
"reference": "e4fee2782ded01a85fd10ec799273b3be93f2eb8"
},
"require": {
"automattic/jetpack-a8c-mc-stats": "^1.4.22",
Expand Down Expand Up @@ -431,7 +431,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-constants",
"reference": "79980e86065633960279555076bbd555fed2ed07"
"reference": "0bb7aec82bf6b1d84ea7b37887514f832e8b1b07"
},
"require-dev": {
"automattic/jetpack-changelogger": "^3.3.11",
Expand Down Expand Up @@ -482,7 +482,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-device-detection",
"reference": "ca103fc8a1892c32b982b4be864562f5ce2ae792"
"reference": "dfa3f87cafe1840b440a5201ea1df790a56780f5"
},
"require-dev": {
"automattic/jetpack-changelogger": "^3.3.11",
Expand Down Expand Up @@ -532,7 +532,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-identity-crisis",
"reference": "f1c6257aff49d6ddca4e49c62422288953ccf85a"
"reference": "9143ed164ccf7890bcffd62f073608d512621d4a"
},
"require": {
"automattic/jetpack-assets": "^1.18.12",
Expand Down Expand Up @@ -610,7 +610,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-ip",
"reference": "fc52180a5ce060f7856bdb22c79dab955c9d3b49"
"reference": "84342067928ee057058f25fcc1898bb9bbd5b740"
},
"require-dev": {
"automattic/jetpack-changelogger": "^3.3.11",
Expand Down Expand Up @@ -665,7 +665,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-jitm",
"reference": "c2ea5cc020d9523554089e079af6cd1b8f50d42a"
"reference": "2e73780b5c182d95d4942f8cce82729ad11b0692"
},
"require": {
"automattic/jetpack-a8c-mc-stats": "^1.4.22",
Expand Down Expand Up @@ -740,7 +740,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-licensing",
"reference": "63619b3d1d80dc89201d10e6e44453754deb4b4a"
"reference": "31ec9f47a1faf384cd207296bf1bbee222ed58f1"
},
"require": {
"automattic/jetpack-connection": "^1.58.1"
Expand Down Expand Up @@ -801,7 +801,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-logo",
"reference": "3e52e96303e2b3a33e61bfda4af0fff307c09a15"
"reference": "26670e1eedf0098b0ebd4aa46e528e43a5d9531a"
},
"require-dev": {
"automattic/jetpack-changelogger": "^3.3.11",
Expand Down Expand Up @@ -851,7 +851,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-my-jetpack",
"reference": "7db366b1919523c86f547f78d72023a2b815ee45"
"reference": "24f1d85192c7c4aaf67b83beee3a649ec5a642cc"
},
"require": {
"automattic/jetpack-admin-ui": "^0.2.23",
Expand Down Expand Up @@ -941,7 +941,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-partner",
"reference": "c47160c70bf341f66b837e85222de3a4a0e68473"
"reference": "9e27f201670e38257c259dca5d8552dd59bea1f3"
},
"require": {
"automattic/jetpack-connection": "^1.58.1",
Expand Down Expand Up @@ -1003,7 +1003,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-password-checker",
"reference": "5e16331d6c02f4edc89babdde6f0ca0bbd232420"
"reference": "79bf7f934594515d90c0d1eae9d3476ac06f38a9"
},
"require-dev": {
"automattic/jetpack-changelogger": "^3.3.11",
Expand Down Expand Up @@ -1061,7 +1061,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-plugins-installer",
"reference": "2f79fbeba5ef9c434f4d22041c0bec6432f8ff8f"
"reference": "c693f30e25024075f63891a2228d1695f432894c"
},
"require": {
"automattic/jetpack-a8c-mc-stats": "^1.4.22"
Expand Down Expand Up @@ -1115,7 +1115,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-redirect",
"reference": "76c3911d245c454298164b00a5a7501cc49e68ef"
"reference": "c51ec7a0fc4977c84b6205ca3d094fb864a544bd"
},
"require": {
"automattic/jetpack-status": "^1.18.5"
Expand Down Expand Up @@ -1169,7 +1169,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-roles",
"reference": "29bcfe1e00b7c8d86f7c3613abdb1f0299e00568"
"reference": "080f4759c25550f71e7eed310371544d719590ca"
},
"require-dev": {
"automattic/jetpack-changelogger": "^3.3.11",
Expand Down Expand Up @@ -1220,7 +1220,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-search",
"reference": "13c3ae47fe9e5b5f1f0e2fb8213e1a84c14e4c2c"
"reference": "0c0229a33586b63ce71c1c36b41c4b8a3be5ac83"
},
"require": {
"automattic/jetpack-assets": "^1.18.12",
Expand Down Expand Up @@ -1301,12 +1301,12 @@
},
{
"name": "automattic/jetpack-stats",
"version": "0.6.5",
"version_normalized": "0.6.5.0",
"version": "0.6.6-alpha.1697503455",
"version_normalized": "0.6.6.0-alpha1697503455",
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-stats",
"reference": "001c7e522fab0dca42c0ca7ae51b4d7dfc3d8934"
"reference": "5ef3ee88e94c5da9903868998195e36e639d3d44"
},
"require": {
"automattic/jetpack-assets": "^1.18.12",
Expand Down Expand Up @@ -1370,7 +1370,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-status",
"reference": "b633e113f9958405a85870a759a4cb1f6b51513c"
"reference": "63aa7eb25b4d888860a1e0072fcf13b1e1686d96"
},
"require": {
"automattic/jetpack-constants": "^1.6.23"
Expand Down Expand Up @@ -1425,7 +1425,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-sync",
"reference": "c10bca02e28ed3bd862964169774acaf59449394"
"reference": "bf3d91021a9607da0410701b60ecabc2beef93de"
},
"require": {
"automattic/jetpack-connection": "^1.58.1",
Expand Down
Loading

0 comments on commit 6ee15ef

Please sign in to comment.