fix: CI failures - PHPStan types, index lengths, test assertions for country/userAgent

- Remove stale 'type' key from addBatch() @param array shape in Usage.php, Adapter.php, Database.php
- Fix mixed-to-string cast in ClickHouse.php event column extraction with type-safe checks
- Reduce path size from 1024 to 255 and userAgent size from 512 to 255 in Metric::getEventSchema() to stay within MySQL 768-byte index limit
- Update MetricTest assertions: 11 attributes, 9 indexes, 7 EVENT_COLUMNS
- Update ClickHouseTest: userAgent/country are now event columns, not tags

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: lohanidamodar

src/Usage/Adapter.php

@@ -28,7 +28,7 @@ abstract public function setup(): void;
      * For events, path/method/status/resource/resourceId are extracted from tags
      * into dedicated columns; remaining tags stay in the tags JSON.
      *
-     * @param  array<array{metric: string, value: int, type: string, tags?: array<string,mixed>}>  $metrics
+     * @param  array<array{metric: string, value: int, tags?: array<string,mixed>}>  $metrics
      * @param  string  $type  Metric type: 'event' or 'gauge' — determines which table to write to
      * @param  int  $batchSize  Maximum number of metrics per INSERT statement
      */

src/Usage/Adapter/ClickHouse.php

