v1.1.2

laokiea · Sep 30, 2020 · 53a2abb · 53a2abb
1 parent 8c01f16
commit 53a2abb
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/src/Base/EApmEventBase.php b/src/Base/EApmEventBase.php
@@ -135,6 +135,7 @@ class EApmEventBase
      *
      * EApmEventBase constructor.
      * @param EApmEventBase|null $parentEvent
+     * @throws \Exception
      */
     public function __construct(?EApmEventBase $parentEvent = null)
     {

diff --git a/src/EApmComposer.php b/src/EApmComposer.php
@@ -56,7 +56,7 @@ class EApmComposer
      * Agent version
      * @const
      */
-    public const AGENT_VERSION = "1.1.1";
+    public const AGENT_VERSION = "1.1.2";
 
     /**
      * Agent name
@@ -394,6 +394,7 @@ public function startNewTransaction(string $name, string $type)
      * @param EApmEventBase|null $parentEvent
      *
      * @return EApmTransaction
+     * @throws \Exception
      */
     public function createNewTransaction(string $name, string $type, ?EApmEventBase $parentEvent = null) : EApmTransaction
     {
@@ -404,9 +405,11 @@ public function createNewTransaction(string $name, string $type, ?EApmEventBase
             $transaction->setTraceId($this->getDistributeTrace()->getTraceId());
             $transaction->setParentId($this->getDistributeTrace()->getParentSpanId());
         } else {
-            $transaction->setTraceId(
-                EApmRandomIdUtil::RandomIdGenerate(EApmDistributeTrace::TRACEID_LENGTH / 2)
-            );
+            if (is_null($transaction->getTraceId())) {
+                $transaction->setTraceId(
+                    EApmRandomIdUtil::RandomIdGenerate(EApmDistributeTrace::TRACEID_LENGTH / 2)
+                );
+            }
         }
 
         return $transaction;

diff --git a/src/Events/EApmTransaction.php b/src/Events/EApmTransaction.php
@@ -85,9 +85,11 @@ public function __construct(string $name, string $type, ?EApmEventBase $parentEv
                     $this->getComposer()->getDistributeTrace()->getParentSpanId()
                 );
             } else {
-                $this->setTraceId(
-                    EApmRandomIdUtil::RandomIdGenerate(EApmDistributeTrace::TRACEID_LENGTH / 2)
-                );
+                if (is_null($this->getTraceId())) {
+                    $this->setTraceId(
+                        EApmRandomIdUtil::RandomIdGenerate(EApmDistributeTrace::TRACEID_LENGTH / 2)
+                    );
+                }
             }
         }
         // prepare result