@@ -117,7 +117,14 @@ public static function exceptionHandler($ex)
     {
         $message = sprintf('PHP Notice: %s', (string)$ex);
         if (self::$psrLogger) {
-            self::$psrLogger->error($message);
+            $service = self::$psrLogger->getMetadataProvider()->serviceId();
+            $version = self::$psrLogger->getMetadataProvider()->versionId();
+            self::$psrLogger->error($message, [
+                'serviceContext' => [
+                    'service' => $service,
+                    'version' => $version,
+                ]
+            ]);
         } else {
             fwrite(STDERR, $message . PHP_EOL);
         }
 
@@ -104,8 +104,17 @@ public function testExceptionHandler(
         $exception
     ) {
         $expectedMessage = sprintf('PHP Notice: %s', (string)$exception);
-        $this->psrBatchLogger->error($expectedMessage)
+        $expectedContext = [
+            'serviceContext' => [
+                'service' => '',
+                'version' => ''
+            ]
+        ];
+        $this->psrBatchLogger->error($expectedMessage, $expectedContext)
             ->shouldBeCalledTimes(1);
+        $this->psrBatchLogger->getMetadataProvider()
+            ->willReturn(new SimpleMetadataProvider())
+            ->shouldBeCalledTimes(2);
         Bootstrap::$psrLogger = $this->psrBatchLogger->reveal();
         Bootstrap::exceptionHandler($exception);
     }