Fixed unit test failing because digits only transaction IDs

Fixed unit test failing because digits only transaction IDs are compared as int (when a an array key) vs string
elastic · Sep 1, 2021 · b6e1b03 · b6e1b03
1 parent 0a3798f
commit b6e1b03
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 7 deletions.
diff --git a/tests/ElasticApmTests/UnitTests/DistributedTracingTest.php b/tests/ElasticApmTests/UnitTests/DistributedTracingTest.php
@@ -242,7 +242,7 @@ function (string $headerName, string $headerValue) use (&$senderDistTracingData)
         // Assert
 
         $expectedTxIds = [$senderTransaction->getId(), $receiverTransaction->getId()];
-        $actualTxIds = array_keys($this->mockEventSink->idToTransaction());
+        $actualTxIds = self::getIdsFromIdToMap($this->mockEventSink->idToTransaction());
         self::assertCount(2, $actualTxIds);
         self::assertEqualLists($expectedTxIds, $actualTxIds);
         $idToSpan = $this->mockEventSink->idToSpan();
@@ -367,13 +367,16 @@ function (string $headerName, string $headerValue) use (&$senderDistTracingData)
                 : (isset($senderTransaction) ? $senderTransaction->getId() : null);
 
             if (isset($senderTransaction)) {
-                self::assertEquals([$senderTransaction->getId()], array_keys($senderEventSink->idToTransaction()));
+                self::assertEquals(
+                    [$senderTransaction->getId()],
+                    self::getIdsFromIdToMap($senderEventSink->idToTransaction())
+                );
             } else {
                 self::assertEmpty($senderEventSink->idToTransaction());
             }
 
             if (isset($senderSpan)) {
-                self::assertEquals([$senderSpan->getId()], array_keys($senderEventSink->idToSpan()));
+                self::assertEquals([$senderSpan->getId()], self::getIdsFromIdToMap($senderEventSink->idToSpan()));
             } else {
                 self::assertEmpty($senderEventSink->idToSpan());
             }
@@ -388,7 +391,10 @@ function (string $headerName, string $headerValue) use (&$senderDistTracingData)
         }
 
         if ($isReceiverTracerEnabled) {
-            self::assertEquals([$receiverTransaction->getId()], array_keys($receiverEventSink->idToTransaction()));
+            self::assertEquals(
+                [$receiverTransaction->getId()],
+                self::getIdsFromIdToMap($receiverEventSink->idToTransaction())
+            );
             $receiverTxData = $receiverEventSink->idToTransaction()[$receiverTransaction->getId()];
             self::assertSame($expectedParentId, $receiverTxData->parentId);
         } else {
@@ -481,11 +487,14 @@ function (string $headerName, string $headerValue) use (&$distTracingDataB): voi
         self::assertEmpty($this->mockEventSink->idToSpan());
 
         $expectedSenderTxIds = [$senderTxA->getId(), $senderTxB->getId()];
-        self::assertEqualLists($expectedSenderTxIds, array_keys($senderEventSink->idToTransaction()));
+        self::assertEqualLists($expectedSenderTxIds, self::getIdsFromIdToMap($senderEventSink->idToTransaction()));
         $expectedSenderSpanIds = [$senderSpanA->getId(), $senderSpanB->getId()];
-        self::assertEqualLists($expectedSenderSpanIds, array_keys($senderEventSink->idToSpan()));
+        self::assertEqualLists($expectedSenderSpanIds, self::getIdsFromIdToMap($senderEventSink->idToSpan()));
         $expectedReceiverTxIds = [$receiverTxA->getId(), $receiverTxB->getId()];
-        self::assertEqualLists($expectedReceiverTxIds, array_keys($receiverEventSink->idToTransaction()));
+        self::assertEqualLists(
+            $expectedReceiverTxIds,
+            self::getIdsFromIdToMap($receiverEventSink->idToTransaction())
+        );
 
         $senderSpanAData = $senderEventSink->idToSpan()[$senderSpanA->getId()];
         $receiverTxAData = $receiverEventSink->idToTransaction()[$receiverTxA->getId()];

diff --git a/tests/ElasticApmTests/Util/TestCaseBase.php b/tests/ElasticApmTests/Util/TestCaseBase.php
@@ -529,6 +529,21 @@ public static function assertEqualLists(array $expected, array $actual): void
         self::assertEqualsCanonicalizing($expected, $actual);
     }
 
+    /**
+     * @param array<string|int, mixed> $idToXyzMap
+     *
+     * @return string[]
+     */
+    public static function getIdsFromIdToMap(array $idToXyzMap): array
+    {
+        /** @var string[] */
+        $result = [];
+        foreach ($idToXyzMap as $id => $_) {
+            $result[] = strval($id);
+        }
+        return $result;
+    }
+
     public static function buildTracerForTests(?EventSinkInterface $eventSink = null): TracerBuilderForTests
     {
         return TracerBuilderForTests::startNew()