Merge pull request #11070 from nanaya/fastimage-log

 Better image size error logging

Author: notbakaneko

app/Exceptions/FastImagesizeFetchException.php

@@ -0,0 +1,12 @@
+<?php
+
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+declare(strict_types=1);
+
+namespace App\Exceptions;
+
+class FastImagesizeFetchException extends \Exception
+{
+}

app/Transformers/ContestEntryTransformer.php

@@ -9,7 +9,6 @@
 use App\Models\DeletedUser;
 use League\Fractal\Resource\Collection;
 use League\Fractal\Resource\Item;
-use Sentry\State\Scope;
 
 class ContestEntryTransformer extends TransformerAbstract
 {
@@ -88,20 +87,10 @@ public function includeArtMeta(ContestEntry $entry)
         $thumbnailUrl = $entry->thumbnail();
         // suffix urls when contests are made live to ensure image dimensions are forcibly rechecked
         if ($entry->contest->visible) {
-            $urlSuffix = str_contains($thumbnailUrl, '?') ? '&live' : '?live';
+            $thumbnailUrl .= str_contains($thumbnailUrl, '?') ? '&live' : '?live';
         }
 
-        $size = fast_imagesize($thumbnailUrl.($urlSuffix ?? ''));
-
-        if ($size === null) {
-            app('sentry')->getClient()->captureMessage(
-                'Failed fetching image size of contest entry',
-                null,
-                (new Scope())
-                    ->setExtra('id', $entry->getKey())
-                    ->setExtra('url', $thumbnailUrl),
-            );
-        }
+        $size = fast_imagesize($thumbnailUrl, "contest_entry:{$entry->getKey()}");
 
         return $this->primitive([
             'width' => $size[0] ?? 0,

app/helpers.php

@@ -3,6 +3,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
 // See the LICENCE file in the repository root for full licence text.
 
+use App\Exceptions\FastImagesizeFetchException;
 use App\Libraries\Base64Url;
 use App\Libraries\LocaleMeta;
 use App\Models\LoginAttempt;
@@ -1338,14 +1339,14 @@ function json_item($model, $transformer, $includes = null)
     return json_collection([$model], $transformer, $includes)[0] ?? null;
 }
 
-function fast_imagesize($url)
+function fast_imagesize($url, ?string $logErrorId = null)
 {
     static $oneMonthInSeconds = 30 * 24 * 60 * 60;
 
     return null_if_false(Cache::remember(
         "imageSize:{$url}",
         $oneMonthInSeconds,
-        function () use ($url) {
+        function () use ($logErrorId, $url) {
             $curl = curl_init($url);
             curl_setopt_array($curl, [
                 CURLOPT_HTTPHEADER => [
@@ -1358,6 +1359,15 @@ function () use ($url) {
             ]);
             $data = curl_exec($curl);
 
+            $errorCode = curl_errno($curl);
+            if ($errorCode !== 0 && $logErrorId !== null) {
+                log_error(new FastImagesizeFetchException(), [
+                    'curl_error_code' => $errorCode,
+                    'curl_error_message' => curl_error($curl),
+                    'error_id' => $logErrorId,
+                ]);
+            }
+
             // null isn't cached
             return read_image_properties_from_string($data) ?? false;
         },

resources/views/store/products/show.blade.php

@@ -29,7 +29,7 @@ class="osu-page osu-page--store"
                         <div class="gallery-previews">
                             @foreach($product->images() as $i => $image)
                                 @php
-                                    $imageSize = fast_imagesize($image[1]);
+                                    $imageSize = fast_imagesize($image[1], "store_product:{$product->getKey()}");
                                 @endphp
                                 <a
                                     class="gallery-previews__item js-gallery"