feat: [Logging] Add resource labels to logs from Cloud Run (#7642)

googleapis · Dec 27, 2024 · dad50ff · dad50ff
1 parent 9b3b7fe
commit dad50ff
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -5,7 +5,7 @@
     "minimum-stability": "stable",
     "require": {
         "php": "^8.0",
-        "google/cloud-core": "^1.58",
+        "google/cloud-core": "^1.61",
         "google/gax": "^1.36.0"
     },
     "require-dev": {

diff --git a/tests/Unit/PsrLoggerBatchTest.php b/tests/Unit/PsrLoggerBatchTest.php
@@ -18,7 +18,10 @@
 namespace Google\Cloud\Logging\Tests\Unit;
 
 use Google\Cloud\Core\Batch\BatchRunner;
-use Google\Cloud\Core\Report\CloudRunMetadataProvider;
+use Google\Cloud\Core\Compute\Metadata;
+use Google\Cloud\Core\Compute\Metadata\Readers\ReaderInterface;
+use Google\Cloud\Core\Report\CloudRunJobMetadataProvider;
+use Google\Cloud\Core\Report\CloudRunServiceMetadataProvider;
 use Google\Cloud\Core\Report\GAEFlexMetadataProvider;
 use Google\Cloud\Logging\Connection\Rest;
 use Google\Cloud\Logging\Entry;
@@ -30,6 +33,8 @@
 use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
 
+use function str_repeat;
+
 /**
  * @group logging
  */
@@ -121,13 +126,18 @@ public function testTraceIdLabelOnServerlessPlatforms(
             'my-project'
         );
 
+        $reader = self::createStub(ReaderInterface::class);
+        $reader->method('read')
+            ->willReturn('');
+        $metadata = new Metadata($reader);
+
         $psrBatchLogger = new PsrLogger(
             $logger,
             null,
             [
                 'batchEnabled' => true,
                 'batchRunner' => $this->runner->reveal(),
-                'metadataProvider' => new $metadataProviderClass($server)
+                'metadataProvider' => new $metadataProviderClass($server, $metadata)
             ]
         );
 
@@ -201,7 +211,13 @@ public function traceIdProvider()
             ],
             [
                 str_repeat('x', 32),
-                CloudRunMetadataProvider::class,
+                CloudRunServiceMetadataProvider::class,
+                [],
+                ['run.googleapis.com/trace_id' => str_repeat('x', 32)]
+            ],
+            [
+                str_repeat('x', 32),
+                CloudRunJobMetadataProvider::class,
                 [],
                 ['run.googleapis.com/trace_id' => str_repeat('x', 32)]
             ],