type updates

Author: kyleferguson

src/Apm.php

@@ -10,8 +10,7 @@
 
 class Apm
 {
-    /** @var Transaction|null */
-    protected static $t;
+    protected static ?Transaction $t = null;
 
     /**
      * Remove the current transaction
@@ -107,7 +106,7 @@ public static function setStartTime(float $time)
     /**
      * Set end time for transaction. If a transaction has not started yet a new one will be created.
      *
-     * @param float $time Unix timestamp in milliseconds
+     * @param float|null $time Unix timestamp in milliseconds
      */
     public static function setEndTime(?float $time)
     {
@@ -169,10 +168,6 @@ public static function tags(): Tags
     public static function finish()
     {
         $t = static::transaction();
-        if (!$t) {
-            return;
-        }
-
         static::mergeTransactionMetadata($t);
 
         if ($t->endTime() === null) {

src/Apm/Transaction.php

@@ -16,44 +16,44 @@ class Transaction
     public const TYPE_REQUEST = 'request';
     public const TYPE_JOB = 'job';
 
-    /** @var string Unique ID for transaction */
-    protected $id;
+    /** Unique ID for transaction */
+    protected string $id;
 
-    /** @var string Type of transaction */
-    protected $type;
+    /** Type of transaction */
+    protected string $type;
 
-    /** @var string|null Name to identify transaction */
-    protected $name;
+    /** Name to identify transaction */
+    protected ?string $name = null;
 
-    /** @var int Start time as milliseconds since epoch */
-    protected $startTime;
+    /** Start time as milliseconds since epoch */
+    protected int $startTime;
 
-    /** @var int End time as milliseconds since epoch */
-    protected $endTime;
+    /** End time as milliseconds since epoch */
+    protected ?int $endTime = null;
 
-    /** @var int Duration as milliseconds */
-    protected $duration;
+    /** Duration as milliseconds */
+    protected ?int $duration = null;
 
-    /** @var Agent Meta information for transaction agent */
-    protected $agent;
+    /** Meta information for transaction agent */
+    protected Agent $agent;
 
-    /** @var Http Meta information for request transaction */
-    protected $http;
+    /** Meta information for request transaction */
+    protected ?Http $http = null;
 
-    /** @var Service Meta information for transaction service */
-    protected $service;
+    /** Meta information for transaction service */
+    protected ?Service $service = null;
 
-    /** @var System Meta information for transaction system */
-    protected $system;
+    /** Meta information for transaction system */
+    protected System $system;
 
-    /** @var Tags Custom meta tags */
-    protected $tags;
+    /** Custom meta tags */
+    protected ?Tags $tags = null;
 
-    /** @var User Meta information for transaction user */
-    protected $user;
+    /** Meta information for transaction user */
+    protected ?User $user = null;
 
     /** @var Span[] Spans that occur during transaction */
-    protected $spans;
+    protected array $spans;
 
     /**
      * Deserialize formatted properties array into Transaction object
@@ -66,13 +66,13 @@ public static function createFromArray(array $properties): Transaction
         $type = $trace['type'];
         $name = $trace['name'];
         $startTime = $trace['start_time'];
-        $endTime = isset($trace['end_time']) ? $trace['end_time'] : null;
-        $duration = isset($trace['duration']) ? $trace['duration'] : null;
+        $endTime = $trace['end_time'] ?? null;
+        $duration = $trace['duration'] ?? null;
 
         # service properties
         $service = $properties['service'];
-        $serviceName = isset($service['name']) ? $service['name'] : null;
-        $environment = isset($service['environment']) ? $service['environment'] : null;
+        $serviceName = $service['name'] ?? null;
+        $environment = $service['environment'] ?? null;
 
         # create transaction
         $transaction = new Transaction($id, $type, $name);
@@ -83,37 +83,37 @@ public static function createFromArray(array $properties): Transaction
         $transaction->service()->setEnvironment($environment);
 
         # agent properties
-        $agent = isset($properties['agent']) ? $properties['agent'] : [];
+        $agent = $properties['agent'] ?? [];
         if ($agent !== []) {
             $transaction->agent()->fillFromArray($agent);
         }
 
         # http properties
-        $http = isset($properties['http']) ? $properties['http'] : [];
+        $http = $properties['http'] ?? [];
         if ($http !== []) {
             $transaction->http()->fillFromArray($http);
         }
 
         # system properties
-        $system = isset($properties['system']) ? $properties['system'] : [];
+        $system = $properties['system'] ?? [];
         if ($system !== []) {
             $transaction->system()->fillFromArray($system);
         }
 
         # tags
-        $tags = isset($properties['tags']) ? $properties['tags'] : [];
+        $tags = $properties['tags'] ?? [];
         if ($tags !== []) {
             $transaction->tags()->replaceAll($tags);
         }
 
         # user properties
-        $user = isset($properties['user']) ? $properties['user'] : [];
+        $user = $properties['user'] ?? [];
         if ($user !== []) {
             $transaction->user()->fillFromArray($user);
         }
 
         # spans
-        $spans = isset($properties['spans']) ? $properties['spans'] : [];
+        $spans = $properties['spans'] ?? [];
         foreach ($spans as $spanProperties) {
             $span = Span::createFromArray($transaction, $spanProperties);
             $transaction->pushSpan($span);
@@ -255,21 +255,9 @@ public function finish(?int $at = null): Transaction
      */
     public function agent(): Agent
     {
-        if ($this->agent === null) {
-            $this->agent = new Agent();
-        }
-
         return $this->agent;
     }
 
-    /**
-     * Determine if agent information is present
-     */
-    public function hasAgent(): bool
-    {
-        return $this->agent !== null;
-    }
-
     /**
      * Service meta information
      */
@@ -315,21 +303,9 @@ public function hasHttp(): bool
      */
     public function system(): System
     {
-        if ($this->system === null) {
-            $this->system = new System();
-        }
-
         return $this->system;
     }
 
-    /**
-     * Determine if system information is present
-     */
-    public function hasSystem(): bool
-    {
-        return $this->system !== null;
-    }
-
     /**
      * Custom meta information
      */
@@ -423,7 +399,7 @@ public function newFilesystemSpan(string $name, ?string $parentSpanId = null): S
         return $this->newSpan($name, Span::TYPE_FILESYSTEM, $parentSpanId);
     }
 
-    public function serialize()
+    public function serialize(): array
     {
         $spanData = [];
         foreach ($this->spans() as $span) {
@@ -442,18 +418,14 @@ public function serialize()
             'spans' => $spanData,
         ];
 
-        if ($this->hasAgent()) {
-            $data['agent'] = $this->agent()->serialize();
-        }
+        $data['agent'] = $this->agent()->serialize();
+        $data['system'] = $this->system()->serialize();
         if ($this->hasHttp()) {
             $data['http'] = $this->http()->serialize();
         }
         if ($this->hasService()) {
             $data['service'] = $this->service()->serialize();
         }
-        if ($this->hasSystem()) {
-            $data['system'] = $this->system()->serialize();
-        }
         if ($this->hasTags()) {
             $data['tags'] = $this->tags()->serialize();
         }

src/Client.php

@@ -7,13 +7,13 @@ class Client
     public const LOGS_ENDPOINT = 'https://ingest.tail.dev/logs';
     public const APM_ENDPOINT = 'https://ingest.tail.dev/traces';
 
-    protected $token;
+    protected ?string $token = null;
 
-    protected $logSendHandlers = [];
+    protected array $logSendHandlers = [];
 
-    protected $apmSendHandlers = [];
+    protected array $apmSendHandlers = [];
 
-    public function __construct($token)
+    public function __construct(?string $token)
     {
         $this->token = $token;
         $this->registerDefaultLogSendHandler();
@@ -50,7 +50,7 @@ public function sendApm(array $transaction)
         }
     }
 
-    public function token()
+    public function token(): ?string
     {
         return $this->token;
     }

src/Laravel/Trackers/ArtisanTracker.php

@@ -7,11 +7,7 @@
 
 class ArtisanTracker implements Tracker
 {
-    /**
-     *
-     * @param Application $app
-     */
-    public function register($app)
+    public function register(Application $app)
     {
         if ($app->runningInConsole()) {
             $this->registerArtisan($app);

src/Laravel/Trackers/FrameworkBootTracker.php

@@ -8,13 +8,9 @@
 
 class FrameworkBootTracker implements Tracker
 {
-    /** @var Span */
-    protected $span;
+    protected ?Span $span = null;
 
-    /**
-     * @var Application $app
-     */
-    public function register($app)
+    public function register(Application $app)
     {
         $app->booting(function ($app) {
             $this->onStartBoot($app);
@@ -25,18 +21,12 @@ public function register($app)
         });
     }
 
-    /**
-     * @var Application $app
-     */
-    public function onStartBoot($app)
+    public function onStartBoot(Application $app)
     {
         $this->span = Apm::newSpan('Framework boot', 'framework');
     }
 
-    /**
-     * @var Application $app
-     */
-    public function onFinishBoot($app)
+    public function onFinishBoot(Application $app)
     {
         if (!$this->span) {
             return;
@@ -45,10 +35,7 @@ public function onFinishBoot($app)
         $this->span->finish();
     }
 
-    /**
-     * @return Span|null
-     */
-    public function getSpan()
+    public function getSpan(): ?Span
     {
         return $this->span;
     }

src/Laravel/Trackers/FrameworkStartupTracker.php

@@ -8,13 +8,9 @@
 
 class FrameworkStartupTracker implements Tracker
 {
-    /** @var Span */
-    protected $span;
+    protected ?Span $span = null;
 
-    /**
-     * @var Application $app
-     */
-    public function register($app)
+    public function register(Application $app)
     {
         $start = defined('LARAVEL_START') ? LARAVEL_START * 1000 : microtime(true) * 1000;
         $this->span = Apm::newSpan('Framework startup', 'framework')->setStartTime($start);
@@ -24,10 +20,7 @@ public function register($app)
         });
     }
 
-    /**
-     * @var Application $app
-     */
-    public function onStartBoot($app)
+    public function onStartBoot(Application $app)
     {
         if (!$this->span) {
             return;
@@ -36,10 +29,7 @@ public function onStartBoot($app)
         $this->span->finish();
     }
 
-    /**
-     * @return Span|null
-     */
-    public function getSpan()
+    public function getSpan(): ?Span
     {
         return $this->span;
     }

src/Laravel/Trackers/HttpTracker.php

@@ -12,10 +12,7 @@
 
 class HttpTracker implements Tracker
 {
-    /**
-     * @param Application $app
-     */
-    public function register($app)
+    public function register(Application $app)
     {
         $app['events']->listen(RequestHandled::class, [$this, 'requestHandled']);
     }