Merge branch 'master' into 2.0.x

Author: anahan

src/Process/CliProcess.php

@@ -1,8 +1,13 @@
 <?php
-declare(strict_types=1);
+
+declare(strict_types = 1);
 
 namespace Jaeger\Process;
 
 class CliProcess extends AbstractProcess
 {
+    public function __construct(string $serviceName)
+    {
+        parent::__construct($serviceName, [new ProcessIpTag()]);
+    }
 }

src/Process/InternalServerProcess.php

@@ -3,6 +3,6 @@
 
 namespace Jaeger\Process;
 
-class InternalServerProcess extends AbstractProcess
+class InternalServerProcess extends CliProcess
 {
 }

src/Process/ProcessIpTag.php

@@ -1,14 +1,28 @@
 <?php
-declare(strict_types=1);
+
+declare(strict_types = 1);
 
 namespace Jaeger\Process;
 
 use Jaeger\Tag\StringTag;
 
 class ProcessIpTag extends StringTag
 {
+    private function getIp(): string
+    {
+        if (\array_key_exists('SERVER_ADDR', $_SERVER) && '' !== ($ip = (string)$_SERVER['SERVER_ADDR'])) {
+            return $ip;
+        }
+
+        if (false === $hostName = \gethostname()) {
+            return '127.0.0.1';
+        }
+
+        return \gethostbyname($hostName);
+    }
+
     public function __construct()
     {
-        parent::__construct('ip', $_SERVER['SERVER_ADDR']);
+        parent::__construct('ip', $this->getIp());
     }
 }