Laravel tests

.travis.yml

@@ -2,4 +2,4 @@ language: php
 php:
   - '7.0'
 install:
-  composer update
+  composer install --no-interaction

composer.json

@@ -10,17 +10,18 @@
             "email": "till@backha.us"
         }
     ],
-    "require": {
-        "jimdo/prometheus_client_php": "^0.7.0",
-        "illuminate/support": "^5.3"
-    },
     "autoload": {
         "psr-4": {
             "Tback\\PrometheusExporter\\": "src/"
         }
     },
+    "require": {
+        "jimdo/prometheus_client_php": "^0.7.0",
+        "illuminate/support": "^5.3"
+    },
     "require-dev": {
         "illuminate/http": "^5.3",
-        "phpunit/phpunit": "^5.6"
+        "phpunit/phpunit": "^5.6",
+        "orchestra/testbench": "~3.0"
     }
 }

src/LpeController.php

@@ -11,6 +11,20 @@
  */
 class LpeController extends Controller
 {
+    /**
+     * @var LpeManager
+     */
+    protected $lpeManager;
+    /**
+     * LpeController constructor.
+     *
+     * @param LpeManager $lpeManager
+     */
+    public function __construct(LpeManager $lpeManager)
+    {
+        $this->lpeManager = $lpeManager;
+    }
+
     /**
      * metric
      *
@@ -20,11 +34,9 @@ class LpeController extends Controller
      */
     public function metrics()
     {
-        $manager = app('LpeManager');
-
         $renderer = new RenderTextFormat();
 
-        return response($renderer->render($manager->getMetricFamilySamples()))
+        return response($renderer->render($this->lpeManager->getMetricFamilySamples()))
             ->header('Content-Type', $renderer::MIME_TYPE);
     }
 }

src/LpeServiceProvider.php

@@ -1,9 +1,6 @@
 <?php
 namespace Tback\PrometheusExporter;
 
-use Prometheus\CollectorRegistry;
-use Prometheus\Storage\APC;
-use Prometheus\Storage\Redis;
 use Illuminate\Support\ServiceProvider;
 
 /**
@@ -44,25 +41,19 @@ public function register()
             'prometheus_exporter'
         );
 
-        /**
-         * LpeManager
-         */
-        $this->app->singleton('LpeManager', function () {
-            switch (config('prometheus_exporter.adapter')) {
-                case 'apc':
-                    $adapter = new APC();
-                    break;
-                case 'redis':
-                    $adapter = new Redis(config('prometheus_exporter.redis'));
-                    break;
-                default:
-                    throw new \ErrorException('"prometheus_exporter.adapter" must be either apc or redis');
-            }
-
-            $registry = new CollectorRegistry($adapter);
 
-            return new LpeManager($registry);
-        });
+        switch (config('prometheus_exporter.adapter')) {
+            case 'apc':
+                $this->app->bind('Prometheus\Storage\Adapter', 'Prometheus\Storage\APC');
+                break;
+            case 'redis':
+                $this->app->bind('Prometheus\Storage\Adapter', function($app){
+                    return new \Prometheus\Storage\Redis(config('prometheus_exporter.redis'));
+                });
+                break;
+            default:
+                throw new \ErrorException('"prometheus_exporter.adapter" must be either apc or redis');
+        }
     }
 
     public function registerMetricsRoute()

src/Middleware/AbstractResponseTimeMiddleware.php

@@ -16,6 +16,21 @@ abstract class AbstractResponseTimeMiddleware
      */
     protected $request;
 
+    /**
+     * @var LpeManager
+     */
+    protected $lpeManager;
+
+    /**
+     * AbstractResponseTimeMiddleware constructor.
+     *
+     * @param LpeManager $lpeManager
+     */
+    public function __construct(LpeManager $lpeManager)
+    {
+        $this->lpeManager = $lpeManager;
+    }
+
     /**
      * Handle an incoming request.
      *
@@ -42,7 +57,7 @@ public function handle(Request $request, Closure $next)
         ];
 
         /** @var LpeManager $manager */
-        $manager = app('LpeManager');
+        $manager = $this->lpeManager;
 
         // requests total
         $manager->incCounter(

tests/Middleware/LaravelMiddlewareTest.php

@@ -0,0 +1,16 @@
+<?php
+
+
+use Prometheus\CollectorRegistry;
+
+class LaravelMiddlewareTest extends Orchestra\Testbench\TestCase
+{
+    public function testLaravelResponseTimeMiddleware()
+    {
+        $lpeManager = new \Tback\PrometheusExporter\LpeManager(new CollectorRegistry(new \Prometheus\Storage\InMemory()));
+        $middleware = new \Tback\PrometheusExporter\Middleware\LaravelResponseTimeMiddleware($lpeManager);
+        $middleware->handle(new \Illuminate\Http\Request(), function(){
+            return new \Illuminate\Http\Response();
+        });
+    }
+}