fix: matching will be strict

Author: cedricziel

src/Utils/Test/src/TraceStructureAssertionTrait.php

@@ -584,17 +584,12 @@ private function isConstraint($value): bool
     private function compareAttributes(array $expectedAttributes, array $actualAttributes, bool $strict, string $spanName): void
     {
         foreach ($expectedAttributes as $key => $expectedValue) {
-            // In strict mode, all attributes must be present and match
-            if ($strict) {
-                Assert::assertArrayHasKey(
-                    $key,
-                    $actualAttributes,
-                    sprintf('Attribute "%s" not found in span "%s"', $key, $spanName)
-                );
-            } elseif (!isset($actualAttributes[$key])) {
-                // In non-strict mode, if the attribute is not present, skip it
-                continue;
-            }
+            // Both in strict and non-strict mode, all expected attributes must be present
+            Assert::assertArrayHasKey(
+                $key,
+                $actualAttributes,
+                sprintf('Attribute "%s" not found in span "%s"', $key, $spanName)
+            );
 
             // Get the actual value
             $actualValue = $actualAttributes[$key];

src/Utils/Test/tests/Unit/TraceStructureAssertionTraitTest.php

@@ -204,6 +204,41 @@ public function test_assert_trace_structure_with_strict_matching(): void
         $this->assertTraceStructure($this->storage, $expectedStructureStrict, true);
     }
 
+    /**
+     * Test that assertTraceStructure fails when expected attributes don't exist in the actual span,
+     * even in non-strict mode.
+     */
+    public function test_assert_fails_with_nonexistent_attributes_in_nonstrict_mode(): void
+    {
+        $tracer = $this->tracerProvider->getTracer('test-tracer');
+
+        // Create a span with specific attributes
+        $span = $tracer->spanBuilder('test-span')
+            ->startSpan();
+
+        $span->setAttribute('attribute.one', 'value1');
+        $span->setAttribute('attribute.two', 42);
+
+        $span->end();
+
+        // Define expected structure with an attribute that doesn't exist in the actual span
+        $expectedStructure = [
+            [
+                'name' => 'test-span',
+                'attributes' => [
+                    'attribute.one' => 'value1',
+                    'nonexistent.attribute' => 'this-does-not-exist', // This attribute doesn't exist
+                ],
+            ],
+        ];
+
+        // Expect assertion to fail even in non-strict mode
+        $this->expectException(\PHPUnit\Framework\AssertionFailedError::class);
+        $this->expectExceptionMessage('No matching span found for expected span "test-span"');
+
+        $this->assertTraceStructure($this->storage, $expectedStructure, false);
+    }
+
     /**
      * Test asserting a trace structure with multiple root spans.
      */