fix: Add the rpc uri to the logs (#9307)

Add the rpc uri to the logs

Author: Hectorhammett

Gax/src/Transport/GrpcTransport.php

@@ -198,6 +198,7 @@ public function startBidiStreamingCall(Call $call, array $options)
             $requestEvent->rpcName = $call->getMethod();
             $requestEvent->processId = (int) getmypid();
             $requestEvent->requestId = crc32((string) spl_object_id($bidiStream) . getmypid());
+            $requestEvent->url = $this->getGrpcUrl();
 
             $this->logRequest($requestEvent);
         }
@@ -263,6 +264,7 @@ public function startServerStreamingCall(Call $call, array $options)
             $requestEvent->rpcName = $call->getMethod();
             $requestEvent->processId = (int) getmypid();
             $requestEvent->requestId = crc32((string) spl_object_id($serverStream) . getmypid());
+            $requestEvent->url = $this->getGrpcUrl();
 
             $this->logRequest($requestEvent);
         }
@@ -297,6 +299,7 @@ public function startUnaryCall(Call $call, array $options)
             $requestEvent->rpcName = $call->getMethod();
             $requestEvent->processId = (int) getmypid();
             $requestEvent->requestId = crc32((string) spl_object_id($call) . getmypid());
+            $requestEvent->url = $this->getGrpcUrl();
 
             $this->logRequest($requestEvent);
         }
@@ -359,6 +362,11 @@ private function getCallOptions(array $options)
         return $callOptions;
     }
 
+    private function getGrpcUrl(): string
+    {
+        return 'grpc://' . str_replace('dns:///', '', $this->getTarget());
+    }
+
     private static function loadClientCertSource(callable $clientCertSource)
     {
         return call_user_func($clientCertSource);

Gax/tests/Unit/Transport/GrpcTransportTest.php

@@ -303,6 +303,56 @@ public function testBidiOpeningRequestLogsRpcName()
         $this->assertNotEmpty($unserializedBuffer);
         $this->assertNotEmpty($unserializedBuffer['rpcName']);
         $this->assertEquals($rpcName, $unserializedBuffer['rpcName']);
+        $this->assertNotEmpty($unserializedBuffer['jsonPayload']);
+        $this->assertEquals('grpc://', $unserializedBuffer['jsonPayload']['request.url']);
+    }
+
+    public function testServerStreamingRequestLogsUrl()
+    {
+        $rpcName = 'takeAction';
+        $serverStreamingCall = $this->prophesize(\Grpc\ServerStreamingCall::class);
+        $message = $this->createMockRequest();
+
+        $transport = new MockGrpcTransport(
+            $serverStreamingCall->reveal(),
+            logger: new StdOutLogger()
+        );
+
+        $stream = $transport->startServerStreamingCall(
+            new Call($rpcName, null, $message),
+            ['headers' => []]
+        );
+
+        $buffer = $this->getActualOutput();
+        $unserializedBuffer = json_decode($buffer, true);
+
+        $this->assertNotEmpty($unserializedBuffer);
+        $this->assertNotEmpty($unserializedBuffer['jsonPayload']);
+        $this->assertEquals('grpc://', $unserializedBuffer['jsonPayload']['request.url']);
+    }
+
+    public function testUnaryRequestLogsUrl()
+    {
+        $rpcName = 'takeAction';
+        $unaryCall = $this->prophesize(\Grpc\UnaryCall::class);
+        $message = $this->createMockRequest();
+
+        $transport = new MockGrpcTransport(
+            $unaryCall->reveal(),
+            logger: new StdOutLogger()
+        );
+
+        $transport->startUnaryCall(
+            new Call($rpcName, null, $message),
+            ['headers' => []]
+        );
+
+        $buffer = $this->getActualOutput();
+        $unserializedBuffer = json_decode($buffer, true);
+
+        $this->assertNotEmpty($unserializedBuffer);
+        $this->assertNotEmpty($unserializedBuffer['jsonPayload']);
+        $this->assertEquals('grpc://', $unserializedBuffer['jsonPayload']['request.url']);
     }
 
     public function testBidiStreamingSuccessObject()