v1.1.1

laokiea · Sep 30, 2020 · d1be98c · d1be98c
1 parent 7ad1308
commit d1be98c
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 6 deletions.
diff --git a/src/Base/EApmEventBase.php b/src/Base/EApmEventBase.php
@@ -712,4 +712,29 @@ public function getParentEventStat(string $spanId) : array
 
         return $parentEventStat;
     }
+
+    /**
+     * Clear registered events
+     * In Swoole framework, some variables do not clears automatically after request ended.
+     * So, related events in $registeredEvents should be cleared manually.
+     *
+     * @param string $transactionId
+     * @return void
+     */
+    public static function registeredEventsClear(string $transactionId) : void
+    {
+        if (isset(self::$registeredEvents[$transactionId])) {
+            $transactionEvent = self::$registeredEvents[$transactionId];
+            if ($transactionEvent["eventType"] !== EApmTransaction::EVENT_TYPE) {
+                return;
+            }
+
+            $traceId = $transactionEvent["traceId"];
+            foreach (self::$registeredEvents as $eventId => $event) {
+                if ($event["traceId"] === $traceId) {
+                    unset(self::$registeredEvents[$eventId]);
+                }
+            }
+        }
+    }
 }
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.0";
+    public const AGENT_VERSION = "1.1.1";
 
     /**
      * Agent name
@@ -323,11 +323,7 @@ public function setSampleRate(float $sampleRate) : void
      */
     public function getCurrentTransaction()
     {
-        return $this->currentTransaction
-            ?? $this->startNewTransaction(
-                $this->getDefaultTransactionName(),
-                self::DEFAULT_TRANSACTION_TYPE
-            );
+        return $this->currentTransaction;
     }
 
     /**
@@ -560,6 +556,10 @@ public function addEvent(EApmEventBase $event) : void
      */
     public function eventsPush() : void
     {
+        if (is_null($this->getCurrentTransaction())) {
+            return;
+        }
+
         if (is_null($this->getConfigure())) {
             $this->setConfigure(new EApmConfigure("", "", "eapm-php-project"));
         }

diff --git a/src/EApmEventIntake.php b/src/EApmEventIntake.php
@@ -274,6 +274,9 @@ public function eventPush() : bool
             return false;
         } finally {
             $this->eventsReset();
+            EApmEventBase::registeredEventsClear(
+                $this->getComposer()->getCurrentTransaction()->getId()
+            );
         }
 
         /*

diff --git a/src/Events/EApmMetadata.php b/src/Events/EApmMetadata.php
@@ -13,6 +13,7 @@
 
 namespace EApmPhp\Events;
 
+use EApmPhp\Base\EApmContainer;
 use EApmPhp\Base\EApmEventBase;
 use EApmPhp\EApmComposer;
 use EApmPhp\Util\EApmServiceUtil;
@@ -28,6 +29,19 @@ class EApmMetadata extends EApmEventBase implements \JsonSerializable
      */
     public const EVENT_TYPE = "metadata";
 
+    /**
+     * EApmMetadata constructor.
+     * @param EApmEventBase|null $parentEvent
+     */
+    public function __construct(?EApmEventBase $parentEvent = null)
+    {
+        $this->setComposer(EApmContainer::make("GAgent"));
+        if (!is_null($this->getComposer()->getCurrentTransaction())) {
+            $parentEvent = $this->getComposer()->getCurrentTransaction();
+        }
+        parent::__construct($parentEvent);
+    }
+
     /**
      * Json serialize transaction event object
      * @link https://www.elastic.co/guide/en/apm/server/master/metadata-api.html