Improve logging and reporting

Author: Seldaek

src/Package/V2Dumper.php

@@ -109,6 +109,7 @@ public function dumpRoot(bool $verbose = false): void
             echo 'Dumping root'.PHP_EOL;
         }
         $this->dumpRootFile($rootFile, json_encode($rootFileContents, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE | JSON_THROW_ON_ERROR));
+        $this->statsd->increment('packagist.metadata_dump_root');
     }
 
     /**
@@ -151,7 +152,10 @@ public function dump(array $packageIds, bool $force = false, bool $verbose = fal
         $step = 50;
         while ($packageIds) {
             $dumpTime = new \DateTime;
-            $packages = $this->getEM()->getRepository(Package::class)->getPackagesWithVersions(array_splice($packageIds, 0, $step));
+            $idBatch = array_splice($packageIds, 0, $step);
+            $this->logger->debug('Dumping package ids', ['ids' => $idBatch]);
+            $packages = $this->getEM()->getRepository(Package::class)->getPackagesWithVersions($idBatch);
+            unset($idBatch);
             $packageNames = array_map(static fn (Package $pkg) => $pkg->getName(), $packages);
             $advisories = $this->getEM()->getRepository(SecurityAdvisory::class)->getAdvisoryIdsAndVersions($packageNames);
 
@@ -232,8 +236,6 @@ public function dump(array $packageIds, bool $force = false, bool $verbose = fal
                 sleep(1);
             }
         }
-
-        $this->statsd->increment('packagist.metadata_dump_v2');
     }
 
     public function gc(): void
@@ -385,5 +387,6 @@ private function writeV2File(Package $package, string $name, string $path, strin
         $this->writeFileAtomic($path, $contents, intval(ceil($filemtime/10000)));
 
         $this->redis->zadd('metadata-dumps', [$pkgWithDevFlag => $filemtime]);
+        $this->statsd->increment('packagist.metadata_dump_v2');
     }
 }

src/Service/CdnClient.php

@@ -2,6 +2,7 @@
 
 namespace App\Service;
 
+use Psr\Log\LoggerInterface;
 use Symfony\Component\HttpClient\NoPrivateNetworkHttpClient;
 use Symfony\Contracts\HttpClient\ResponseInterface;
 use Symfony\Contracts\HttpClient\ResponseStreamInterface;
@@ -14,6 +15,7 @@ public function __construct(
         private ?string $metadataPublicEndpoint,
         private ?string $metadataApiKey,
         private ?string $cdnApiKey,
+        private readonly LoggerInterface $logger,
     ) {}
 
     /**
@@ -46,7 +48,9 @@ public function uploadMetadata(string $path, string $contents): int
             ],
         ]);
         // wait for status code at least
-        $resp->getStatusCode();
+        if ($resp->getStatusCode() !== 200) {
+            $this->logger->error('Failed purging '.$path.' from CDN while writing an update to it', ['filemtime' => $time/10000]);
+        }
 
         return $time;
     }