ctor injection AppMetrics (#121)

Author: mvhirsch

DependencyInjection/Compiler/MetricInfoResolverCompilerPass.php

@@ -32,7 +32,7 @@ public function process(ContainerBuilder $container): void
         }
 
         foreach ($taggedServices as $id => $tags) {
-            $definition->addMethodCall('setMetricInfoResolver', [new Reference($id)]);
+            $definition->addArgument(new Reference($id));
         }
     }
 }

Metrics/AppMetrics.php

@@ -23,17 +23,8 @@ class AppMetrics implements PreRequestMetricsCollectorInterface, RequestMetricsC
 
     private float $startedAt = 0;
 
-    private ?MetricInfoResolverInterface $metricInfoResolver = null;
-    private ?LabelResolver $labelResolver = null;
-
-    public function setMetricInfoResolver(MetricInfoResolverInterface $metricInfoResolver): void
-    {
-        $this->metricInfoResolver = $metricInfoResolver;
-    }
-
-    public function setLabelResolver(LabelResolver $labelResolver): void
+    public function __construct(private readonly LabelResolver $labelResolver, private readonly ?MetricInfoResolverInterface $metricInfoResolver = null)
     {
-        $this->labelResolver = $labelResolver;
     }
 
     public function collectRequest(RequestEvent $event): void

Resources/config/services.xml

@@ -35,11 +35,9 @@
     </service>
 
     <service id="Artprima\PrometheusMetricsBundle\Metrics\AppMetrics" class="Artprima\PrometheusMetricsBundle\Metrics\AppMetrics" public="false" autowire="false" autoconfigure="false">
+        <argument type="service" id="Artprima\PrometheusMetricsBundle\Metrics\LabelResolver" />
         <tag name="prometheus_metrics_bundle.metrics_collector" />
         <tag name="prometheus_metrics_bundle.default_metrics" />
-        <call method="setLabelResolver">
-            <argument type="service" id="Artprima\PrometheusMetricsBundle\Metrics\LabelResolver" />
-        </call>
     </service>
 
     <service id="Artprima\PrometheusMetricsBundle\Metrics\MetricsCollectorRegistry" class="Artprima\PrometheusMetricsBundle\Metrics\MetricsCollectorRegistry" public="false" autowire="false" autoconfigure="false">

Tests/Metrics/AppMetricsTest.php

