From aec14408cb140b1c62ddce9b1cbdacd80be7107c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 17 Apr 2026 09:27:33 +0000 Subject: [PATCH 1/3] chore(deps): bump lkaemmerling/laravel-horizon-prometheus-exporter Bumps [lkaemmerling/laravel-horizon-prometheus-exporter](https://github.com/LKaemmerling/laravel-horizon-prometheus-exporter) from 1.7.0 to 1.8.3. - [Release notes](https://github.com/LKaemmerling/laravel-horizon-prometheus-exporter/releases) - [Commits](https://github.com/LKaemmerling/laravel-horizon-prometheus-exporter/compare/v1.7.0...v1.8.3) --- updated-dependencies: - dependency-name: lkaemmerling/laravel-horizon-prometheus-exporter dependency-version: 1.8.3 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- composer.lock | 63 +++++++++++++++++++++++++++------------------------ 1 file changed, 33 insertions(+), 30 deletions(-) diff --git a/composer.lock b/composer.lock index b511de54..dd32effa 100644 --- a/composer.lock +++ b/composer.lock @@ -2160,22 +2160,22 @@ }, { "name": "guzzlehttp/guzzle", - "version": "7.8.1", + "version": "7.9.3", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "41042bc7ab002487b876a0683fc8dce04ddce104" + "reference": "7b2f29fe81dc4da0ca0ea7d42107a0845946ea77" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/41042bc7ab002487b876a0683fc8dce04ddce104", - "reference": "41042bc7ab002487b876a0683fc8dce04ddce104", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/7b2f29fe81dc4da0ca0ea7d42107a0845946ea77", + "reference": "7b2f29fe81dc4da0ca0ea7d42107a0845946ea77", "shasum": "" }, "require": { "ext-json": "*", - "guzzlehttp/promises": "^1.5.3 || ^2.0.1", - "guzzlehttp/psr7": "^1.9.1 || ^2.5.1", + "guzzlehttp/promises": "^1.5.3 || ^2.0.3", + "guzzlehttp/psr7": "^2.7.0", "php": "^7.2.5 || ^8.0", "psr/http-client": "^1.0", "symfony/deprecation-contracts": "^2.2 || ^3.0" @@ -2186,9 +2186,9 @@ "require-dev": { "bamarni/composer-bin-plugin": "^1.8.2", "ext-curl": "*", - "php-http/client-integration-tests": "dev-master#2c025848417c1135031fdf9c728ee53d0a7ceaee as 3.0.999", + "guzzle/client-integration-tests": "3.0.2", "php-http/message-factory": "^1.1", - "phpunit/phpunit": "^8.5.36 || ^9.6.15", + "phpunit/phpunit": "^8.5.39 || ^9.6.20", "psr/log": "^1.1 || ^2.0 || ^3.0" }, "suggest": { @@ -2266,7 +2266,7 @@ ], "support": { "issues": "https://github.com/guzzle/guzzle/issues", - "source": "https://github.com/guzzle/guzzle/tree/7.8.1" + "source": "https://github.com/guzzle/guzzle/tree/7.9.3" }, "funding": [ { @@ -2282,7 +2282,7 @@ "type": "tidelift" } ], - "time": "2023-12-03T20:35:24+00:00" + "time": "2025-03-27T13:37:11+00:00" }, { "name": "guzzlehttp/promises", @@ -4265,30 +4265,30 @@ }, { "name": "lkaemmerling/laravel-horizon-prometheus-exporter", - "version": "v1.7.0", + "version": "v1.8.3", "source": { "type": "git", "url": "https://github.com/LKaemmerling/laravel-horizon-prometheus-exporter.git", - "reference": "caedfcdbda7c3d1bb9a29f4b9517d80a33bb3fa7" + "reference": "9574e946bb41483b9d3eec2f57abcfc29c812ef0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/LKaemmerling/laravel-horizon-prometheus-exporter/zipball/caedfcdbda7c3d1bb9a29f4b9517d80a33bb3fa7", - "reference": "caedfcdbda7c3d1bb9a29f4b9517d80a33bb3fa7", + "url": "https://api.github.com/repos/LKaemmerling/laravel-horizon-prometheus-exporter/zipball/9574e946bb41483b9d3eec2f57abcfc29c812ef0", + "reference": "9574e946bb41483b9d3eec2f57abcfc29c812ef0", "shasum": "" }, "require": { - "illuminate/config": "^6.0|^7.0|^8.0|^9.0|^10.0", - "illuminate/routing": "^6.0|^7.0|^8.0|^9.0|^10.0", - "illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0", + "illuminate/config": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0|^13.0", + "illuminate/routing": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0|^13.0", + "illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0|^13.0", "laravel/horizon": "^4.0|^5.0", "php": "^7.1|^8.0", "promphp/prometheus_client_php": "^1.0.3|^2.0.0" }, "require-dev": { - "orchestra/testbench": "^v4.9|^5.3|^6.3|^7.0|^8.0", - "phpunit/phpunit": "^8.2|^9.0", - "symfony/var-dumper": "^4.3|^5.1" + "orchestra/testbench": "^v4.9|^5.3|^6.3|^7.0|^8.0|^9.0|^10.0|^11.0", + "phpunit/phpunit": "^8.2|^9.0|^10.5|^11.5.3|^12.5.12", + "symfony/var-dumper": "^4.3|^5.1|^7.2" }, "type": "library", "extra": { @@ -4326,9 +4326,9 @@ ], "support": { "issues": "https://github.com/LKaemmerling/laravel-horizon-prometheus-exporter/issues", - "source": "https://github.com/LKaemmerling/laravel-horizon-prometheus-exporter/tree/v1.7.0" + "source": "https://github.com/LKaemmerling/laravel-horizon-prometheus-exporter/tree/v1.8.3" }, - "time": "2023-01-31T07:32:39+00:00" + "time": "2026-03-08T23:37:26+00:00" }, { "name": "maclof/kubernetes-client", @@ -5966,21 +5966,21 @@ }, { "name": "promphp/prometheus_client_php", - "version": "v2.10.0", + "version": "v2.15.0", "source": { "type": "git", "url": "https://github.com/PromPHP/prometheus_client_php.git", - "reference": "a09ea80ec1ec26dd1d4853e9af2a811e898dbfeb" + "reference": "da86f1507b04dc44dc37ffb766d7d3a1d42c3050" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PromPHP/prometheus_client_php/zipball/a09ea80ec1ec26dd1d4853e9af2a811e898dbfeb", - "reference": "a09ea80ec1ec26dd1d4853e9af2a811e898dbfeb", + "url": "https://api.github.com/repos/PromPHP/prometheus_client_php/zipball/da86f1507b04dc44dc37ffb766d7d3a1d42c3050", + "reference": "da86f1507b04dc44dc37ffb766d7d3a1d42c3050", "shasum": "" }, "require": { "ext-json": "*", - "php": "^7.2|^8.0" + "php": "^8.2" }, "replace": { "endclothing/prometheus_client_php": "*", @@ -5994,14 +5994,17 @@ "phpstan/phpstan-phpunit": "^1.1.0", "phpstan/phpstan-strict-rules": "^1.1.0", "phpunit/phpunit": "^9.4", + "predis/predis": "^2.3", "squizlabs/php_codesniffer": "^3.6", "symfony/polyfill-apcu": "^1.6" }, "suggest": { "ext-apc": "Required if using APCu.", + "ext-pdo": "Required if using PDO.", "ext-redis": "Required if using Redis.", + "predis/predis": "Required if using Predis.", "promphp/prometheus_push_gateway_php": "An easy client for using Prometheus PushGateway.", - "symfony/polyfill-apcu": "Required if you use APCu on PHP8.0+" + "symfony/polyfill-apcu": "Required if you use APCu." }, "type": "library", "extra": { @@ -6027,9 +6030,9 @@ "description": "Prometheus instrumentation library for PHP applications.", "support": { "issues": "https://github.com/PromPHP/prometheus_client_php/issues", - "source": "https://github.com/PromPHP/prometheus_client_php/tree/v2.10.0" + "source": "https://github.com/PromPHP/prometheus_client_php/tree/v2.15.0" }, - "time": "2024-02-01T13:28:34+00:00" + "time": "2026-03-24T22:44:50+00:00" }, { "name": "psr/cache", From b923d00eaccef32746ddc4462a8e15eb992c0565 Mon Sep 17 00:00:00 2001 From: Thomas Arrow Date: Tue, 21 Apr 2026 15:22:24 +0100 Subject: [PATCH 2/3] Fix config referencing Since v1.8.1 of laravel-horizon-prometheus-exporter CurrentProcessesPerQueue has been renamed from CurrentProccesesPerQueue which was a typo This class including the typo was explictly referenced in our config and therefore needed to be fixed Bug: T423429 --- config/horizon-exporter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/horizon-exporter.php b/config/horizon-exporter.php index fd0b2db4..2160436c 100644 --- a/config/horizon-exporter.php +++ b/config/horizon-exporter.php @@ -30,7 +30,7 @@ CurrentMasterSupervisors::class, JobsPerMinute::class, CurrentWorkload::class, - CurrentProccesesPerQueue::class, + CurrentProcessesPerQueue::class, FailedJobsPerHour::class, HorizonStatus::class, RecentJobs::class, From 76239c012dce77b832c10c7674591d6599e73b74 Mon Sep 17 00:00:00 2001 From: Ollie Date: Mon, 27 Apr 2026 14:52:29 +0100 Subject: [PATCH 3/3] More fixes after bump to 1.8.3 * Add `void` return type to match the `Exporter` interface * Another fix of `CurrentProccesesPerQueue` -> `CurrentProcessesPerQueue` Bug: T423429 --- app/Metrics/FailedQsBatches.php | 4 ++-- app/Metrics/PendingQsBatches.php | 4 ++-- app/Metrics/WikiEntityImports.php | 4 ++-- config/horizon-exporter.php | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/Metrics/FailedQsBatches.php b/app/Metrics/FailedQsBatches.php index f65f2149..0993d1a2 100644 --- a/app/Metrics/FailedQsBatches.php +++ b/app/Metrics/FailedQsBatches.php @@ -9,7 +9,7 @@ class FailedQsBatches implements Exporter { protected $gauge; - public function metrics(CollectorRegistry $collectorRegistry) { + public function metrics(CollectorRegistry $collectorRegistry): void { $this->gauge = $collectorRegistry->getOrRegisterGauge( config('horizon-exporter.namespace'), 'qs_batches_failed_batches', @@ -17,7 +17,7 @@ public function metrics(CollectorRegistry $collectorRegistry) { ); } - public function collect() { + public function collect(): void { $numBatches = QsBatch::has('wiki')->where([ 'failed' => 1, ])->count(); diff --git a/app/Metrics/PendingQsBatches.php b/app/Metrics/PendingQsBatches.php index 584ab32d..95407946 100644 --- a/app/Metrics/PendingQsBatches.php +++ b/app/Metrics/PendingQsBatches.php @@ -9,7 +9,7 @@ class PendingQsBatches implements Exporter { protected $gauge; - public function metrics(CollectorRegistry $collectorRegistry) { + public function metrics(CollectorRegistry $collectorRegistry): void { $this->gauge = $collectorRegistry->getOrRegisterGauge( config('horizon-exporter.namespace'), 'qs_batches_pending_batches', @@ -17,7 +17,7 @@ public function metrics(CollectorRegistry $collectorRegistry) { ); } - public function collect() { + public function collect(): void { $numBatches = QsBatch::has('wiki')->where([ 'done' => 0, 'failed' => 0, diff --git a/app/Metrics/WikiEntityImports.php b/app/Metrics/WikiEntityImports.php index 70d756e5..a2366aa1 100644 --- a/app/Metrics/WikiEntityImports.php +++ b/app/Metrics/WikiEntityImports.php @@ -10,7 +10,7 @@ class WikiEntityImports implements Exporter { protected $pending; - public function metrics(CollectorRegistry $collectorRegistry) { + public function metrics(CollectorRegistry $collectorRegistry): void { $this->pending = $collectorRegistry->getOrRegisterGauge( config('horizon-exporter.namespace'), 'wiki_entity_imports_pending', @@ -18,7 +18,7 @@ public function metrics(CollectorRegistry $collectorRegistry) { ); } - public function collect() { + public function collect(): void { // counters for failed / success are incremented in the HTTP controller $this->pending->set( WikiEntityImport::where(['status' => WikiEntityImportStatus::Pending])->count() diff --git a/config/horizon-exporter.php b/config/horizon-exporter.php index 2160436c..5c85ce87 100644 --- a/config/horizon-exporter.php +++ b/config/horizon-exporter.php @@ -4,7 +4,7 @@ use App\Metrics\PendingQsBatches; use App\Metrics\WikiEntityImports; use LKDevelopment\HorizonPrometheusExporter\Exporter\CurrentMasterSupervisors; -use LKDevelopment\HorizonPrometheusExporter\Exporter\CurrentProccesesPerQueue; +use LKDevelopment\HorizonPrometheusExporter\Exporter\CurrentProcessesPerQueue; use LKDevelopment\HorizonPrometheusExporter\Exporter\CurrentWorkload; use LKDevelopment\HorizonPrometheusExporter\Exporter\FailedJobsPerHour; use LKDevelopment\HorizonPrometheusExporter\Exporter\HorizonStatus;