Include libraries and git_sha in metadata from ocramius/package-versions

scoutapp · Aug 21, 2019 · 831eb87 · 831eb87
1 parent 48ca1e1
commit 831eb87
Show file tree

Hide file tree

Showing 4 changed files with 89 additions and 65 deletions.
diff --git a/composer.json b/composer.json
@@ -9,6 +9,7 @@
         "php": ">=7.1.0,<7.5.0",
         "ext-json": "*",
         "ext-sockets": "*",
+        "ocramius/package-versions": "^1.4",
         "psr/log": "^1.1",
         "ralouphie/getallheaders": "2.0.5",
         "ramsey/uuid": "^3.7"

diff --git a/composer.lock b/composer.lock
diff --git a/src/Events/Metadata.php b/src/Events/Metadata.php
@@ -5,9 +5,13 @@
 namespace Scoutapm\Events;
 
 use DateTimeImmutable;
+use PackageVersions\Versions;
 use Scoutapm\Connector\Command;
 use Scoutapm\Helper\Timer;
 use const PHP_VERSION;
+use function array_keys;
+use function array_map;
+use function explode;
 use function gethostname;
 
 /**
@@ -28,7 +32,7 @@ public function __construct(DateTimeImmutable $now)
     }
 
     /**
-     * @return array<string, (string|array<int, string>|null)>
+     * @return array<string, (string|array<int, array<int, string>>|null)>
      */
     private function data() : array
     {
@@ -44,24 +48,35 @@ private function data() : array
             'database_engine' => '',
             'database_adapter' => '',
             'application_name' => '',
-            'libraries' => [],
+            'libraries' => $this->getLibraries(),
             'paas' => '',
             'application_root' => '',
             'scm_subdirectory' => '',
-            'git_sha' => '',
+            'git_sha' => $this->rootPackageGitSha(),
         ];
     }
 
+    private function rootPackageGitSha() : string
+    {
+        return explode('@', Versions::getVersion(Versions::ROOT_PACKAGE_NAME))[1];
+    }
+
     /**
-     * @return array<int, array<int, string>>
+     * Return an array of arrays: [["package name", "package version"], ....]
      *
-     * @TODO: Return an array of arrays: [["package name", "package version"], ....]
+     * @return array<int, array<int, string>>
      */
-//    private function getLibraries() : array
-//    {
-//         $composer = require __DIR__ . "/vendor/autoload.php";
-//        return [];
-//    }
+    private function getLibraries() : array
+    {
+        return array_map(
+            /** @return string[][]|array<int, string> */
+            static function (string $package, string $version) : array {
+                return [$package, $version];
+            },
+            array_keys(Versions::VERSIONS),
+            Versions::VERSIONS
+        );
+    }
 
     /**
      * Turn this object into a list of commands to send to the CoreAgent

diff --git a/tests/Unit/Events/MetadataTest.php b/tests/Unit/Events/MetadataTest.php
@@ -7,10 +7,14 @@
 use DateTimeImmutable;
 use DateTimeZone;
 use Exception;
+use PackageVersions\Versions;
 use PHPUnit\Framework\TestCase;
 use Scoutapm\Events\Metadata;
 use Scoutapm\Helper\Timer;
 use const PHP_VERSION;
+use function array_keys;
+use function array_map;
+use function explode;
 use function gethostname;
 use function json_decode;
 use function json_encode;
@@ -25,8 +29,6 @@ public function testMetadataSerializesToJson() : void
 
         $serialized = json_encode(new Metadata($time));
 
-        self::assertNotEmpty($serialized);
-
         self::assertEquals(
             [
                 'ApplicationEvent' => [
@@ -43,11 +45,17 @@ public function testMetadataSerializesToJson() : void
                         'database_engine' => '',
                         'database_adapter' => '',
                         'application_name' => '',
-                        'libraries' => [],
+                        'libraries' => array_map(
+                            static function ($package, $version) {
+                                return [$package, $version];
+                            },
+                            array_keys(Versions::VERSIONS),
+                            Versions::VERSIONS
+                        ),
                         'paas' => '',
                         'application_root' => '',
                         'scm_subdirectory' => '',
-                        'git_sha' => '',
+                        'git_sha' => explode('@', Versions::getVersion(Versions::ROOT_PACKAGE_NAME))[1],
                     ],
                     'event_type' => 'scout.metadata',
                     'source' => 'php',