Fixed Naming of cURL, PDO and Redis ActionWrappers

subzerobo · May 8, 2019 · 98f5c2a · 98f5c2a
1 parent 7e5739f
commit 98f5c2a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/src/ActionWrappers/APMGuzzleActionWrapper.php b/src/ActionWrappers/APMGuzzleActionWrapper.php
@@ -37,7 +37,7 @@ public function handleBefore($request, string $actionName, array $actionData = [
             $txName = $this->apmAgent->getCurrentTransactionName();
             $tx     = $this->apmAgent->getTransactionEvent($txName);
 
-            $this->span = $tx->startSpan("cURL" , self::SPAN_TYPE);
+            $this->span = $tx->startSpan("cURL:" . $actionName , self::SPAN_TYPE);
             $this->span->setSubType("http");
 
             $this->setData("url", $request->getUri()->__toString());

diff --git a/src/ActionWrappers/APMPdoActionWrapper.php b/src/ActionWrappers/APMPdoActionWrapper.php
@@ -36,7 +36,7 @@ public function handleBefore($stmt, string $actionName, array $actionData = [])
             $txName = $this->apmAgent->getCurrentTransactionName();
             $tx     = $this->apmAgent->getTransactionEvent($txName);
 
-            $spanName = "PDO Query : " . $stmt->getServerName();
+            $spanName = "PDO:" . $stmt->getServerName();
 
             $this->span = $tx->startSpan($spanName, self::SPAN_TYPE);
         }

diff --git a/src/ActionWrappers/APMRedisActionWrapper.php b/src/ActionWrappers/APMRedisActionWrapper.php
@@ -32,7 +32,7 @@ public function handleBefore($redisObject, string $actionName, array $actionData
             $txName = $this->apmAgent->getCurrentTransactionName();
             $tx     = $this->apmAgent->getTransactionEvent($txName);
 
-            $this->span = $tx->startSpan("Redis : " . $redisObject->getServerIdentifier(), self::SPAN_TYPE);
+            $this->span = $tx->startSpan("Redis:" . $redisObject->getServerIdentifier(), self::SPAN_TYPE);
         }
     }
 

diff --git a/src/Middlewares/GuzzleAPMMiddleware.php b/src/Middlewares/GuzzleAPMMiddleware.php
@@ -28,13 +28,15 @@ public function __invoke(callable $handler) {
         $apmActionWrapper = $this->actionWrapper;
 
         $before = function($request, $options) use ($apmActionWrapper) {
-            $apmActionWrapper->handleBefore($request,'cURL',[]);
+            $type = $options['type'] ?? "General";
+            $apmActionWrapper->handleBefore($request,$type,[]);
             //var_dump( "BTap " . microtime(true) );
         };
 
         $after = function($request,$option,$response) use ($apmActionWrapper) {
-            $response->then(function (\Psr\Http\Message\ResponseInterface $response) use($apmActionWrapper) {
-                $apmActionWrapper->handleAfter($response,'cURL',[]);
+            $type = $options['type'] ?? "General";
+            $response->then(function (\Psr\Http\Message\ResponseInterface $response) use($apmActionWrapper,$type) {
+                $apmActionWrapper->handleAfter($response,$type,[]);
             });
         };