From 536d36dc941f989d9e114980537d56d2100394e4 Mon Sep 17 00:00:00 2001 From: dena Date: Tue, 16 Dec 2025 19:44:17 +0100 Subject: [PATCH 1/3] adjust logging service name via env var --- dist-persist/wbstack/src/Logging/CustomLogger.php | 7 ++++++- dist/wbstack/src/Logging/CustomLogger.php | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dist-persist/wbstack/src/Logging/CustomLogger.php b/dist-persist/wbstack/src/Logging/CustomLogger.php index 60ed10d7c..14774c30a 100644 --- a/dist-persist/wbstack/src/Logging/CustomLogger.php +++ b/dist-persist/wbstack/src/Logging/CustomLogger.php @@ -61,9 +61,14 @@ private function doLog( $level, $message, $context ) { $payload[ '@type' ] = 'type.googleapis.com/google.devtools.clouderrorreporting.v1beta1.ReportedErrorEvent'; } + $envString = ''; + if ($env = getenv('MW_ENVIRONMENT')) { + $envString = " (${env})"; + } + $payload[ 'severity' ] = $level; $payload[ 'serviceContext' ] = [ - 'service' => 'WBaaS MediaWiki', + 'service' => 'WBaaS MediaWiki' . $envString, 'version' => MW_VERSION, ]; $payload[ 'context' ] = [ diff --git a/dist/wbstack/src/Logging/CustomLogger.php b/dist/wbstack/src/Logging/CustomLogger.php index 60ed10d7c..14774c30a 100644 --- a/dist/wbstack/src/Logging/CustomLogger.php +++ b/dist/wbstack/src/Logging/CustomLogger.php @@ -61,9 +61,14 @@ private function doLog( $level, $message, $context ) { $payload[ '@type' ] = 'type.googleapis.com/google.devtools.clouderrorreporting.v1beta1.ReportedErrorEvent'; } + $envString = ''; + if ($env = getenv('MW_ENVIRONMENT')) { + $envString = " (${env})"; + } + $payload[ 'severity' ] = $level; $payload[ 'serviceContext' ] = [ - 'service' => 'WBaaS MediaWiki', + 'service' => 'WBaaS MediaWiki' . $envString, 'version' => MW_VERSION, ]; $payload[ 'context' ] = [ From 9569a6bbb5842d63736d795d963a68bda3ce993b Mon Sep 17 00:00:00 2001 From: dena <91744937+deer-wmde@users.noreply.github.com> Date: Thu, 18 Dec 2025 10:48:56 +0100 Subject: [PATCH 2/3] Update dist-persist/wbstack/src/Logging/CustomLogger.php Co-authored-by: Dat WMDE --- dist-persist/wbstack/src/Logging/CustomLogger.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist-persist/wbstack/src/Logging/CustomLogger.php b/dist-persist/wbstack/src/Logging/CustomLogger.php index 14774c30a..c61e2b3c3 100644 --- a/dist-persist/wbstack/src/Logging/CustomLogger.php +++ b/dist-persist/wbstack/src/Logging/CustomLogger.php @@ -63,7 +63,7 @@ private function doLog( $level, $message, $context ) { $envString = ''; if ($env = getenv('MW_ENVIRONMENT')) { - $envString = " (${env})"; + $envString = " ({$env})"; } $payload[ 'severity' ] = $level; From a7cbe2c7632dabd4d5ef5e226a01fd74fe4c228f Mon Sep 17 00:00:00 2001 From: dena Date: Thu, 18 Dec 2025 10:53:49 +0100 Subject: [PATCH 3/3] add environment to context array --- dist-persist/wbstack/src/Logging/CustomLogger.php | 4 +++- dist/wbstack/src/Logging/CustomLogger.php | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dist-persist/wbstack/src/Logging/CustomLogger.php b/dist-persist/wbstack/src/Logging/CustomLogger.php index c61e2b3c3..c5fc28f35 100644 --- a/dist-persist/wbstack/src/Logging/CustomLogger.php +++ b/dist-persist/wbstack/src/Logging/CustomLogger.php @@ -72,7 +72,9 @@ private function doLog( $level, $message, $context ) { 'version' => MW_VERSION, ]; $payload[ 'context' ] = [ - 'request_uri' => $_SERVER['REQUEST_URI'] ?? '', + 'environment' => $env ?? '', + + 'request_uri' => $_SERVER['REQUEST_URI'] ?? '', // set in /includes/Defines.php 'mediawiki' => MW_VERSION, diff --git a/dist/wbstack/src/Logging/CustomLogger.php b/dist/wbstack/src/Logging/CustomLogger.php index 14774c30a..c5fc28f35 100644 --- a/dist/wbstack/src/Logging/CustomLogger.php +++ b/dist/wbstack/src/Logging/CustomLogger.php @@ -63,7 +63,7 @@ private function doLog( $level, $message, $context ) { $envString = ''; if ($env = getenv('MW_ENVIRONMENT')) { - $envString = " (${env})"; + $envString = " ({$env})"; } $payload[ 'severity' ] = $level; @@ -72,7 +72,9 @@ private function doLog( $level, $message, $context ) { 'version' => MW_VERSION, ]; $payload[ 'context' ] = [ - 'request_uri' => $_SERVER['REQUEST_URI'] ?? '', + 'environment' => $env ?? '', + + 'request_uri' => $_SERVER['REQUEST_URI'] ?? '', // set in /includes/Defines.php 'mediawiki' => MW_VERSION,