Resolve GuzzleHttp\Exception\RequestException error (#1168)

dati18 · tarrow · web-flow · commit c9b333f5a32b · 2026-07-03T12:33:07.000+02:00
[bumping guzzlehttp/guzzle from 7.10.5 to 7.12.0 ]( #1165) triggered a bunch of [error](https://console.cloud.google.com/errors/detail/CNrO9YzO99qlkQE?project=wikibase-cloud&supportedpurview=project) The stack trace pointed to line 21 and 30 of [PollForMediaWikiJob](https://github.com/wbstack/api/blob/main/app/Jobs/PollForMediaWikiJobsJob.php#L30) The investigation is documented [here](https://phabricator.wikimedia.org/T429593#12058620). Bug: T429593 --------- Co-authored-by: Thomas Arrow <tarrow@users.noreply.github.com>
diff --git a/app/Console/Commands/RebuildQueryserviceData.php b/app/Console/Commands/RebuildQueryserviceData.php
@@ -42,7 +42,7 @@ public function handle(MediaWikiHostResolver $mwHostResolver) {
         $skippedWikis = 0;
         $processedWikis = 0;
         foreach ($wikis as $wiki) {
-            $this->apiUrl = $mwHostResolver->getBackendHostForDomain($wiki->domain) . '/w/api.php'; // used in PageFetcher::fetchPagesInNamespace
+            $this->apiUrl = $mwHostResolver->getBackendUrlForDomain($wiki->domain) . '/w/api.php'; // used in PageFetcher::fetchPagesInNamespace
 
             try {
                 $entities = $this->getEntitiesForWiki($wiki);
diff --git a/app/Jobs/PlatformStatsSummaryJob.php b/app/Jobs/PlatformStatsSummaryJob.php
@@ -80,7 +80,7 @@ public function prepareStats(array $allStats, $wikis): array {
         $currentTime = CarbonImmutable::now();
 
         foreach ($wikis as $wiki) {
-            $this->apiUrl = $this->mwHostResolver->getBackendHostForDomain($wiki->domain) . '/w/api.php'; // used in PageFetcher::fetchPagesInNamespace
+            $this->apiUrl = $this->mwHostResolver->getBackendUrlForDomain($wiki->domain) . '/w/api.php'; // used in PageFetcher::fetchPagesInNamespace
 
             if (!is_null($wiki->deleted_at)) {
                 $deletedWikis[] = $wiki;
diff --git a/app/Jobs/PollForMediaWikiJobsJob.php b/app/Jobs/PollForMediaWikiJobsJob.php
@@ -28,7 +28,7 @@ private function hasPendingJobs(string $wikiDomain): bool {
         $response = Http::withHeaders([
             'host' => $wikiDomain,
         ])->get(
-            $this->mwHostResolver->getBackendHostForDomain($wikiDomain) . '/w/api.php?action=query&meta=siteinfo&siprop=statistics&format=json'
+            $this->mwHostResolver->getBackendUrlForDomain($wikiDomain) . '/w/api.php?action=query&meta=siteinfo&siprop=statistics&format=json'
         );
 
         if ($response->failed()) {
diff --git a/app/Jobs/UpdateWikiSiteStatsJob.php b/app/Jobs/UpdateWikiSiteStatsJob.php
@@ -59,7 +59,7 @@ private function updateSiteStats(Wiki $wiki): void {
         $response = Http::withHeaders([
             'host' => $wiki->getAttribute('domain'),
         ])->get(
-            $this->mwHostResolver->getBackendHostForDomain($wiki->domain) . '/w/api.php?action=query&meta=siteinfo&siprop=statistics&format=json'
+            $this->mwHostResolver->getBackendUrlForDomain($wiki->domain) . '/w/api.php?action=query&meta=siteinfo&siprop=statistics&format=json'
         );
 
         if ($response->failed()) {
@@ -81,7 +81,7 @@ private function updateSiteStats(Wiki $wiki): void {
 
     private function getFirstEditedDate(Wiki $wiki): ?CarbonInterface {
         $allRevisions = Http::withHeaders(['host' => $wiki->getAttribute('domain')])->get(
-            $this->mwHostResolver->getBackendHostForDomain($wiki->domain) . '/w/api.php',
+            $this->mwHostResolver->getBackendUrlForDomain($wiki->domain) . '/w/api.php',
             [
                 'action' => 'query',
                 'format' => 'json',
@@ -99,7 +99,7 @@ private function getFirstEditedDate(Wiki $wiki): ?CarbonInterface {
         }
 
         $revisionInfo = Http::withHeaders(['host' => $wiki->getAttribute('domain')])->get(
-            $this->mwHostResolver->getBackendHostForDomain($wiki->domain) . '/w/api.php',
+            $this->mwHostResolver->getBackendUrlForDomain($wiki->domain) . '/w/api.php',
             [
                 'action' => 'query',
                 'format' => 'json',
@@ -119,7 +119,7 @@ private function getFirstEditedDate(Wiki $wiki): ?CarbonInterface {
 
     private function getLastEditedDate(Wiki $wiki): ?CarbonInterface {
         $allRevisions = Http::withHeaders(['host' => $wiki->getAttribute('domain')])->get(
-            $this->mwHostResolver->getBackendHostForDomain($wiki->domain) . '/w/api.php',
+            $this->mwHostResolver->getBackendUrlForDomain($wiki->domain) . '/w/api.php',
             [
                 'action' => 'query',
                 'format' => 'json',
@@ -137,7 +137,7 @@ private function getLastEditedDate(Wiki $wiki): ?CarbonInterface {
         }
 
         $revisionInfo = Http::withHeaders(['host' => $wiki->getAttribute('domain')])->get(
-            $this->mwHostResolver->getBackendHostForDomain($wiki->domain) . '/w/api.php',
+            $this->mwHostResolver->getBackendUrlForDomain($wiki->domain) . '/w/api.php',
             [
                 'action' => 'query',
                 'format' => 'json',
diff --git a/app/Jobs/WikiEntityImportJob.php b/app/Jobs/WikiEntityImportJob.php
@@ -77,7 +77,7 @@ private static function domainToOrigin(string $domain): string {
 
     private static function acquireCredentials(string $wikiDomain, MediaWikiHostResolver $mwHostResolver): OAuthCredentials {
         $response = Http::withHeaders(['host' => $wikiDomain])->asForm()->post(
-            $mwHostResolver->getBackendHostForDomain($wikiDomain) . '/w/api.php?action=wbstackPlatformOauthGet&format=json',
+            $mwHostResolver->getBackendUrlForDomain($wikiDomain) . '/w/api.php?action=wbstackPlatformOauthGet&format=json',
             [
                 'consumerName' => 'WikiEntityImportJob',
                 'ownerOnly' => '1',
diff --git a/app/Metrics/App/WikiMetrics.php b/app/Metrics/App/WikiMetrics.php
@@ -79,7 +79,10 @@ protected function getNumOfTriples(): ?int {
             return null;
         }
 
-        $endpoint = $qsNamespace->backend . '/bigdata/namespace/' . $qsNamespace->namespace . '/sparql';
+        $endpoint = 'http://' . $qsNamespace->backend
+            . '/bigdata/namespace/'
+            . $qsNamespace->namespace
+            . '/sparql';
         $query = 'SELECT (COUNT(*) AS ?triples) WHERE { ?s ?p ?o }';
 
         $response = Http::withHeaders([
diff --git a/app/Services/MediaWikiHostResolver.php b/app/Services/MediaWikiHostResolver.php
@@ -37,6 +37,13 @@ public function getBackendHostForDomain(string $domain): string {
         return sprintf('mediawiki-%s-app-backend.default.svc.cluster.local', $this->getMwVersionForDomain($domain));
     }
 
+    /**
+     * Laravel Http or Guzzle callers need a full backend URL.
+     */
+    public function getBackendUrlForDomain(string $domain): string {
+        return 'http://' . $this->getBackendHostForDomain($domain);
+    }
+
     private function getMwVersionForDomain(string $domain): string {
         $wiki = Wiki::where('domain', $domain)->first();
 
diff --git a/composer.json b/composer.json
@@ -11,7 +11,7 @@
         "absszero/laravel-stackdriver-error-reporting": "^1.9",
         "firebase/php-jwt": "^7.0",
         "google/recaptcha": "^1.2",
-        "guzzlehttp/guzzle": "^7.8",
+        "guzzlehttp/guzzle": "^7.13",
         "guzzlehttp/psr7": "^2.9",
         "hackzilla/password-generator": "^1.6",
         "intervention/image": "^2.5",
diff --git a/composer.lock b/composer.lock
diff --git a/tests/Commands/RebuildQueryserviceDataTest.php b/tests/Commands/RebuildQueryserviceDataTest.php
@@ -25,10 +25,10 @@ protected function setUp(): void {
         WikiSetting::query()->delete();
         QueryserviceNamespace::query()->delete();
 
-        $this->mwBackendHost = 'mediawiki.localhost';
+        $this->mwBackendHost = 'http://mediawiki.localhost';
 
         $mockMwHostResolver = $this->createMock(MediaWikiHostResolver::class);
-        $mockMwHostResolver->method('getBackendHostForDomain')->willReturn(
+        $mockMwHostResolver->method('getBackendUrlForDomain')->willReturn(
             $this->mwBackendHost
         );
 
diff --git a/tests/Jobs/PlatformStatsSummaryJobTest.php b/tests/Jobs/PlatformStatsSummaryJobTest.php
@@ -44,10 +44,10 @@ protected function setUp(): void {
         $this->wikis = [];
         $this->users = [];
 
-        $this->mwBackendHost = 'mediawiki.localhost';
+        $this->mwBackendHost = 'http://mediawiki.localhost';
 
         $this->mockMwHostResolver = $this->createMock(MediaWikiHostResolver::class);
-        $this->mockMwHostResolver->method('getBackendHostForDomain')->willReturn(
+        $this->mockMwHostResolver->method('getBackendUrlForDomain')->willReturn(
             $this->mwBackendHost
         );
     }
diff --git a/tests/Jobs/PollForMediaWikiJobsJobTest.php b/tests/Jobs/PollForMediaWikiJobsJobTest.php
@@ -26,10 +26,10 @@ protected function setUp(): void {
         parent::setUp();
         $this->wiki = Wiki::factory()->create();
 
-        $this->mwBackendHost = 'mediawiki.localhost';
+        $this->mwBackendHost = 'http://mediawiki.localhost';
 
         $this->mockMwHostResolver = $this->createMock(MediaWikiHostResolver::class);
-        $this->mockMwHostResolver->method('getBackendHostForDomain')->willReturn(
+        $this->mockMwHostResolver->method('getBackendUrlForDomain')->willReturn(
             $this->mwBackendHost
         );
     }
diff --git a/tests/Jobs/UpdateWikiSiteStatsJobTest.php b/tests/Jobs/UpdateWikiSiteStatsJobTest.php
@@ -27,10 +27,10 @@ protected function setUp(): void {
         $this->fakeResponses = [];
         Http::preventStrayRequests();
 
-        $this->mwBackendHost = 'mediawiki.localhost';
+        $this->mwBackendHost = 'http://mediawiki.localhost';
 
         $this->mockMwHostResolver = $this->createMock(MediaWikiHostResolver::class);
-        $this->mockMwHostResolver->method('getBackendHostForDomain')->willReturn(
+        $this->mockMwHostResolver->method('getBackendUrlForDomain')->willReturn(
             $this->mwBackendHost
         );
     }
diff --git a/tests/Jobs/WikiEntityImportJobTest.php b/tests/Jobs/WikiEntityImportJobTest.php
@@ -29,10 +29,10 @@ protected function setUp(): void {
         Wiki::query()->delete();
         WikiEntityImport::query()->delete();
 
-        $this->mwBackendHost = 'mediawiki.localhost';
+        $this->mwBackendHost = 'http://mediawiki.localhost';
 
         $this->mockMwHostResolver = $this->createMock(MediaWikiHostResolver::class);
-        $this->mockMwHostResolver->method('getBackendHostForDomain')->willReturn(
+        $this->mockMwHostResolver->method('getBackendUrlForDomain')->willReturn(
             $this->mwBackendHost
         );
     }
diff --git a/tests/Metrics/WikiMetricsTest.php b/tests/Metrics/WikiMetricsTest.php
@@ -11,6 +11,7 @@
 use Carbon\Carbon;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Http\Client\Request;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Schema;
@@ -196,6 +197,13 @@ public function testTripleCountSavedSuccessfully() {
             ], 200),
         ]);
         (new WikiMetrics())->saveMetrics($wiki);
+        Http::assertSent(function (Request $request) use ($host, $namespace) {
+            return $request->method() === 'GET'
+                && str_starts_with(
+                    $request->url(),
+                    'http://' . $host . '/bigdata/namespace/' . $namespace . '/sparql'
+                );
+        });
         $this->assertDatabaseHas('wiki_daily_metrics', [
             'wiki_id' => $wiki->id,
             'number_of_triples' => 12345,
diff --git a/tests/Services/MediaWikiHostResolverTest.php b/tests/Services/MediaWikiHostResolverTest.php

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ private static function domainToOrigin(string $domain): string {`
`77`	`77`
`78`	`78`	`private static function acquireCredentials(string $wikiDomain, MediaWikiHostResolver $mwHostResolver): OAuthCredentials {`
`79`	`79`	`$response = Http::withHeaders(['host' => $wikiDomain])->asForm()->post(`
`80`		`- $mwHostResolver->getBackendHostForDomain($wikiDomain) . '/w/api.php?action=wbstackPlatformOauthGet&format=json',`
	`80`	`+ $mwHostResolver->getBackendUrlForDomain($wikiDomain) . '/w/api.php?action=wbstackPlatformOauthGet&format=json',`
`81`	`81`	`[`
`82`	`82`	`'consumerName' => 'WikiEntityImportJob',`
`83`	`83`	`'ownerOnly' => '1',`