Development

README.md

@@ -46,3 +46,30 @@ use ElasticApm;
 
 ### Lumen
 not tested yet.
+
+## Agent Configuration
+
+### Laravel
+
+The following environment variables are supported in the default configuration:
+
+| Variable         | Description |
+|------------------|-------------|
+|APM_ACTIVE        | `true` or `false` defaults to `true`. If `false`, the agent will collect, but not send, transaction data. |
+|APM_APPNAME       | Name of the app as it will appear in APM. |
+|APM_APPVERSION    | Version of the app as it will appear in APM. |
+|APM_SERVERURL     | URL to the APM intake service. |
+|APM_SECRETTOKEN   | Secret token, if required. |
+|APM_APIVERSION    | APM API version, defaults to `v1` (only v1 is supported at this time). |
+|APM_USEROUTEURI   | `true` or `false` defaults to `false`. The default behavior is to record the URL as sent in the request. This can result in excessive unique entries in APM. Set to `true` to have the agent use the route URL instead. |
+|APM_QUERYLOG      | `true` or `false` defaults to 'true'. Set to `false` to completely disable query logging, or to `auto` if you would like to use the threshold feature. |
+|APM_THRESHOLD     | Query threshold in milliseconds, defaults to `200`. If a query takes longer then 200ms, we enable the query log. Make sure you set `APM_QUERYLOG=auto`. |
+
+You may also publish the `elastic-apm.php` configuration file to change additional settings:
+
+```bash
+php artisan vendor:publish --tag=config --provider="PhilKra\ElasticApmLaravel\Providers\ElasticApmService
+Provider"
+```
+
+Once published, open the `config/elastic-apm.php` file and review the various settings.

config/elastic-apm.php

@@ -18,6 +18,9 @@
         //'env' => []
     ],
 
+    // GuzzleHttp\Client options (http://docs.guzzlephp.org/en/stable/request-options.html#request-options)
+    'httpClient' => [],
+
     'server' => [
         // The apm-server to connect to
         'serverUrl'     => env('APM_SERVERURL', 'http://127.0.0.1:8200'),
@@ -35,7 +38,7 @@
     'transactions' => [
 
         //This option will bundle transaction on the route name without variables
-        'use_route_uri' => env('APM_USE_ROUTE_URI', false),
+        'use_route_uri' => env('APM_USEROUTEURI', false),
 
     ],
 

src/Middleware/RecordTransaction.php

@@ -3,6 +3,7 @@
 namespace PhilKra\ElasticApmLaravel\Middleware;
 
 use Closure;
+use Illuminate\Support\Facades\Log;
 use PhilKra\Agent;
 
 class RecordTransaction
@@ -76,7 +77,12 @@ public function handle($request, Closure $next)
      */
     public function terminate($request, $response)
     {
-        $this->agent->send();
+        try {
+            $this->agent->send();
+        }
+        catch(\Throwable $t) {
+            Log::error($t);
+        }
     }
 
     /**

src/Providers/ElasticApmServiceProvider.php

@@ -45,7 +45,10 @@ public function register()
                         'framework' => 'Laravel',
                         'frameworkVersion' => app()->version(),
                     ],
-                    ['active' => config('elastic-apm.active')],
+                    [
+                        'active' => config('elastic-apm.active'),
+                        'httpClient' => config('elastic-apm.httpClient'),
+                    ],
                     $this->getAppConfig(),
                     config('elastic-apm.env'),
                     config('elastic-apm.server')