Merge pull request #11 from JimChenWYU/support-ipv6

chore(): support ipv6
easyops-cn · Nov 14, 2022 · 2b0c2ec · 2b0c2ec
2 parents 62aad20 + 1bed752
commit 2b0c2ec
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 17 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 composer.phar
+composer.lock
 /.idea/
 /vendor/
 

diff --git a/src/EasyKin.php b/src/EasyKin.php
@@ -65,11 +65,11 @@ public static function app() {
 
     /**
      * @param string $serviceName
-     * @param string $ipv4
+     * @param string $ip
      * @param int $port
      */
-    public static function setEndpoint($serviceName, $ipv4, $port)
+    public static function setEndpoint($serviceName, $ip, $port)
     {
-        \easyops\easykin\core\Endpoint::init($serviceName, $ipv4, $port);
+        \easyops\easykin\core\Endpoint::init($serviceName, $ip, $port);
     }
 }
diff --git a/src/Tracer.php b/src/Tracer.php
@@ -89,13 +89,13 @@ public function getLogger()
     /**
      * @param string $name
      * @param string|null $serviceName
-     * @param string|null $ipv4
+     * @param string|null $ip
      * @param int|null $port
      * @return ClientSpan
      */
-    public function newSpan($name, $serviceName = null, $ipv4 = null, $port = null)
+    public function newSpan($name, $serviceName = null, $ip = null, $port = null)
     {
-        return $this->trace->newSpan($name, $serviceName, $ipv4, $port);
+        return $this->trace->newSpan($name, $serviceName, $ip, $port);
     }
 
     /**

diff --git a/src/core/ClientSpan.php b/src/core/ClientSpan.php
@@ -26,7 +26,6 @@
 
 namespace easyops\easykin\core;
 
-
 /**
  * Class ClientSpan
  * @package anyclouds\easykin
@@ -65,17 +64,19 @@ protected function valueOfEnd()
 
     /**
      * @param string $serviceName
-     * @param string $ipv4
+     * @param string $ip
      * @param int $port
      */
-    public function setSA($serviceName, $ipv4, $port)
+    public function setSA($serviceName, $ip, $port)
     {
+        $isIPv6 = filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6);
         $this->sa = [
             'key' => 'sa',
             'value' => true,
             'endpoint' => [
                 'serviceName' => $serviceName,
-                'ipv4' => $ipv4,
+                'ipv4' => !$isIPv6 ? $ip : null,
+                'ipv6' => $isIPv6 ? $ip : null,
                 'port' => $port
             ]
         ];

diff --git a/src/core/Endpoint.php b/src/core/Endpoint.php
@@ -26,6 +26,7 @@
 
 namespace easyops\easykin\core;
 
+use InvalidArgumentException;
 
 /**
  * Class Endpoint
@@ -45,14 +46,24 @@ private function __construct()
 
     /**
      * @param string $serviceName
-     * @param string $ipv4
+     * @param string $ip
      * @param int $port
      */
-    public static function init($serviceName, $ipv4, $port)
+    public static function init($serviceName, $ip, $port)
     {
+        $isIPv6 = filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6);
+        if (! $isIPv6) {
+            if (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4) === false) {
+                throw new InvalidArgumentException(
+                    sprintf('Invalid IPv4. Expected something in the range 0.0.0.0 and 255.255.255.255, got %s', $ip)
+                );
+            }
+        }
+
         static::$endpoint = [
             'serviceName' => $serviceName,
-            'ipv4' => $ipv4,
+            'ipv4' => !$isIPv6 ? $ip : null,
+            'ipv6' => $isIPv6 ? $ip : null,
             'port' => $port,
         ];
     }
@@ -63,7 +74,7 @@ public static function init($serviceName, $ipv4, $port)
     public static function toArray()
     {
         if (!isset(static::$endpoint['serviceName']) ||
-            !isset(static::$endpoint['ipv4']) ||
+            (!isset(static::$endpoint['ipv4']) && !isset(static::$endpoint['ipv6'])) ||
             !isset(static::$endpoint['port'])) {
             throw new \BadMethodCallException('Endpoint not initialized.');
         }

diff --git a/src/core/Trace.php b/src/core/Trace.php
@@ -61,14 +61,14 @@ public function __construct($name, $sampled = null, $traceId = null, $parentSpan
     /**
      * @param string $name
      * @param string|null $serviceName
-     * @param string|null $ipv4
+     * @param string|null $ip
      * @param int|null $port
      * @return ClientSpan
      */
-    public function newSpan($name, $serviceName = null, $ipv4 = null, $port = null)
+    public function newSpan($name, $serviceName = null, $ip = null, $port = null)
     {
         $span = new ClientSpan($name, $this->serverSpan->traceId, $this->serverSpan->id);
-        !is_null($serviceName) && !is_null($ipv4) && !is_null($port) && $span->setSA($serviceName, $ipv4, $port);
+        !is_null($serviceName) && !is_null($ip) && !is_null($port) && $span->setSA($serviceName, $ip, $port);
         $this->spans[] = $span;
         return $span;
     }