Merge pull request #72 from philkra/development

Development

README.md

@@ -54,11 +54,13 @@ Addings spans (https://www.elastic.co/guide/en/apm/server/current/transactions.h
 Please consult the documentation for your exact needs. Below is an example for adding a MySQL span.
 
 ```php
+$trxName = 'GET /some/transaction/name';
+
 // create the agent
 $agent = new \PhilKra\Agent(['appName' => 'Demo with Spans']);
 
 // start a new transaction
-$transaction = $agent->startTransaction('GET /some/transaction/name');
+$transaction = $agent->startTransaction($trxName);
 
 // create a span
 $spans = [];
@@ -104,6 +106,11 @@ $spans[] = [
 // add the array of spans to the transaction
 $transaction->setSpans($spans);
 
+// Do some stuff you want to watch ...
+sleep(1);
+
+$agent->stopTransaction($trxName);
+
 // send our transactions to te apm
 $agent->send();
 ```

src/Events/EventBean.php

@@ -229,7 +229,7 @@ final protected function getContext() : array
 
         // Build Context Stub
         $SERVER_PROTOCOL = $_SERVER['SERVER_PROTOCOL'] ?? '';
-        $remote_address = $_SERVER['REMOTE_ADDR'];
+        $remote_address = $_SERVER['REMOTE_ADDR'] ?? '';
         if (array_key_exists('HTTP_X_FORWARDED_FOR', $_SERVER) === true) {
             $remote_address = $_SERVER['HTTP_X_FORWARDED_FOR'];
         }
@@ -238,7 +238,7 @@ final protected function getContext() : array
                 'http_version' => substr($SERVER_PROTOCOL, strpos($SERVER_PROTOCOL, '/')),
                 'method'       => $_SERVER['REQUEST_METHOD'] ?? 'cli',
                 'socket'       => [
-                    'remote_address' => $remote_address ?? '',
+                    'remote_address' => $remote_address,
                     'encrypted'      => isset($_SERVER['HTTPS'])
                 ],
                 'response' => $this->contexts['response'],