Merge f18d174 into 05888a7

openzipkin · Sep 13, 2021 · 7350690 · 7350690
2 parents 05888a7 + f18d174
commit 7350690
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 18 deletions.
diff --git a/src/Zipkin/Endpoint.php b/src/Zipkin/Endpoint.php
@@ -8,11 +8,13 @@
 
 final class Endpoint
 {
+    public const DEFAULT_SERVICE_NAME = 'unknown';
+
     /**
      * Service name in lowercase, such as "memcache" or "zipkin-web"
      * Conventionally, when the service name isn't known, service_name = "unknown".
      */
-    private string $serviceName;
+    private string $serviceName = self::DEFAULT_SERVICE_NAME;
 
     /**
      * Host address packed into 4 bytes.
@@ -72,7 +74,7 @@ public static function createFromGlobals(): self
 
     public static function createAsEmpty(): self
     {
-        return new self('', null, null, null);
+        return new self(self::DEFAULT_SERVICE_NAME, null, null, null);
     }
 
     public function getServiceName(): string

diff --git a/src/Zipkin/Reporters/Log/LogSerializer.php b/src/Zipkin/Reporters/Log/LogSerializer.php
@@ -22,37 +22,37 @@ public function serialize(array $spans): string
     private function serializeSpan(ReadbackSpan $span): string
     {
         $serialized = [];
-        $serialized[] = sprintf("Name: %s", $span->getName());
-        $serialized[] = sprintf("TraceID: %s", $span->getTraceId());
-        $serialized[] = sprintf("SpanID: %s", $span->getSpanId());
+        $serialized[] = sprintf('Name: %s', $span->getName());
+        $serialized[] = sprintf('TraceID: %s', $span->getTraceId());
+        $serialized[] = sprintf('SpanID: %s', $span->getSpanId());
         if (!is_null($parentID = $span->getParentId())) {
-            $serialized[] = sprintf("StartTime: %s", $parentID);
+            $serialized[] = sprintf('StartTime: %s', $parentID);
         }
-        $serialized[] = sprintf("Timestamp: %s", $span->getTimestamp());
-        $serialized[] = sprintf("Duration: %s", $span->getDuration());
-        $serialized[] = sprintf("Kind: %s", $span->getKind());
+        $serialized[] = sprintf('Timestamp: %s', $span->getTimestamp());
+        $serialized[] = sprintf('Duration: %s', $span->getDuration());
+        $serialized[] = sprintf('Kind: %s', $span->getKind());
 
-        $serialized[] = sprintf("LocalEndpoint: %s", $span->getLocalEndpoint()->getServiceName());
+        $serialized[] = sprintf('LocalEndpoint: %s', $span->getLocalEndpoint()->getServiceName());
 
         if (\count($tags = $span->getTags()) > 0) {
-            $serialized[] = "Tags:";
+            $serialized[] = 'Tags:';
 
             foreach ($tags as $key => $value) {
-                $serialized[] = sprintf("    %s: %s", $key, $value);
+                $serialized[] = sprintf('    %s: %s', $key, $value);
             }
         }
 
         if (\count($annotations = $span->getAnnotations()) > 0) {
-            $serialized[] = "Annotations:";
+            $serialized[] = 'Annotations:';
 
             foreach ($annotations as $annotation) {
-                $serialized[] = sprintf("    - timestamp: %s", $annotation["timestamp"]);
-                $serialized[] = sprintf("      value: %s", $annotation["value"]);
+                $serialized[] = sprintf('    - timestamp: %s', $annotation['timestamp']);
+                $serialized[] = sprintf('      value: %s', $annotation['value']);
             }
         }
 
         if (!is_null($remoteEndpoint = $span->getRemoteEndpoint())) {
-            $serialized[] = sprintf("RemoteEndpoint: %s", $remoteEndpoint->getServiceName());
+            $serialized[] = sprintf('RemoteEndpoint: %s', $remoteEndpoint->getServiceName());
         }
 
         return implode(PHP_EOL, $serialized);

diff --git a/tests/Unit/Reporters/HttpTest.php b/tests/Unit/Reporters/HttpTest.php
@@ -18,8 +18,8 @@ final class HttpTest extends TestCase
 {
     use ProphecyTrait;
 
-    const PAYLOAD = '[{"id":"%s","traceId":"%s",'
-        . '"timestamp":%d,"name":"test","localEndpoint":{"serviceName":""}}]';
+    private const PAYLOAD = '[{"id":"%s","traceId":"%s",'
+        . '"timestamp":%d,"name":"test","localEndpoint":{"serviceName":"unknown"}}]';
 
     public function testHttpReporterSuccess()
     {