Merge pull request #38 from philkra/development

Development

CHANGELOG

@@ -0,0 +1,8 @@
+2019-02-27 (5.7.6) mpetrunic
+    * Fix Lumen compatibility issues
+
+2019-02-22 (5.7.5) dstepe
+    * Start CHANGELOG
+    * Replace use of LARAVEL_START constant with REQUEST_TIME_FLOAT server var
+    * Replace transaction duration with PhilKra\Helper\Timer
+    * Require philkra/elastic-apm-php-agent >=6.5.3 for Timer feature

src/Middleware/RecordTransaction.php

@@ -113,7 +113,7 @@ protected function getTransactionName(\Illuminate\Http\Request $request): string
      */
     protected function getRouteUriTransactionName(\Illuminate\Http\Request $request): string
     {
-        $path = ($request->route()->uri === '/') ? '' : $request->route()->uri;
+        $path = ($request->path() === '/') ? '' : $request->path();
 
         return sprintf(
             "%s /%s",

src/Providers/ElasticApmServiceProvider.php

@@ -15,6 +15,8 @@ class ElasticApmServiceProvider extends ServiceProvider
     private $startTime;
     /** @var Timer */
     private $timer;
+    /** @var string  */
+    private $sourceConfigPath = __DIR__ . '/../../config/elastic-apm.php';
 
     /**
      * Bootstrap the application services.
@@ -23,9 +25,11 @@ class ElasticApmServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        $this->publishes([
-            __DIR__ . '/../../config/elastic-apm.php' => config_path('elastic-apm.php'),
-        ], 'config');
+        if (class_exists('Illuminate\Foundation\Application', false)) {
+            $this->publishes([
+                realpath($this->sourceConfigPath) => config_path('elastic-apm.php'),
+            ], 'config');
+        }
 
         if (config('elastic-apm.active') === true && config('elastic-apm.spans.querylog.enabled') !== false) {
             $this->listenForQueries();
@@ -39,8 +43,9 @@ public function boot()
      */
     public function register()
     {
+
         $this->mergeConfigFrom(
-            __DIR__ . '/../../config/elastic-apm.php',
+            realpath($this->sourceConfigPath),
             'elastic-apm'
         );