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

Format deep array params before sending to newrelic, fixes #579

Browse Source
This commit is contained in:
Jordi Boggiano
2015-06-11 19:34:48 +01:00
parent 77aef55318
commit 3f1ac6544c
1 changed files with 31 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,6 +12,7 @@
namespace Monolog\Handler; namespace Monolog\Handler;
use Monolog\Logger; use Monolog\Logger;
use Monolog\Formatter\NormalizerFormatter;
/** /**
* Class to record a log on a NewRelic application. * Class to record a log on a NewRelic application.
@@ -80,33 +81,33 @@ class NewRelicHandler extends AbstractProcessingHandler
if ($transactionName = $this->getTransactionName($record['context'])) { if ($transactionName = $this->getTransactionName($record['context'])) {
$this->setNewRelicTransactionName($transactionName); $this->setNewRelicTransactionName($transactionName);
unset($record['context']['transaction_name']); unset($record['formatted']['context']['transaction_name']);
} }
if (isset($record['context']['exception']) && $record['context']['exception'] instanceof \Exception) { if (isset($record['context']['exception']) && $record['context']['exception'] instanceof \Exception) {
newrelic_notice_error($record['message'], $record['context']['exception']); newrelic_notice_error($record['message'], $record['context']['exception']);
unset($record['context']['exception']); unset($record['formatted']['context']['exception']);
} else { } else {
newrelic_notice_error($record['message']); newrelic_notice_error($record['message']);
} }
foreach ($record['context'] as $key => $parameter) { foreach ($record['formatted']['context'] as $key => $parameter) {
if (is_array($parameter) && $this->explodeArrays) { if (is_array($parameter) && $this->explodeArrays) {
foreach ($parameter as $paramKey => $paramValue) { foreach ($parameter as $paramKey => $paramValue) {
newrelic_add_custom_parameter('context_' . $key . '_' . $paramKey, $paramValue); $this->setNewRelicParameter('context_' . $key . '_' . $paramKey, $paramValue);
} }
} else { } else {
newrelic_add_custom_parameter('context_' . $key, $parameter); $this->setNewRelicParameter('context_' . $key, $parameter);
} }
} }
foreach ($record['extra'] as $key => $parameter) { foreach ($record['formatted']['extra'] as $key => $parameter) {
if (is_array($parameter) && $this->explodeArrays) { if (is_array($parameter) && $this->explodeArrays) {
foreach ($parameter as $paramKey => $paramValue) { foreach ($parameter as $paramKey => $paramValue) {
newrelic_add_custom_parameter('extra_' . $key . '_' . $paramKey, $paramValue); $this->setNewRelicParameter('extra_' . $key . '_' . $paramKey, $paramValue);
} }
} else { } else {
newrelic_add_custom_parameter('extra_' . $key, $parameter); $this->setNewRelicParameter('extra_' . $key, $parameter);
} }
} }
} }
@@ -167,10 +168,31 @@ class NewRelicHandler extends AbstractProcessingHandler
/** /**
* Overwrites the name of the current transaction * Overwrites the name of the current transaction
* *
* @param $transactionName * @param string $transactionName
*/ */
protected function setNewRelicTransactionName($transactionName) protected function setNewRelicTransactionName($transactionName)
{ {
newrelic_name_transaction($transactionName); newrelic_name_transaction($transactionName);
} }
/**
* @param string $key
* @param mixed $value
*/
protected function setNewRelicParameter($key, $value)
{
if (null === $value || is_scalar($value)) {
newrelic_add_custom_parameter($key, $value);
} else {
newrelic_add_custom_parameter($key, @json_encode($value));
}
}
/**
* {@inheritDoc}
*/
protected function getDefaultFormatter()
{
return new NormalizerFormatter();
}
} }