X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fdebug%2Flogger%2Fmonolog%2FWikiProcessor.php;h=81e1e1476398da04112b69426874442c0803ebec;hb=057b870b47a56fa8e7e056df02c2334d2273caea;hp=ad939a0932ef798d80321075d0d8a54ec560a9ba;hpb=213ecf166af5bd90c70aec4ae651cbb48d3a846c;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/debug/logger/monolog/WikiProcessor.php b/includes/debug/logger/monolog/WikiProcessor.php
index ad939a0932..81e1e14763 100644
--- a/includes/debug/logger/monolog/WikiProcessor.php
+++ b/includes/debug/logger/monolog/WikiProcessor.php
@@ -29,6 +29,17 @@ namespace MediaWiki\Logger\Monolog;
  * @copyright © 2013 Bryan Davis and Wikimedia Foundation.
  */
 class WikiProcessor {
+	/** @var array Keys which should not be used in log context */
+	protected $reservedKeys = [
+		// from monolog:src/Monolog/Formatter/LogstashFormatter.php#L71-L88
+		'message', 'channel', 'level', 'type',
+		// from WebProcessor
+		'url', 'ip', 'http_method', 'server', 'referrer',
+		// from WikiProcessor
+		'host', 'wiki', 'reqId', 'mwversion',
+		// from config magic
+		'normalized_message',
+	];
 
 	/**
 	 * @param array $record
@@ -36,6 +47,15 @@ class WikiProcessor {
 	 */
 	public function __invoke( array $record ) {
 		global $wgVersion;
+
+		// some log aggregators such as Logstash will merge the log context into the main
+		// metadata and end up overwriting the data coming from processors
+		foreach ( $this->reservedKeys as $key ) {
+			if ( isset( $record['context'][$key] ) ) {
+				wfLogWarning( __METHOD__ . ": '$key' key overwritten in log context." );
+			}
+		}
+
 		$record['extra'] = array_merge(
 			$record['extra'],
 			[
@@ -47,5 +67,4 @@ class WikiProcessor {
 		);
 		return $record;
 	}
-
 }