Change package name, root namespaces, README.md cleanup

zlodes · zlodes · commit c3472c333698 · 2023-06-11T20:36:37.000+04:00
diff --git a/.cspell.json b/.cspell.json
@@ -8,6 +8,7 @@
   "allowCompoundWords": true,
   "ignorePaths": [],
   "words": [
+    "zlodes",
     "unserialize",
     "unserialization",
     "schedulable"
diff --git a/README.md b/README.md
@@ -2,12 +2,7 @@
 
 [![codecov](https://codecov.io/gh/zlodes/php-prometheus-exporter-laravel/branch/master/graph/badge.svg?token=JYPUW0UYT5)](https://codecov.io/gh/zlodes/php-prometheus-exporter-laravel)
 
-This is a Laravel adapter/bridge package for [zlodes/prometheus-exporter](https://github.com/zlodes/php-prometheus-exporter).
-
-Now it still doesn't support Summary.
-
-> **Warning**
-> This package is still in development. Use it on your own risk until 1.0.0 release.
+This is a Laravel adapter/bridge package for [zlodes/prometheus-client](https://github.com/zlodes/php-prometheus-client).
 
 ## First steps
 
@@ -25,7 +20,7 @@ Example:
 
 ```php
 use Illuminate\Support\Facades\Route;
-use Zlodes\PrometheusExporter\Laravel\Http\MetricsExporterController;
+use Zlodes\PrometheusClient\Laravel\Http\MetricsExporterController;
 
 Route::get('/metrics', MetricsExporterController::class);
 ```
@@ -62,7 +57,7 @@ $this->callAfterResolving(Registry::class, static function (Registry $registry):
 You can work with your metrics whenever you want. Just use `Collector`: 
 
 ```php
-use Zlodes\PrometheusExporter\Collector\CollectorFactory;
+use Zlodes\PrometheusClient\Collector\CollectorFactory;
 
 class DummyController
 {
diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
-  "name": "zlodes/prometheus-exporter-laravel",
-  "description": "The Prometheus Metrics exporter adapter for Laravel Framework",
+  "name": "zlodes/prometheus-client-laravel",
+  "description": "The Prometheus Metrics client adapter for Laravel Framework",
   "license": "MIT",
   "type": "library",
   "authors": [
@@ -14,7 +14,7 @@
     "ext-redis": "*",
     "laravel/framework": "^9.0 || ^10.0",
     "webmozart/assert": "^1.11",
-    "zlodes/prometheus-exporter": "^0.8.0"
+    "zlodes/prometheus-exporter": "^0.9.1"
   },
   "require-dev": {
     "ergebnis/composer-normalize": "dev-main",
@@ -35,12 +35,12 @@
   "minimum-stability": "beta",
   "autoload": {
     "psr-4": {
-      "Zlodes\\PrometheusExporter\\Laravel\\": "src/"
+      "Zlodes\\PrometheusClient\\Laravel\\": "src/"
     }
   },
   "autoload-dev": {
     "psr-4": {
-      "Zlodes\\PrometheusExporter\\Laravel\\Tests\\": "tests/"
+      "Zlodes\\PrometheusClient\\Laravel\\Tests\\": "tests/"
     }
   },
   "config": {
diff --git a/config/prometheus-exporter.php b/config/prometheus-exporter.php
@@ -7,11 +7,11 @@
      * Here you can configure a Storage for metrics
      *
      * Available options:
-     * - \Zlodes\PrometheusExporter\Storage\InMemoryStorage::class
-     * - \Zlodes\PrometheusExporter\Laravel\Storage\RedisStorage::class
+     * - \Zlodes\PrometheusClient\Storage\InMemoryStorage::class
+     * - \Zlodes\PrometheusClient\Laravel\Storage\RedisStorage::class
      * - Your own storage implements Storage interface
      */
-    'storage' => \Zlodes\PrometheusExporter\Laravel\Storage\RedisStorage::class,
+    'storage' => \Zlodes\PrometheusClient\Laravel\Storage\RedisStorage::class,
 
     /**
      * Here you can specify a list of your SchedulableCollectors
diff --git a/src/Command/ClearMetrics.php b/src/Command/ClearMetrics.php
@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace Zlodes\PrometheusExporter\Laravel\Commands;
+namespace Zlodes\PrometheusClient\Laravel\Command;
 
 use Illuminate\Console\Command;
-use Zlodes\PrometheusExporter\Storage\Storage;
+use Zlodes\PrometheusClient\Storage\Storage;
 
 final class ClearMetrics extends Command
 {
diff --git a/src/Command/ListMetrics.php b/src/Command/ListMetrics.php
@@ -2,11 +2,11 @@
 
 declare(strict_types=1);
 
-namespace Zlodes\PrometheusExporter\Laravel\Commands;
+namespace Zlodes\PrometheusClient\Laravel\Command;
 
 use Illuminate\Console\Command;
 use JsonException;
-use Zlodes\PrometheusExporter\Registry\Registry;
+use Zlodes\PrometheusClient\Registry\Registry;
 
 final class ListMetrics extends Command
 {
diff --git a/src/Command/ScheduledCollect.php b/src/Command/ScheduledCollect.php
@@ -2,14 +2,14 @@
 
 declare(strict_types=1);
 
-namespace Zlodes\PrometheusExporter\Laravel\Commands;
+namespace Zlodes\PrometheusClient\Laravel\Command;
 
 use Exception;
 use Illuminate\Console\Command;
 use Illuminate\Contracts\Foundation\Application;
 use Psr\Log\LoggerInterface;
-use Zlodes\PrometheusExporter\Laravel\ScheduledCollector\SchedulableCollector;
-use Zlodes\PrometheusExporter\Laravel\ScheduledCollector\SchedulableCollectorRegistry;
+use Zlodes\PrometheusClient\Laravel\ScheduledCollector\SchedulableCollector;
+use Zlodes\PrometheusClient\Laravel\ScheduledCollector\SchedulableCollectorRegistry;
 
 final class ScheduledCollect extends Command
 {
diff --git a/src/Exception/CannotCollectScheduledMetrics.php b/src/Exception/CannotCollectScheduledMetrics.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Zlodes\PrometheusExporter\Laravel\Exceptions;
+namespace Zlodes\PrometheusClient\Laravel\Exception;
 
 use RuntimeException;
 
diff --git a/src/Http/MetricsExporterController.php b/src/Http/MetricsExporterController.php
@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace Zlodes\PrometheusExporter\Laravel\Http;
+namespace Zlodes\PrometheusClient\Laravel\Http;
 
 use Illuminate\Http\Response;
-use Zlodes\PrometheusExporter\Exporter\Exporter;
+use Zlodes\PrometheusClient\Exporter\Exporter;
 
 final class MetricsExporterController
 {
diff --git a/src/ScheduledCollector/SchedulableCollector.php b/src/ScheduledCollector/SchedulableCollector.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Zlodes\PrometheusExporter\Laravel\ScheduledCollector;
+namespace Zlodes\PrometheusClient\Laravel\ScheduledCollector;
 
-use Zlodes\PrometheusExporter\Laravel\Exceptions\CannotCollectScheduledMetrics;
+use Zlodes\PrometheusClient\Laravel\Exception\CannotCollectScheduledMetrics;
 
 interface SchedulableCollector
 {
diff --git a/src/ScheduledCollector/SchedulableCollectorArrayRegistry.php b/src/ScheduledCollector/SchedulableCollectorArrayRegistry.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Zlodes\PrometheusExporter\Laravel\ScheduledCollector;
+namespace Zlodes\PrometheusClient\Laravel\ScheduledCollector;
 
 use Webmozart\Assert\Assert;
 
diff --git a/src/ScheduledCollector/SchedulableCollectorRegistry.php b/src/ScheduledCollector/SchedulableCollectorRegistry.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Zlodes\PrometheusExporter\Laravel\ScheduledCollector;
+namespace Zlodes\PrometheusClient\Laravel\ScheduledCollector;
 
 interface SchedulableCollectorRegistry
 {
diff --git a/src/ServiceProvider.php b/src/ServiceProvider.php
@@ -2,26 +2,26 @@
 
 declare(strict_types=1);
 
-namespace Zlodes\PrometheusExporter\Laravel;
+namespace Zlodes\PrometheusClient\Laravel;
 
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Contracts\Config\Repository;
 use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Support\ServiceProvider as BaseServiceProvider;
 use Webmozart\Assert\Assert;
-use Zlodes\PrometheusExporter\Exporter\Exporter;
-use Zlodes\PrometheusExporter\Exporter\StoredMetricsExporter;
-use Zlodes\PrometheusExporter\KeySerialization\JsonSerializer;
-use Zlodes\PrometheusExporter\KeySerialization\Serializer;
-use Zlodes\PrometheusExporter\Laravel\Commands\ClearMetrics;
-use Zlodes\PrometheusExporter\Laravel\Commands\ListMetrics;
-use Zlodes\PrometheusExporter\Laravel\Commands\ScheduledCollect;
-use Zlodes\PrometheusExporter\Laravel\ScheduledCollector\SchedulableCollector;
-use Zlodes\PrometheusExporter\Laravel\ScheduledCollector\SchedulableCollectorArrayRegistry;
-use Zlodes\PrometheusExporter\Laravel\ScheduledCollector\SchedulableCollectorRegistry;
-use Zlodes\PrometheusExporter\Registry\ArrayRegistry;
-use Zlodes\PrometheusExporter\Registry\Registry;
-use Zlodes\PrometheusExporter\Storage\Storage;
+use Zlodes\PrometheusClient\Exporter\Exporter;
+use Zlodes\PrometheusClient\Exporter\StoredMetricsExporter;
+use Zlodes\PrometheusClient\KeySerialization\JsonSerializer;
+use Zlodes\PrometheusClient\KeySerialization\Serializer;
+use Zlodes\PrometheusClient\Laravel\Command\ClearMetrics;
+use Zlodes\PrometheusClient\Laravel\Command\ListMetrics;
+use Zlodes\PrometheusClient\Laravel\Command\ScheduledCollect;
+use Zlodes\PrometheusClient\Laravel\ScheduledCollector\SchedulableCollector;
+use Zlodes\PrometheusClient\Laravel\ScheduledCollector\SchedulableCollectorArrayRegistry;
+use Zlodes\PrometheusClient\Laravel\ScheduledCollector\SchedulableCollectorRegistry;
+use Zlodes\PrometheusClient\Registry\ArrayRegistry;
+use Zlodes\PrometheusClient\Registry\Registry;
+use Zlodes\PrometheusClient\Storage\Storage;
 
 final class ServiceProvider extends BaseServiceProvider
 {
diff --git a/src/Storage/RedisStorage.php b/src/Storage/RedisStorage.php
@@ -2,20 +2,20 @@
 
 declare(strict_types=1);
 
-namespace Zlodes\PrometheusExporter\Laravel\Storage;
+namespace Zlodes\PrometheusClient\Laravel\Storage;
 
 use Exception;
 use Generator;
 use Illuminate\Contracts\Redis\Connection;
-use Zlodes\PrometheusExporter\Exceptions\MetricKeySerializationException;
-use Zlodes\PrometheusExporter\Exceptions\MetricKeyUnserializationException;
-use Zlodes\PrometheusExporter\Exceptions\StorageReadException;
-use Zlodes\PrometheusExporter\Exceptions\StorageWriteException;
-use Zlodes\PrometheusExporter\KeySerialization\JsonSerializer;
-use Zlodes\PrometheusExporter\KeySerialization\Serializer;
-use Zlodes\PrometheusExporter\Storage\DTO\MetricNameWithLabels;
-use Zlodes\PrometheusExporter\Storage\DTO\MetricValue;
-use Zlodes\PrometheusExporter\Storage\Storage;
+use Zlodes\PrometheusClient\Exceptions\MetricKeySerializationException;
+use Zlodes\PrometheusClient\Exceptions\MetricKeyUnserializationException;
+use Zlodes\PrometheusClient\Exceptions\StorageReadException;
+use Zlodes\PrometheusClient\Exceptions\StorageWriteException;
+use Zlodes\PrometheusClient\KeySerialization\JsonSerializer;
+use Zlodes\PrometheusClient\KeySerialization\Serializer;
+use Zlodes\PrometheusClient\Storage\DTO\MetricNameWithLabels;
+use Zlodes\PrometheusClient\Storage\DTO\MetricValue;
+use Zlodes\PrometheusClient\Storage\Storage;
 
 final class RedisStorage implements Storage
 {
diff --git a/tests/Commands/ClearMetricsTest.php b/tests/Commands/ClearMetricsTest.php
@@ -2,12 +2,12 @@
 
 declare(strict_types=1);
 
-namespace Zlodes\PrometheusExporter\Laravel\Tests\Commands;
+namespace Zlodes\PrometheusClient\Laravel\Tests\Commands;
 
 use Mockery;
 use Orchestra\Testbench\TestCase;
-use Zlodes\PrometheusExporter\Laravel\ServiceProvider;
-use Zlodes\PrometheusExporter\Storage\Storage;
+use Zlodes\PrometheusClient\Laravel\ServiceProvider;
+use Zlodes\PrometheusClient\Storage\Storage;
 
 class ClearMetricsTest extends TestCase
 {
diff --git a/tests/Commands/ListMetricsTest.php b/tests/Commands/ListMetricsTest.php
@@ -2,14 +2,14 @@
 
 declare(strict_types=1);
 
-namespace Zlodes\PrometheusExporter\Laravel\Tests\Commands;
+namespace Zlodes\PrometheusClient\Laravel\Tests\Commands;
 
 use Generator;
 use Mockery;
 use Orchestra\Testbench\TestCase;
-use Zlodes\PrometheusExporter\Laravel\ServiceProvider;
-use Zlodes\PrometheusExporter\MetricTypes\Counter;
-use Zlodes\PrometheusExporter\Registry\Registry;
+use Zlodes\PrometheusClient\Laravel\ServiceProvider;
+use Zlodes\PrometheusClient\MetricTypes\Counter;
+use Zlodes\PrometheusClient\Registry\Registry;
 
 class ListMetricsTest extends TestCase
 {
diff --git a/tests/Commands/ScheduledCollectTest.php b/tests/Commands/ScheduledCollectTest.php
@@ -2,15 +2,15 @@
 
 declare(strict_types=1);
 
-namespace Zlodes\PrometheusExporter\Laravel\Tests\Commands;
+namespace Zlodes\PrometheusClient\Laravel\Tests\Commands;
 
 use Mockery;
 use Orchestra\Testbench\TestCase;
 use Psr\Log\LoggerInterface;
-use Zlodes\PrometheusExporter\Collector\Collector;
-use Zlodes\PrometheusExporter\Laravel\ScheduledCollector\SchedulableCollectorRegistry;
-use Zlodes\PrometheusExporter\Laravel\ServiceProvider;
-use Zlodes\PrometheusExporter\Laravel\Tests\Dummy\DummySchedulableCollector;
+use Zlodes\PrometheusClient\Collector\Collector;
+use Zlodes\PrometheusClient\Laravel\ScheduledCollector\SchedulableCollectorRegistry;
+use Zlodes\PrometheusClient\Laravel\ServiceProvider;
+use Zlodes\PrometheusClient\Laravel\Tests\Dummy\DummySchedulableCollector;
 
 class ScheduledCollectTest extends TestCase
 {
diff --git a/tests/Dummy/DummySchedulableCollector.php b/tests/Dummy/DummySchedulableCollector.php
@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace Zlodes\PrometheusExporter\Laravel\Tests\Dummy;
+namespace Zlodes\PrometheusClient\Laravel\Tests\Dummy;
 
-use Zlodes\PrometheusExporter\Collector\Collector;
-use Zlodes\PrometheusExporter\Laravel\ScheduledCollector\SchedulableCollector;
+use Zlodes\PrometheusClient\Collector\Collector;
+use Zlodes\PrometheusClient\Laravel\ScheduledCollector\SchedulableCollector;
 
 final class DummySchedulableCollector implements SchedulableCollector
 {
diff --git a/tests/Http/MetricsExporterControllerTest.php b/tests/Http/MetricsExporterControllerTest.php
@@ -2,15 +2,15 @@
 
 declare(strict_types=1);
 
-namespace Zlodes\PrometheusExporter\Laravel\Tests\Http;
+namespace Zlodes\PrometheusClient\Laravel\Tests\Http;
 
 use Generator;
 use Illuminate\Support\Facades\Route;
 use Mockery;
 use Orchestra\Testbench\TestCase;
-use Zlodes\PrometheusExporter\Exporter\Exporter;
-use Zlodes\PrometheusExporter\Laravel\Http\MetricsExporterController;
-use Zlodes\PrometheusExporter\Laravel\ServiceProvider;
+use Zlodes\PrometheusClient\Exporter\Exporter;
+use Zlodes\PrometheusClient\Laravel\Http\MetricsExporterController;
+use Zlodes\PrometheusClient\Laravel\ServiceProvider;
 
 class MetricsExporterControllerTest extends TestCase
 {
diff --git a/tests/ScheduledCollector/SchedulableCollectorArrayRegistryTest.php b/tests/ScheduledCollector/SchedulableCollectorArrayRegistryTest.php
@@ -2,12 +2,12 @@
 
 declare(strict_types=1);
 
-namespace Zlodes\PrometheusExporter\Laravel\Tests\ScheduledCollector;
+namespace Zlodes\PrometheusClient\Laravel\Tests\ScheduledCollector;
 
 use InvalidArgumentException;
-use Zlodes\PrometheusExporter\Laravel\ScheduledCollector\SchedulableCollectorArrayRegistry;
+use Zlodes\PrometheusClient\Laravel\ScheduledCollector\SchedulableCollectorArrayRegistry;
 use PHPUnit\Framework\TestCase;
-use Zlodes\PrometheusExporter\Laravel\Tests\Dummy\DummySchedulableCollector;
+use Zlodes\PrometheusClient\Laravel\Tests\Dummy\DummySchedulableCollector;
 
 class SchedulableCollectorArrayRegistryTest extends TestCase
 {
diff --git a/tests/ScheduledCollector/SchedulableCollectorsProvidedByConfigTest.php b/tests/ScheduledCollector/SchedulableCollectorsProvidedByConfigTest.php
@@ -2,14 +2,14 @@
 
 declare(strict_types=1);
 
-namespace Zlodes\PrometheusExporter\Laravel\Tests\ScheduledCollector;
+namespace Zlodes\PrometheusClient\Laravel\Tests\ScheduledCollector;
 
 use Illuminate\Database\Eloquent\Model;
 use InvalidArgumentException;
 use Orchestra\Testbench\TestCase;
-use Zlodes\PrometheusExporter\Laravel\ScheduledCollector\SchedulableCollectorRegistry;
-use Zlodes\PrometheusExporter\Laravel\ServiceProvider;
-use Zlodes\PrometheusExporter\Laravel\Tests\Dummy\DummySchedulableCollector;
+use Zlodes\PrometheusClient\Laravel\ScheduledCollector\SchedulableCollectorRegistry;
+use Zlodes\PrometheusClient\Laravel\ServiceProvider;
+use Zlodes\PrometheusClient\Laravel\Tests\Dummy\DummySchedulableCollector;
 
 final class SchedulableCollectorsProvidedByConfigTest extends TestCase
 {
diff --git a/tests/ServiceProviderTest.php b/tests/ServiceProviderTest.php
diff --git a/tests/Storage/RedisStorageTest.php b/tests/Storage/RedisStorageTest.php

Original file line number	Diff line number	Diff line change
`@@ -2,10 +2,10 @@`
`2`	`2`
`3`	`3`	`declare(strict_types=1);`
`4`	`4`
`5`		`-namespace Zlodes\PrometheusExporter\Laravel\Commands;`
	`5`	`+namespace Zlodes\PrometheusClient\Laravel\Command;`
`6`	`6`
`7`	`7`	`use Illuminate\Console\Command;`
`8`		`-use Zlodes\PrometheusExporter\Storage\Storage;`
	`8`	`+use Zlodes\PrometheusClient\Storage\Storage;`
`9`	`9`
`10`	`10`	`final class ClearMetrics extends Command`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,9 @@`
`2`	`2`
`3`	`3`	`declare(strict_types=1);`
`4`	`4`
`5`		`-namespace Zlodes\PrometheusExporter\Laravel\ScheduledCollector;`
	`5`	`+namespace Zlodes\PrometheusClient\Laravel\ScheduledCollector;`
`6`	`6`
`7`		`-use Zlodes\PrometheusExporter\Laravel\Exceptions\CannotCollectScheduledMetrics;`
	`7`	`+use Zlodes\PrometheusClient\Laravel\Exception\CannotCollectScheduledMetrics;`
`8`	`8`
`9`	`9`	`interface SchedulableCollector`
`10`	`10`	`{`