From b633f344d818f7712fa25e0835f96b0951b1f6e8 Mon Sep 17 00:00:00 2001 From: dena Date: Thu, 11 Dec 2025 10:53:35 +0100 Subject: [PATCH 1/2] test logging --- 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 502e37a37..98f98bf52 100644 --- a/dist-persist/wbstack/src/Logging/CustomLogger.php +++ b/dist-persist/wbstack/src/Logging/CustomLogger.php @@ -55,7 +55,12 @@ private function doLog( $level, $message, $context ) { $payload[ 'severity' ] = $level; $payload[ 'serviceContext' ] = [ 'service' => 'WBaaS MediaWiki', - 'version' => '1.0.0' + 'version' => '2.0.0' + ]; + $payload[ 'context' ] = [ + 'mediawiki' => MW_VERSION, // https://github.com/wbstack/mediawiki/blob/main/dist/includes/Defines.php#L37 + 'domain' => $GLOBALS[WBSTACK_INFO_GLOBAL]->requestDomain, + 'php' => getenv('PHP_VERSION'), ]; $output = json_encode( $payload ); diff --git a/dist/wbstack/src/Logging/CustomLogger.php b/dist/wbstack/src/Logging/CustomLogger.php index 502e37a37..98f98bf52 100644 --- a/dist/wbstack/src/Logging/CustomLogger.php +++ b/dist/wbstack/src/Logging/CustomLogger.php @@ -55,7 +55,12 @@ private function doLog( $level, $message, $context ) { $payload[ 'severity' ] = $level; $payload[ 'serviceContext' ] = [ 'service' => 'WBaaS MediaWiki', - 'version' => '1.0.0' + 'version' => '2.0.0' + ]; + $payload[ 'context' ] = [ + 'mediawiki' => MW_VERSION, // https://github.com/wbstack/mediawiki/blob/main/dist/includes/Defines.php#L37 + 'domain' => $GLOBALS[WBSTACK_INFO_GLOBAL]->requestDomain, + 'php' => getenv('PHP_VERSION'), ]; $output = json_encode( $payload ); From c83a976b1c637994987deb90814e4176f5ba1b14 Mon Sep 17 00:00:00 2001 From: dena Date: Thu, 11 Dec 2025 10:55:13 +0100 Subject: [PATCH 2/2] test version --- dist-persist/wbstack/src/Logging/CustomLogger.php | 4 ++-- dist/wbstack/src/Logging/CustomLogger.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dist-persist/wbstack/src/Logging/CustomLogger.php b/dist-persist/wbstack/src/Logging/CustomLogger.php index 98f98bf52..2f46a3f20 100644 --- a/dist-persist/wbstack/src/Logging/CustomLogger.php +++ b/dist-persist/wbstack/src/Logging/CustomLogger.php @@ -54,8 +54,8 @@ private function doLog( $level, $message, $context ) { $payload[ '@type' ] = 'type.googleapis.com/google.devtools.clouderrorreporting.v1beta1.ReportedErrorEvent'; $payload[ 'severity' ] = $level; $payload[ 'serviceContext' ] = [ - 'service' => 'WBaaS MediaWiki', - 'version' => '2.0.0' + 'service' => 'TEST WBaaS MediaWiki', + 'version' => '0.0.0' ]; $payload[ 'context' ] = [ 'mediawiki' => MW_VERSION, // https://github.com/wbstack/mediawiki/blob/main/dist/includes/Defines.php#L37 diff --git a/dist/wbstack/src/Logging/CustomLogger.php b/dist/wbstack/src/Logging/CustomLogger.php index 98f98bf52..2f46a3f20 100644 --- a/dist/wbstack/src/Logging/CustomLogger.php +++ b/dist/wbstack/src/Logging/CustomLogger.php @@ -54,8 +54,8 @@ private function doLog( $level, $message, $context ) { $payload[ '@type' ] = 'type.googleapis.com/google.devtools.clouderrorreporting.v1beta1.ReportedErrorEvent'; $payload[ 'severity' ] = $level; $payload[ 'serviceContext' ] = [ - 'service' => 'WBaaS MediaWiki', - 'version' => '2.0.0' + 'service' => 'TEST WBaaS MediaWiki', + 'version' => '0.0.0' ]; $payload[ 'context' ] = [ 'mediawiki' => MW_VERSION, // https://github.com/wbstack/mediawiki/blob/main/dist/includes/Defines.php#L37