Merge pull request #4 from chocofamilyme/fix.span_stop_timer

Исправил команду span, не правильно считался timer
chocofamilyme · Jul 7, 2021 · 6d552e7 · 6d552e7
2 parents 3001b5e + 7c25cf2
commit 6d552e7
Showing 1 changed file with 35 additions and 10 deletions.
diff --git a/src/Jaeger.php b/src/Jaeger.php
@@ -61,17 +61,15 @@ public function stop(string $operationName, array $tags = []): void
             return ;
         }
 
-        foreach ($this->spans as $index => $span) {
-            /** @var Span $span */
-            if (strcmp($span->getOperationName(), $operationName) === 0) {
-                foreach ($tags as $key => $value) {
-                    $span->setTag($key, $value);
-                }
-                $span->finish();
-                $this->spans->offsetUnset($index);
-
-                break;
+        $span = $this->spans->top();
+
+        /** @var Span $span */
+        if (strcmp($span->getOperationName(), $operationName) === 0) {
+            foreach ($tags as $key => $value) {
+                $span->setTag($key, $value);
             }
+            $span->finish();
+            $this->spans->pop();
         }
     }
 
@@ -154,4 +152,31 @@ private function startSpan(string $operationName, SpanContext $context = null):
 
         return $this->tracer->startSpan($operationName, $options);
     }
+
+    public function getTraceId(): ?string
+    {
+        if (false === $this->spans->isEmpty()) {
+            $spanParent = $this->spans->top();
+
+            if ($spanParent instanceof \Jaeger\Span) {
+                /** @psalm-suppress UndefinedInterfaceMethod */
+                return $spanParent->getContext()->traceIdLowToString();
+            }
+        }
+
+        return null;
+    }
+
+    public function getRootTraceId(): ?string
+    {
+        $serverSpan = $this->serverContext;
+
+        if ($serverSpan instanceof \Jaeger\SpanContext) {
+            return $serverSpan->traceIdLowToString();
+        }
+
+        return null;
+    }
+
+
 }