@@ -36,9 +36,8 @@ public function setUp(): void
 
     public function testCollectRequest(): void
     {
-        $metrics = new AppMetrics();
+        $metrics = new AppMetrics($this->labelResolver);
         $metrics->init($this->namespace, $this->collectionRegistry);
-        $metrics->setLabelResolver($this->labelResolver);
 
         $request = new Request([], [], ['_route' => 'test_route'], [], [], ['REQUEST_METHOD' => 'GET']);
         $evt = $this->createMock(RequestEvent::class);
@@ -56,9 +55,8 @@ public function testCollectRequest(): void
 
     public function testCollectRequestOptionsMethod(): void
     {
-        $metrics = new AppMetrics();
+        $metrics = new AppMetrics($this->labelResolver);
         $metrics->init($this->namespace, $this->collectionRegistry);
-        $metrics->setLabelResolver($this->labelResolver);
 
         $request = new Request([], [], ['_route' => 'test_route'], [], [], ['REQUEST_METHOD' => 'OPTIONS']);
         $evt = $this->createMock(RequestEvent::class);
@@ -92,9 +90,8 @@ public static function provideMetricsName(): array
      */
     public function testCollectResponse(int $code, string $metricsName): void
     {
-        $metrics = new AppMetrics();
+        $metrics = new AppMetrics($this->labelResolver);
         $metrics->init($this->namespace, $this->collectionRegistry);
-        $metrics->setLabelResolver($this->labelResolver);
 
         $request = new Request([], [], ['_route' => 'test_route'], [], [], ['REQUEST_METHOD' => 'GET']);
         $response = new Response('', $code);
@@ -116,9 +113,8 @@ public function testSetRequestDuration(): void
     {
         self::registerMicrotimeMock('Artprima\PrometheusMetricsBundle\Metrics');
 
-        $metrics = new AppMetrics();
+        $metrics = new AppMetrics($this->labelResolver);
         $metrics->init($this->namespace, $this->collectionRegistry);
-        $metrics->setLabelResolver($this->labelResolver);
 
         $request = new Request([], [], ['_route' => 'test_route'], [], [], ['REQUEST_METHOD' => 'GET']);
         $reqEvt = $this->createMock(RequestEvent::class);
@@ -159,10 +155,8 @@ public function testSetRequestDuration(): void
 
     public function testUseMetricInfoResolver(): void
     {
-        $metrics = new AppMetrics();
+        $metrics = new AppMetrics($this->labelResolver, new DummyMetricInfoResolver());
         $metrics->init($this->namespace, $this->collectionRegistry);
-        $metrics->setLabelResolver($this->labelResolver);
-        $metrics->setMetricInfoResolver(new DummyMetricInfoResolver());
 
         $request = new Request([], [], ['_route' => 'test_route'], [], [], ['REQUEST_METHOD' => 'GET', 'REQUEST_URI' => 'https://example.com/test?query=1']);
         $reqEvt = $this->createMock(RequestEvent::class);
@@ -186,14 +180,13 @@ public function testUseMetricInfoResolver(): void
 
     public function testUseMetricInfoResolverWithLabels(): void
     {
-        $metrics = new AppMetrics();
-        $metrics->init($this->namespace, $this->collectionRegistry);
-        $metrics->setMetricInfoResolver(new DummyMetricInfoResolver());
         $labels = [
             new LabelConfig('color', LabelConfig::REQUEST_ATTRIBUTE, 'color'),
             new LabelConfig('client_name', LabelConfig::REQUEST_HEADER, 'X-Client-Name'),
         ];
-        $metrics->setLabelResolver(new LabelResolver($labels));
+
+        $metrics = new AppMetrics(new LabelResolver($labels), new DummyMetricInfoResolver());
+        $metrics->init($this->namespace, $this->collectionRegistry);
 
         $request = new Request([], [], ['_route' => 'test_route'], [], [], ['REQUEST_METHOD' => 'GET', 'REQUEST_URI' => 'https://example.com/test?query=1']);
 

Tests/Metrics/RendererTest.php

@@ -5,6 +5,7 @@
 namespace Tests\Artprima\PrometheusMetricsBundle\Metrics;
 
 use Artprima\PrometheusMetricsBundle\Metrics\AppMetrics;
+use Artprima\PrometheusMetricsBundle\Metrics\LabelResolver;
 use Artprima\PrometheusMetricsBundle\Metrics\Renderer;
 use PHPUnit\Framework\TestCase;
 use Prometheus\CollectorRegistry;
@@ -29,7 +30,7 @@ public function testRender(): void
             ->willReturn([
                 new MetricFamilySamples(self::$samples),
             ]);
-        $metrics = new AppMetrics();
+        $metrics = new AppMetrics(new LabelResolver());
         $metrics->init('test_ns', $collectionRegistry);
         $renderer = new Renderer($collectionRegistry);
         $response = $renderer->render();
@@ -45,7 +46,7 @@ public function testRenderResponse(): void
             ->willReturn([
                 new MetricFamilySamples(self::$samples),
             ]);
-        $metrics = new AppMetrics();
+        $metrics = new AppMetrics(new LabelResolver());
         $metrics->init('test_ns', $collectionRegistry);
         $renderer = new Renderer($collectionRegistry);
         $response = $renderer->renderResponse();

demo/test-metrics.php

@@ -21,13 +21,12 @@
 $registry = new CollectorRegistry($storage);
 $renderer = new Renderer($registry, 'symfony');
 
+$labelResolver = new LabelResolver([]);
+
 // Initialize AppMetrics
-$appMetrics = new AppMetrics();
+$appMetrics = new AppMetrics($labelResolver);
 $appMetrics->init('symfony', $registry);
 
-$labelResolver = new LabelResolver([]);
-$appMetrics->setLabelResolver($labelResolver);
-
 echo "✅ Metrics system initialized\n";
 
 // Simulate some requests