Bug fixes and supporting WordPress native HTTP client

Author: JakubOleksy

ApplicationInsights/Channel/Contracts/Utils.php

@@ -67,4 +67,19 @@ public static function returnISOStringForTime($time = null)
             return gmdate('c', $time) . 'Z';
         }
     }
+    
+    /**
+     * Returns a Guid on all flavors of PHP. Copied from the PHP manual: http://php.net/manual/en/function.com-create-guid.php
+     * @return mixed
+     */
+    public static function returnGuid()
+    {
+        if (function_exists('com_create_guid') === true)
+        {
+            return trim(com_create_guid(), '{}');
+        }
+
+        return sprintf('%04X%04X-%04X-%04X-%04X-%04X%04X%04X', mt_rand(0, 65535), mt_rand(0, 65535), mt_rand(0, 65535), mt_rand(16384, 20479), mt_rand(32768, 49151), mt_rand(0, 65535), mt_rand(0, 65535), mt_rand(0, 65535));
+
+    }
 }

ApplicationInsights/Channel/Telemetry_Channel.php

@@ -148,14 +148,38 @@ public function send()
 
         $serializedTelemetryItem = $this->getSerializedQueue();
 
-        $client = new \GuzzleHttp\Client();
-    
-        $response = $client->post($this->_endpointUrl, [
-            'headers'         => ['Accept' => 'application/json', 
-                                    'Content-Type' => 'application/json; charset=utf-8'],
-            'body'            => utf8_encode($serializedTelemetryItem),
-            'verify'          => false /* If you want to verify, you can, but you will need to provide proper CA bundle. See http://guzzle.readthedocs.org/en/latest/clients.html#verify-option */
-            ,'proxy'           => '127.0.0.1:8888' /* For Fiddler debugging */
-        ]);
+        $headersArray = ['Accept' => 'application/json', 
+                         'Content-Type' => 'application/json; charset=utf-8'];
+        
+        if (array_key_exists('HTTP_USER_AGENT', $_SERVER) == true)
+        {
+            $headersArray['User-Agent'] = $_SERVER['HTTP_USER_AGENT'];
+        }
+        
+        $body = utf8_encode($serializedTelemetryItem);
+        
+        if (class_exists('\GuzzleHttp\Client') == true)
+        {
+            // Standard case if properly pulled in composer dependencies
+            
+            $client = new \GuzzleHttp\Client();
+            
+            $client->post($this->_endpointUrl, [
+                'headers'         => $headersArray,
+                'body'            => $body,
+                'verify'          => false /* If you want to verify, you can, but you will need to provide proper CA bundle. See http://guzzle.readthedocs.org/en/latest/clients.html#verify-option */
+                //,'proxy'           => '127.0.0.1:8888' /* For Fiddler debugging */
+            ]);
+        }
+        else if (function_exists('wp_remote_post'))
+        {
+            // Used in WordPress 
+            wp_remote_post($this->_endpointUrl, [
+               'method'     => 'POST',
+               'blocking'   => true,
+               'headers'    => $headersArray,
+               'body'       => $body
+            ]);
+        }
     }
 }

ApplicationInsights/Current_User.php

@@ -27,7 +27,7 @@ function __construct()
 
         if ($this->id == NULL)
         {
-            $this->id = trim(com_create_guid(), '{}');
+            $this->id = \ApplicationInsights\Channel\Contracts\Utils::returnGuid();
             $_COOKIE['ai_user'] = $this->id;
         }
     }

ApplicationInsights/Tests/Current_Session_Test.php

@@ -12,7 +12,7 @@ class Current_Session_Test extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->sessionId = trim(com_create_guid(), '{}');
+        $this->sessionId = \ApplicationInsights\Channel\Contracts\Utils::returnGuid();
         $this->sessionCreatedTime = time();
         $this->sessionLastRenewedTime = time() - 10000;
         Utils::setSessionCookie($this->sessionId, $this->sessionCreatedTime, $this->sessionLastRenewedTime);

ApplicationInsights/Tests/Current_User_Test.php

@@ -10,7 +10,7 @@ class Current_User_Test extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->userId = trim(com_create_guid(), '{}');
+        $this->userId = \ApplicationInsights\Channel\Contracts\Utils::returnGuid();
         Utils::setUserCookie($this->userId);
     }
 

ApplicationInsights/Tests/Utils.php

@@ -138,7 +138,7 @@ public static function throwNestedException($depth = 0)
      */
     public static function setUserCookie($userId = NULL)
     {
-        $_COOKIE['ai_user'] = $userId == NULL ? trim(com_create_guid(), '{}') : $userId;
+        $_COOKIE['ai_user'] = $userId == NULL ? \ApplicationInsights\Channel\Contracts\Utils::returnGuid() : $userId;
     }
 
     /**
@@ -154,7 +154,7 @@ public static function clearUserCookie()
      */
     public static function setSessionCookie($sessionId = NULL, $sessionCreatedDate = NULL, $lastRenewedDate = NULL)
     {
-        $sessionId =  $sessionId == NULL ? trim(com_create_guid(), '{}') : $sessionId;
+        $sessionId =  $sessionId == NULL ? \ApplicationInsights\Channel\Contracts\Utils::returnGuid() : $sessionId;
 
         $sessionCreatedDate == NULL ? $sessionCreatedDate = time() : $sessionCreatedDate;
         $lastRenewedDate == NULL ? $lastRenewedDate = time() : $lastRenewedDate;