Bug fixes, client ip context and PHP 5.3 support

JakubOleksy · JakubOleksy · commit 1922ef787eea · 2015-01-14T00:21:06.000-08:00
diff --git a/ApplicationInsights/Channel/Contracts/Application.php b/ApplicationInsights/Channel/Contracts/Application.php
@@ -4,7 +4,7 @@
 /**
 * Data contract class for type Application. 
 */
-class Application implements \JsonSerializable 
+class Application
 {
     /**
     * Data array that will store all the values. 
@@ -16,7 +16,7 @@ class Application implements \JsonSerializable
     */
     function __construct()
     {
-        $this->_data = [];
+        $this->_data = array();
     }
 
     /**
diff --git a/ApplicationInsights/Channel/Contracts/Data.php b/ApplicationInsights/Channel/Contracts/Data.php
@@ -4,7 +4,7 @@
 /**
 * Data contract class for type Data. 
 */
-class Data implements \JsonSerializable 
+class Data
 {
     /**
     * Data array that will store all the values. 
diff --git a/ApplicationInsights/Channel/Contracts/Data_Point.php b/ApplicationInsights/Channel/Contracts/Data_Point.php
@@ -4,7 +4,7 @@
 /**
 * Data contract class for type Data_Point. 
 */
-class Data_Point implements \JsonSerializable 
+class Data_Point
 {
     /**
     * Data array that will store all the values. 
diff --git a/ApplicationInsights/Channel/Contracts/Device.php b/ApplicationInsights/Channel/Contracts/Device.php
@@ -4,7 +4,7 @@
 /**
 * Data contract class for type Device. 
 */
-class Device implements \JsonSerializable 
+class Device
 {
     /**
     * Data array that will store all the values. 
@@ -16,7 +16,7 @@ class Device implements \JsonSerializable
     */
     function __construct()
     {
-        $this->_data = [];
+        $this->_data = array();
     }
 
     /**
diff --git a/ApplicationInsights/Channel/Contracts/Envelope.php b/ApplicationInsights/Channel/Contracts/Envelope.php
@@ -4,7 +4,7 @@
 /**
 * Data contract class for type Envelope. 
 */
-class Envelope implements \JsonSerializable 
+class Envelope
 {
     /**
     * Data array that will store all the values. 
diff --git a/ApplicationInsights/Channel/Contracts/Event_Data.php b/ApplicationInsights/Channel/Contracts/Event_Data.php
@@ -4,7 +4,7 @@
 /**
 * Data contract class for type Event_Data. 
 */
-class Event_Data implements \JsonSerializable 
+class Event_Data
 {
     /**
     * Data array that will store all the values. 
diff --git a/ApplicationInsights/Channel/Contracts/Exception_Data.php b/ApplicationInsights/Channel/Contracts/Exception_Data.php
@@ -4,7 +4,7 @@
 /**
 * Data contract class for type Exception_Data. 
 */
-class Exception_Data implements \JsonSerializable 
+class Exception_Data
 {
     /**
     * Data array that will store all the values. 
diff --git a/ApplicationInsights/Channel/Contracts/Exception_Details.php b/ApplicationInsights/Channel/Contracts/Exception_Details.php
@@ -4,7 +4,7 @@
 /**
 * Data contract class for type Exception_Details. 
 */
-class Exception_Details implements \JsonSerializable 
+class Exception_Details
 {
     /**
     * Data array that will store all the values. 
diff --git a/ApplicationInsights/Channel/Contracts/Internal.php b/ApplicationInsights/Channel/Contracts/Internal.php
@@ -4,7 +4,7 @@
 /**
 * Data contract class for type Internal. 
 */
-class Internal implements \JsonSerializable 
+class Internal
 {
     /**
     * Data array that will store all the values. 
@@ -16,7 +16,7 @@ class Internal implements \JsonSerializable
     */
     function __construct()
     {
-        $this->_data = [];
+        $this->_data = array();
     }
 
     /**
diff --git a/ApplicationInsights/Channel/Contracts/Location.php b/ApplicationInsights/Channel/Contracts/Location.php
@@ -4,7 +4,7 @@
 /**
 * Data contract class for type Location. 
 */
-class Location implements \JsonSerializable 
+class Location
 {
     /**
     * Data array that will store all the values. 
@@ -16,7 +16,7 @@ class Location implements \JsonSerializable
     */
     function __construct()
     {
-        $this->_data = [];
+        $this->_data = array();
     }
 
     /**
diff --git a/ApplicationInsights/Channel/Contracts/Message_Data.php b/ApplicationInsights/Channel/Contracts/Message_Data.php
@@ -4,7 +4,7 @@
 /**
 * Data contract class for type Message_Data. 
 */
-class Message_Data implements \JsonSerializable 
+class Message_Data
 {
     /**
     * Data array that will store all the values. 
diff --git a/ApplicationInsights/Channel/Contracts/Metric_Data.php b/ApplicationInsights/Channel/Contracts/Metric_Data.php
@@ -4,7 +4,7 @@
 /**
 * Data contract class for type Metric_Data. 
 */
-class Metric_Data implements \JsonSerializable 
+class Metric_Data
 {
     /**
     * Data array that will store all the values. 
diff --git a/ApplicationInsights/Channel/Contracts/Operation.php b/ApplicationInsights/Channel/Contracts/Operation.php
@@ -4,7 +4,7 @@
 /**
 * Data contract class for type Operation. 
 */
-class Operation implements \JsonSerializable 
+class Operation
 {
     /**
     * Data array that will store all the values. 
@@ -16,7 +16,7 @@ class Operation implements \JsonSerializable
     */
     function __construct()
     {
-        $this->_data = [];
+        $this->_data = array();
     }
 
     /**
diff --git a/ApplicationInsights/Channel/Contracts/Page_View_Data.php b/ApplicationInsights/Channel/Contracts/Page_View_Data.php
@@ -4,7 +4,7 @@
 /**
 * Data contract class for type Page_View_Data. 
 */
-class Page_View_Data implements \JsonSerializable 
+class Page_View_Data
 {
     /**
     * Data array that will store all the values. 
diff --git a/ApplicationInsights/Channel/Contracts/Request_Data.php b/ApplicationInsights/Channel/Contracts/Request_Data.php
@@ -4,7 +4,7 @@
 /**
 * Data contract class for type Request_Data. 
 */
-class Request_Data implements \JsonSerializable 
+class Request_Data
 {
     /**
     * Data array that will store all the values. 
diff --git a/ApplicationInsights/Channel/Contracts/Session.php b/ApplicationInsights/Channel/Contracts/Session.php
@@ -4,7 +4,7 @@
 /**
 * Data contract class for type Session. 
 */
-class Session implements \JsonSerializable 
+class Session
 {
     /**
     * Data array that will store all the values. 
@@ -16,7 +16,7 @@ class Session implements \JsonSerializable
     */
     function __construct()
     {
-        $this->_data = [];
+        $this->_data = array();
     }
 
     /**
diff --git a/ApplicationInsights/Channel/Contracts/Stack_Frame.php b/ApplicationInsights/Channel/Contracts/Stack_Frame.php
@@ -4,7 +4,7 @@
 /**
 * Data contract class for type Stack_Frame. 
 */
-class Stack_Frame implements \JsonSerializable 
+class Stack_Frame
 {
     /**
     * Data array that will store all the values. 
diff --git a/ApplicationInsights/Channel/Contracts/User.php b/ApplicationInsights/Channel/Contracts/User.php
@@ -4,7 +4,7 @@
 /**
 * Data contract class for type User. 
 */
-class User implements \JsonSerializable 
+class User
 {
     /**
     * Data array that will store all the values. 
@@ -16,7 +16,7 @@ class User implements \JsonSerializable
     */
     function __construct()
     {
-        $this->_data = [];
+        $this->_data = array();
     }
 
     /**
diff --git a/ApplicationInsights/Channel/Contracts/Utils.php b/ApplicationInsights/Channel/Contracts/Utils.php
@@ -13,10 +13,10 @@ class Utils
      */
     public static function removeEmptyValues($sourceArray)
     {
-        $newArray = [];
+        $newArray = array();
         foreach ($sourceArray as $key => $value)
         {
-        	if ($value == [] || $value == NULL)
+        	if ((is_array($value) && sizeof($value) == 0) || ($value == NULL && is_bool($value) == false))
             {
                 continue;
             }
@@ -26,6 +26,33 @@ public static function removeEmptyValues($sourceArray)
         return $newArray;
     }
     
+    /**
+     * Serialization helper.
+     * @param array Items to serialize 
+     * @return array JSON serialized items, nested
+     */
+    public static function getUnderlyingData($dataItems)
+    {
+        $queueToEncode = array();
+        foreach ($dataItems as $key => $dataItem)
+        {
+        	if (method_exists($dataItem, 'jsonSerialize') == true)
+            {
+                $queueToEncode[$key] = Utils::getUnderlyingData($dataItem->jsonSerialize());
+            }
+            else if (is_array($dataItem))
+            {
+                $queueToEncode[$key] = Utils::getUnderlyingData($dataItem);
+            }
+            else
+            {
+                $queueToEncode[$key] = $dataItem;
+            }
+        }
+        
+        return $queueToEncode;
+    }
+    
     /**
      * Converts milliseconds to a timespan string as accepted by the backend
      * @param int $milliseconds 
diff --git a/ApplicationInsights/Channel/Telemetry_Channel.php b/ApplicationInsights/Channel/Telemetry_Channel.php
@@ -25,7 +25,7 @@ class Telemetry_Channel
     function __construct($endpointUrl = 'https://dc.services.visualstudio.com/v2/track')
     {
         $this->_endpointUrl = $endpointUrl;
-        $this->_queue = [];
+        $this->_queue = array();
     }
     
     /**
@@ -70,7 +70,13 @@ public function setQueue($queue)
      */
     public function getSerializedQueue()
     {
-        return json_encode($this->_queue);
+        $queueToEncode = array();
+        foreach ($this->_queue as $dataItem)
+        {
+        	array_push($queueToEncode, Contracts\Utils::getUnderlyingData($dataItem->jsonSerialize()));
+        }
+        
+        return json_encode($queueToEncode);
     }
     
     /**
@@ -115,7 +121,7 @@ public function addToQueue($data, \ApplicationInsights\Telemetry_Context $teleme
             $dataProperties = $data->getProperties();
             if ($dataProperties == NULL)
             {
-                $dataProperties = [];
+                $dataProperties = array();
             }
             foreach ($contextProperties as $key => $value)
             {
@@ -148,8 +154,8 @@ public function send()
         
         $serializedTelemetryItem = $this->getSerializedQueue();
         
-        $headersArray = ['Accept' => 'application/json', 
-                         'Content-Type' => 'application/json; charset=utf-8'];
+        $headersArray = array('Accept' => 'application/json', 
+                         'Content-Type' => 'application/json; charset=utf-8');
         
         if (array_key_exists('HTTP_USER_AGENT', $_SERVER) == true)
         {
@@ -164,22 +170,22 @@ public function send()
             
             $client = new \GuzzleHttp\Client();
             
-            $client->post($this->_endpointUrl, [
+            $client->post($this->_endpointUrl, array(
                 '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, [
+            wp_remote_post($this->_endpointUrl, array(
                'method'     => 'POST',
                'blocking'   => true,
                'headers'    => $headersArray,
                'body'       => $body
-            ]);
+            ));
         }
     }
 }
diff --git a/ApplicationInsights/Telemetry_Client.php b/ApplicationInsights/Telemetry_Client.php
@@ -196,7 +196,7 @@ public function trackException(\Exception $ex, $properties = NULL, $measurements
         $details->setMessage($ex->getMessage().' in '.$ex->getFile().' on line '.$ex->getLine());
         $details->setHasFullStack(true);
 
-        $stackFrames = [];
+        $stackFrames = array();
         
         // First stack frame is in the root exception
         $frameCounter = 0;
diff --git a/ApplicationInsights/Telemetry_Context.php b/ApplicationInsights/Telemetry_Context.php
@@ -65,7 +65,7 @@ function __construct()
         $this->_locationContext = new Channel\Contracts\Location();
         $this->_operationContext = new Channel\Contracts\Operation();
         $this->_sessionContext = new Channel\Contracts\Session();
-        $this->_properties = [];
+        $this->_properties = array();
         
         // Initialize user id
         $currentUser = new Current_User();
@@ -74,6 +74,12 @@ function __construct()
         // Initialize session id
         $currentSession = new Current_Session();
         $this->_sessionContext->setId($currentSession->id);
+        
+        // Initialize client ip
+        if (array_key_exists('REMOTE_ADDR', $_SERVER) && sizeof(explode('.', $_SERVER['REMOTE_ADDR'])) >= 4)
+        {
+            $this->_deviceContext->setIp($_SERVER['REMOTE_ADDR']);
+        }
     }
     
     /**
diff --git a/ApplicationInsights/Tests/Telemetry_Client_Test.php b/ApplicationInsights/Tests/Telemetry_Client_Test.php
diff --git a/composer.json b/composer.json

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`/**`
`5`	`5`	`* Data contract class for type Application.`
`6`	`6`	`*/`
`7`		`-class Application implements \JsonSerializable`
	`7`	`+class Application`
`8`	`8`	`{`
`9`	`9`	`/**`
`10`	`10`	`* Data array that will store all the values.`
`@@ -16,7 +16,7 @@ class Application implements \JsonSerializable`
`16`	`16`	`*/`
`17`	`17`	`function __construct()`
`18`	`18`	`{`
`19`		`- $this->_data = [];`
	`19`	`+ $this->_data = array();`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`/**`
`5`	`5`	`* Data contract class for type Data.`
`6`	`6`	`*/`
`7`		`-class Data implements \JsonSerializable`
	`7`	`+class Data`
`8`	`8`	`{`
`9`	`9`	`/**`
`10`	`10`	`* Data array that will store all the values.`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`/**`
`5`	`5`	`* Data contract class for type Data_Point.`
`6`	`6`	`*/`
`7`		`-class Data_Point implements \JsonSerializable`
	`7`	`+class Data_Point`
`8`	`8`	`{`
`9`	`9`	`/**`
`10`	`10`	`* Data array that will store all the values.`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`/**`
`5`	`5`	`* Data contract class for type Device.`
`6`	`6`	`*/`
`7`		`-class Device implements \JsonSerializable`
	`7`	`+class Device`
`8`	`8`	`{`
`9`	`9`	`/**`
`10`	`10`	`* Data array that will store all the values.`
`@@ -16,7 +16,7 @@ class Device implements \JsonSerializable`
`16`	`16`	`*/`
`17`	`17`	`function __construct()`
`18`	`18`	`{`
`19`		`- $this->_data = [];`
	`19`	`+ $this->_data = array();`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`/**`
`5`	`5`	`* Data contract class for type Envelope.`
`6`	`6`	`*/`
`7`		`-class Envelope implements \JsonSerializable`
	`7`	`+class Envelope`
`8`	`8`	`{`
`9`	`9`	`/**`
`10`	`10`	`* Data array that will store all the values.`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`/**`
`5`	`5`	`* Data contract class for type Event_Data.`
`6`	`6`	`*/`
`7`		`-class Event_Data implements \JsonSerializable`
	`7`	`+class Event_Data`
`8`	`8`	`{`
`9`	`9`	`/**`
`10`	`10`	`* Data array that will store all the values.`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`/**`
`5`	`5`	`* Data contract class for type Exception_Data.`
`6`	`6`	`*/`
`7`		`-class Exception_Data implements \JsonSerializable`
	`7`	`+class Exception_Data`
`8`	`8`	`{`
`9`	`9`	`/**`
`10`	`10`	`* Data array that will store all the values.`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`/**`
`5`	`5`	`* Data contract class for type Internal.`
`6`	`6`	`*/`
`7`		`-class Internal implements \JsonSerializable`
	`7`	`+class Internal`
`8`	`8`	`{`
`9`	`9`	`/**`
`10`	`10`	`* Data array that will store all the values.`
`@@ -16,7 +16,7 @@ class Internal implements \JsonSerializable`
`16`	`16`	`*/`
`17`	`17`	`function __construct()`
`18`	`18`	`{`
`19`		`- $this->_data = [];`
	`19`	`+ $this->_data = array();`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`/**`
`5`	`5`	`* Data contract class for type Location.`
`6`	`6`	`*/`
`7`		`-class Location implements \JsonSerializable`
	`7`	`+class Location`
`8`	`8`	`{`
`9`	`9`	`/**`
`10`	`10`	`* Data array that will store all the values.`
`@@ -16,7 +16,7 @@ class Location implements \JsonSerializable`
`16`	`16`	`*/`
`17`	`17`	`function __construct()`
`18`	`18`	`{`
`19`		`- $this->_data = [];`
	`19`	`+ $this->_data = array();`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`/**`