logging: adjust service name by environment (#514)

* adjust logging service name via env var

* Update dist-persist/wbstack/src/Logging/CustomLogger.php

Co-authored-by: Dat WMDE <[email protected]>

* add environment to context array

---------

Co-authored-by: Dat WMDE <[email protected]>

Author: deer-wmde

dist-persist/wbstack/src/Logging/CustomLogger.php

@@ -61,13 +61,20 @@ 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' ] = [
-            'request_uri' => $_SERVER['REQUEST_URI'] ?? '',
+            'environment'   => $env ?? '',
+
+            'request_uri'   => $_SERVER['REQUEST_URI'] ?? '',
 
             // set in /includes/Defines.php
             'mediawiki'     => MW_VERSION,

dist/wbstack/src/Logging/CustomLogger.php

@@ -61,13 +61,20 @@ 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' ] = [
-            'request_uri' => $_SERVER['REQUEST_URI'] ?? '',
+            'environment'   => $env ?? '',
+
+            'request_uri'   => $_SERVER['REQUEST_URI'] ?? '',
 
             // set in /includes/Defines.php
             'mediawiki'     => MW_VERSION,