Merge de505a6 into 05888a7

openzipkin · Sep 17, 2021 · 1ef730e · 1ef730e
2 parents 05888a7 + de505a6
commit 1ef730e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 19 deletions.
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/src/Zipkin/TracingBuilder.php b/src/Zipkin/TracingBuilder.php
@@ -13,7 +13,7 @@
 
 class TracingBuilder
 {
-    private ?string $localServiceName = null;
+    private string $localServiceName = 'unknown';
 
     private ?Endpoint $localEndpoint = null;
 
@@ -175,10 +175,7 @@ public function build(): Tracing
     {
         $localEndpoint = $this->localEndpoint;
         if ($this->localEndpoint === null) {
-            $localEndpoint = Endpoint::createFromGlobals();
-            if ($this->localServiceName !== null) {
-                $localEndpoint = $localEndpoint->withServiceName($this->localServiceName);
-            }
+            $localEndpoint = Endpoint::createFromGlobals()->withServiceName($this->localServiceName);
         }
 
         $reporter = $this->reporter ?? new Log(new NullLogger());