fix: complete the expectations

Author: cedricziel

src/Instrumentation/Laravel/tests/Integration/LaravelInstrumentationTest.php

@@ -57,6 +57,22 @@ public function test_request_response(): void
                                     'http.response.status_code' => 200,
                                 ],
                                 'kind' => \OpenTelemetry\API\Trace\SpanKind::KIND_INTERNAL,
+                                'children' => [
+                                    [
+                                        'name' => 'HTTP GET',
+                                        'attributes' => [
+                                            'http.request.method' => 'GET',
+                                            'url.full' => 'https://opentelemetry.io/',
+                                            'url.path' => '/',
+                                            'url.scheme' => 'https',
+                                            'server.address' => 'opentelemetry.io',
+                                            'server.port' => '',
+                                            'http.response.status_code' => 200,
+                                            'http.response.body.size' => '21765'
+                                        ],
+                                        'kind' => \OpenTelemetry\API\Trace\SpanKind::KIND_CLIENT
+                                    ]
+                                ]
                             ],
                         ],
                     ],

src/Instrumentation/Laravel/tests/Integration/Middleware/MiddlewareTest.php

@@ -252,7 +252,7 @@ public function test_it_handles_middleware_groups(): void
 
         // Basic response checks
         $this->assertEquals(200, $response->status());
-        
+
         $this->assertTraceStructure([
             [
                 'name' => 'GET /middleware-group',
@@ -284,12 +284,32 @@ public function test_it_handles_middleware_groups(): void
                             [
                                 'name' => 'Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::handle',
                                 'attributes' => [
-                                    'code.function.name' => 'handle',
-                                    'code.namespace' => 'Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull',
                                     'laravel.middleware.class' => 'Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull',
                                     'http.response.status_code' => 200,
                                 ],
                                 'kind' => \OpenTelemetry\API\Trace\SpanKind::KIND_INTERNAL,
+                                'children' => [
+                                    [
+                                        'name' => 'Illuminate\Foundation\Http\Middleware\ValidatePostSize::handle',
+                                        'attributes' => [
+                                            'laravel.middleware.class' => 'Illuminate\Foundation\Http\Middleware\ValidatePostSize',
+                                            'http.response.status_code' => 200,
+                                        ],
+                                        'kind' => \OpenTelemetry\API\Trace\SpanKind::KIND_INTERNAL,
+                                        'children' => [
+                                            [
+                                                'name' => 'Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::handle',
+                                                'attributes' => [
+                                                    'code.function.name' => 'handle',
+                                                    'code.namespace' => 'Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull',
+                                                    'laravel.middleware.class' => 'Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull',
+                                                    'http.response.status_code' => 200,
+                                                ],
+                                                'kind' => \OpenTelemetry\API\Trace\SpanKind::KIND_INTERNAL,
+                                            ],
+                                        ],
+                                    ],
+                                ],
                             ],
                         ],
                     ],

src/Instrumentation/Laravel/tests/Integration/TestCase.php

@@ -301,6 +301,37 @@ protected function assertTraceStructure(array $expectedStructure, string $messag
         $actualStructure = $this->getTraceStructure();
         $spans = $this->getSpans();
 
+        // Helper function to count total spans in expected structure
+        $countExpectedSpans = function (array $structure) use (&$countExpectedSpans): int {
+            $count = 1; // Count current span
+            if (isset($structure['children'])) {
+                foreach ($structure['children'] as $child) {
+                    $count += $countExpectedSpans($child);
+                }
+            }
+            return $count;
+        };
+
+        // Count total expected spans
+        $totalExpectedSpans = 0;
+        foreach ($expectedStructure as $root) {
+            $totalExpectedSpans += $countExpectedSpans($root);
+        }
+
+        // Count actual spans
+        $totalActualSpans = count($spans);
+
+        // Verify total span count
+        $this->assertEquals(
+            $totalExpectedSpans,
+            $totalActualSpans,
+            $message ?: sprintf(
+                'Expected %d total spans, got %d',
+                $totalExpectedSpans,
+                $totalActualSpans
+            )
+        );
+
         // Helper function to recursively verify span structure
         $verifySpan = function (array $expected, ImmutableSpan $actual, array $actualStructure, string $message) use (&$verifySpan): void {
             // Verify span properties