Merge remote-tracking branch 'origin/main' into dat-966

Author: ArnabChatterjee20k

composer.json

@@ -25,8 +25,7 @@
     },
     "require": {
         "php": ">=8.4",
-        "utopia-php/telemetry": "0.1.*",
-        "ext-swoole": "*"
+        "utopia-php/telemetry": "*"
     },
     "require-dev": {
         "phpunit/phpunit": "11.*",

composer.lock

@@ -58,7 +58,7 @@ class Pool
     private Gauge $telemetryPoolCapacity;
     private Histogram $telemetryWaitDuration;
     private Histogram $telemetryUseDuration;
-    /** @var array<string, int|string> */
+    /** @var array<non-empty-string, int|string> */
     private array $telemetryAttributes;
 
     /**

src/Pools/Pool.php

@@ -341,17 +341,29 @@ public function testPoolTelemetry(): void
             $this->assertEquals(5, $this->poolObject->count());
 
             $allocate(3, function () use ($telemetry): void {
-                $this->assertEquals([1, 2, 3], $telemetry->gauges['pool.connection.open.count']->values);
-                $this->assertEquals([1, 2, 3], $telemetry->gauges['pool.connection.active.count']->values);
-                $this->assertEquals([0, 0, 0], $telemetry->gauges['pool.connection.idle.count']->values);
+                /** @var object{values: array<int, float|int>} $openGauge */
+                $openGauge = $telemetry->gauges['pool.connection.open.count'];
+                /** @var object{values: array<int, float|int>} $activeGauge */
+                $activeGauge = $telemetry->gauges['pool.connection.active.count'];
+                /** @var object{values: array<int, float|int>} $idleGauge */
+                $idleGauge = $telemetry->gauges['pool.connection.idle.count'];
+                $this->assertEquals([1, 2, 3], $openGauge->values);
+                $this->assertEquals([1, 2, 3], $activeGauge->values);
+                $this->assertEquals([0, 0, 0], $idleGauge->values);
             });
 
             $this->assertEquals(5, $this->poolObject->count());
 
             $allocate(1, function () use ($telemetry): void {
-                $this->assertEquals([1, 2, 3, 3, 3, 3, 3], $telemetry->gauges['pool.connection.open.count']->values);
-                $this->assertEquals([1, 2, 3, 2, 1, 0, 1], $telemetry->gauges['pool.connection.active.count']->values);
-                $this->assertEquals([0, 0, 0, 1, 2, 3, 2], $telemetry->gauges['pool.connection.idle.count']->values);
+                /** @var object{values: array<int, float|int>} $openGauge */
+                $openGauge = $telemetry->gauges['pool.connection.open.count'];
+                /** @var object{values: array<int, float|int>} $activeGauge */
+                $activeGauge = $telemetry->gauges['pool.connection.active.count'];
+                /** @var object{values: array<int, float|int>} $idleGauge */
+                $idleGauge = $telemetry->gauges['pool.connection.idle.count'];
+                $this->assertEquals([1, 2, 3, 3, 3, 3, 3], $openGauge->values);
+                $this->assertEquals([1, 2, 3, 2, 1, 0, 1], $activeGauge->values);
+                $this->assertEquals([0, 0, 0, 1, 2, 3, 2], $idleGauge->values);
             });
         });
     }