From e7647fd37d248c7ef704616b53c5b6757105db1a Mon Sep 17 00:00:00 2001
From: Mark Garrett <mark@moderndeveloperllc.com>
Date: Mon, 29 Sep 2014 11:04:41 -0500
Subject: [PATCH] Add prefixes to the context and extra record keys. Needed as
 some processors have the same keys as the the context. Specifically, the
 IntrospectionProcessor has "line" and "file" that can overwrite an error
 context "line" and "file".

---
 src/Monolog/Handler/NewRelicHandler.php       | 4 ++--
 tests/Monolog/Handler/NewRelicHandlerTest.php | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Monolog/Handler/NewRelicHandler.php b/src/Monolog/Handler/NewRelicHandler.php
index f7055cc1..052c407a 100644
--- a/src/Monolog/Handler/NewRelicHandler.php
+++ b/src/Monolog/Handler/NewRelicHandler.php
@@ -60,11 +60,11 @@ class NewRelicHandler extends AbstractProcessingHandler
         }
 
         foreach ($record['context'] as $key => $parameter) {
-            newrelic_add_custom_parameter($key, $parameter);
+            newrelic_add_custom_parameter('context_' . $key, $parameter);
         }
 
         foreach ($record['extra'] as $key => $parameter) {
-            newrelic_add_custom_parameter($key, $parameter);
+            newrelic_add_custom_parameter('extra_' . $key, $parameter);
         }
     }
 
diff --git a/tests/Monolog/Handler/NewRelicHandlerTest.php b/tests/Monolog/Handler/NewRelicHandlerTest.php
index 2e059684..3f3c07e2 100644
--- a/tests/Monolog/Handler/NewRelicHandlerTest.php
+++ b/tests/Monolog/Handler/NewRelicHandlerTest.php
@@ -45,7 +45,7 @@ class NewRelicHandlerTest extends TestCase
     {
         $handler = new StubNewRelicHandler();
         $handler->handle($this->getRecord(Logger::ERROR, 'log message', array('a' => 'b')));
-        $this->assertEquals(array('a' => 'b'), self::$customParameters);
+        $this->assertEquals(array('context_a' => 'b'), self::$customParameters);
     }
 
     public function testThehandlerCanAddExtraParamsToTheNewRelicTrace()
@@ -56,7 +56,7 @@ class NewRelicHandlerTest extends TestCase
         $handler = new StubNewRelicHandler();
         $handler->handle($record);
 
-        $this->assertEquals(array('c' => 'd'), self::$customParameters);
+        $this->assertEquals(array('extra_c' => 'd'), self::$customParameters);
     }
 
     public function testThehandlerCanAddExtraContextAndParamsToTheNewRelicTrace()
@@ -68,8 +68,8 @@ class NewRelicHandlerTest extends TestCase
         $handler->handle($record);
 
         $expected = array(
-            'a' => 'b',
-            'c' => 'd',
+            'context_a' => 'b',
+            'extra_c' => 'd',
         );
 
         $this->assertEquals($expected, self::$customParameters);