Merge branch 'main' into main

Author: LKaemmerling

.github/workflows/blackbox.yml

@@ -24,7 +24,11 @@ jobs:
         with:
           php-version: 8.4
           coverage: none
-
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Install dependencies
         run: composer install --prefer-dist --no-interaction --no-suggest
 

.github/workflows/checks.yml

@@ -16,7 +16,11 @@ jobs:
         with:
           path: ~/.composer/cache/files
           key: dependencies-code-checks
-
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:

.github/workflows/tests.yml

@@ -48,7 +48,11 @@ jobs:
         with:
           path: ~/.composer/cache/files
           key: dependencies-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
-
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:

src/Prometheus/Exception/MetricNotFoundException.php

@@ -2,11 +2,11 @@
 
 namespace Prometheus\Exception;
 
-use Exception;
+use RuntimeException;
 
 /**
  * Exception thrown if a metric can't be found in the CollectorRegistry.
  */
-class MetricNotFoundException extends Exception
+class MetricNotFoundException extends RuntimeException
 {
 }

src/Prometheus/Storage/PDO.php

@@ -641,7 +641,7 @@ protected function createTables(): void
     `time` {$timestamp_type} NOT NULL
 );
 SQL;
-                $sqlIndex = "CREATE INDEX `name` ON `{$this->prefix}_summaries`(`name`);";
+                $sqlIndex = "CREATE INDEX IF NOT EXISTS `name` ON `{$this->prefix}_summaries`(`name`);";
                 break;
 
             case 'mysql':
@@ -667,7 +667,7 @@ protected function createTables(): void
     "time" {$timestamp_type} NOT NULL
 );
 SQL;
-                $sqlIndex = "CREATE INDEX \"name\" ON \"{$this->prefix}_summaries\" (\"name\");";
+                $sqlIndex = "CREATE INDEX IF NOT EXISTS \"name\" ON \"{$this->prefix}_summaries\" (\"name\");";
                 break;
         }