@@ -1335,7 +1335,8 @@ public function addBatch(array $metrics, string $type = Usage::TYPE_EVENT, int $
                     $eventColumns = [];
                     foreach (Metric::EVENT_COLUMNS as $col) {
                         if (isset($tags[$col])) {
-                            $eventColumns[$col] = (string) $tags[$col];
+                            $tagValue = $tags[$col];
+                            $eventColumns[$col] = is_string($tagValue) ? $tagValue : (is_scalar($tagValue) ? (string) $tagValue : null);
                             unset($tags[$col]);
                         } else {
                             $eventColumns[$col] = null;

src/Usage/Adapter/Database.php

@@ -101,7 +101,7 @@ protected function getColumnDefinition(string $id, string $type = 'event'): stri
      * Database adapter uses a single collection for both types. The $type parameter
      * is stored as a field in each document for query-time differentiation.
      *
-     * @param array<array{metric: string, value: int, type?: string, tags?: array<string,mixed>}> $metrics
+     * @param array<array{metric: string, value: int, tags?: array<string,mixed>}> $metrics
      * @param string $type Metric type: 'event' or 'gauge'
      * @param int $batchSize
      * @return bool

src/Usage/Metric.php

@@ -430,7 +430,7 @@ public static function getEventSchema(): array
             [
                 '$id' => 'path',
                 'type' => 'string',
-                'size' => 1024,
+                'size' => 255,
                 'required' => false,
                 'signed' => true,
                 'array' => false,
@@ -484,7 +484,7 @@ public static function getEventSchema(): array
             [
                 '$id' => 'userAgent',
                 'type' => 'string',
-                'size' => 512,
+                'size' => 255,
                 'required' => false,
                 'signed' => true,
                 'array' => false,

src/Usage/Usage.php

@@ -26,7 +26,7 @@ class Usage
      * In-memory buffer for metrics.
      * Keyed by "{metric}:{type}" — events are summed, gauges use last-write-wins.
      *
-     * @var array<string, array{metric: string, value: int, type: string, tags: array<string,mixed>}>
+     * @var array<string, array{metric: string, value: int, type: string, tags: array<string, mixed>}>
      */
     private array $buffer = [];
 
@@ -84,7 +84,7 @@ public function setup(): void
     /**
      * Add metrics in batch (raw append).
      *
-     * @param array<array{metric: string, value: int, type: string, tags?: array<string,mixed>}> $metrics
+     * @param array<array{metric: string, value: int, tags?: array<string,mixed>}> $metrics
      * @param string $type Metric type: 'event' or 'gauge'
      * @param int $batchSize Maximum number of metrics per INSERT statement
      * @return bool

tests/Usage/Adapter/ClickHouseTest.php

@@ -224,8 +224,9 @@ public function testEventColumnsExtractedFromTags(): void
                     'status' => '201',
                     'resource' => 'bucket',
                     'resourceId' => 'bucket123',
-                    'region' => 'us-east',
+                    'country' => 'US',
                     'userAgent' => 'test-agent',
+                    'region' => 'us-east',
                 ],
             ],
         ];
@@ -245,16 +246,19 @@ public function testEventColumnsExtractedFromTags(): void
         $this->assertEquals('201', $metric->getStatus());
         $this->assertEquals('bucket', $metric->getResource());
         $this->assertEquals('bucket123', $metric->getResourceId());
+        $this->assertEquals('US', $metric->getCountry());
+        $this->assertEquals('test-agent', $metric->getUserAgent());
 
         // Remaining tags should only contain non-event fields
         $tags = $metric->getTags();
         $this->assertEquals('us-east', $tags['region'] ?? null);
-        $this->assertEquals('test-agent', $tags['userAgent'] ?? null);
         $this->assertArrayNotHasKey('path', $tags);
         $this->assertArrayNotHasKey('method', $tags);
         $this->assertArrayNotHasKey('status', $tags);
         $this->assertArrayNotHasKey('resource', $tags);
         $this->assertArrayNotHasKey('resourceId', $tags);
+        $this->assertArrayNotHasKey('country', $tags);
+        $this->assertArrayNotHasKey('userAgent', $tags);
     }
 
     /**

tests/Usage/MetricTest.php

@@ -15,7 +15,7 @@ public function testGetEventSchemaReturnsAttributeDefinitions(): void
         $schema = Metric::getEventSchema();
 
         $this->assertIsArray($schema);
-        $this->assertCount(9, $schema);
+        $this->assertCount(11, $schema);
 
         // Test metric attribute
         $metricAttr = $schema[0];
@@ -57,8 +57,18 @@ public function testGetEventSchemaReturnsAttributeDefinitions(): void
         $this->assertEquals('resourceId', $resourceIdAttr['$id']);
         $this->assertFalse($resourceIdAttr['required']);
 
+        // Test country attribute (optional)
+        $countryAttr = $schema[8];
+        $this->assertEquals('country', $countryAttr['$id']);
+        $this->assertFalse($countryAttr['required']);
+
+        // Test userAgent attribute (optional)
+        $userAgentAttr = $schema[9];
+        $this->assertEquals('userAgent', $userAgentAttr['$id']);
+        $this->assertFalse($userAgentAttr['required']);
+
         // Test tags attribute (optional)
-        $tagsAttr = $schema[8];
+        $tagsAttr = $schema[10];
         $this->assertEquals('tags', $tagsAttr['$id']);
         $this->assertEquals('string', $tagsAttr['type']);
         $this->assertFalse($tagsAttr['required']);
@@ -98,7 +108,7 @@ public function testGetEventIndexesReturnsIndexDefinitions(): void
         $indexes = Metric::getEventIndexes();
 
         $this->assertIsArray($indexes);
-        $this->assertCount(7, $indexes);
+        $this->assertCount(9, $indexes);
 
         // Test metric index
         $metricIndex = $indexes[0];
@@ -117,6 +127,8 @@ public function testGetEventIndexesReturnsIndexDefinitions(): void
         $this->assertEquals('index-status', $indexes[4]['$id']);
         $this->assertEquals('index-resource', $indexes[5]['$id']);
         $this->assertEquals('index-resourceId', $indexes[6]['$id']);
+        $this->assertEquals('index-country', $indexes[7]['$id']);
+        $this->assertEquals('index-userAgent', $indexes[8]['$id']);
     }
 
     /**
@@ -668,7 +680,7 @@ public function testToArrayReturnsArray(): void
      */
     public function testEventColumnsConstant(): void
     {
-        $expected = ['path', 'method', 'status', 'resource', 'resourceId'];
+        $expected = ['path', 'method', 'status', 'resource', 'resourceId', 'country', 'userAgent'];
         $this->assertEquals($expected, Metric::EVENT_COLUMNS);
     }
 }