mirror/php-monolog
1
0
Fork 0
mirror of https://github.com/Seldaek/monolog.git synced 2025-08-08 14:16:42 +02:00
Code Issues Releases Wiki Activity

Merge pull request #428 from moderndeveloperllc/master

Browse Source 
NewRelicHandler: Prevent newrelic_add_custom_parameter() overwriting
This commit is contained in:
Jordi Boggiano
2014-09-30 00:02:29 +01:00
parent f51946343f e7647fd37d
commit 75afd5946d
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Monolog/Handler/NewRelicHandler.php
View File

@@ -60,11 +60,11 @@ class NewRelicHandler extends AbstractProcessingHandler
} }
foreach ($record['context'] as $key => $parameter) { 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) { foreach ($record['extra'] as $key => $parameter) {
newrelic_add_custom_parameter($key, $parameter); newrelic_add_custom_parameter('extra_' . $key, $parameter);
} }
} }

8
tests/Monolog/Handler/NewRelicHandlerTest.php
View File

@@ -45,7 +45,7 @@ class NewRelicHandlerTest extends TestCase
{ {
$handler = new StubNewRelicHandler(); $handler = new StubNewRelicHandler();
$handler->handle($this->getRecord(Logger::ERROR, 'log message', array('a' => 'b'))); $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() public function testThehandlerCanAddExtraParamsToTheNewRelicTrace()
@@ -56,7 +56,7 @@ class NewRelicHandlerTest extends TestCase
$handler = new StubNewRelicHandler(); $handler = new StubNewRelicHandler();
$handler->handle($record); $handler->handle($record);
$this->assertEquals(array('c' => 'd'), self::$customParameters); $this->assertEquals(array('extra_c' => 'd'), self::$customParameters);
} }
public function testThehandlerCanAddExtraContextAndParamsToTheNewRelicTrace() public function testThehandlerCanAddExtraContextAndParamsToTheNewRelicTrace()
@@ -68,8 +68,8 @@ class NewRelicHandlerTest extends TestCase
$handler->handle($record); $handler->handle($record);
$expected = array( $expected = array(
'a' => 'b', 'context_a' => 'b',
'c' => 'd', 'extra_c' => 'd',
); );
$this->assertEquals($expected, self::$customParameters); $this->assertEquals($expected, self::$customParameters);