Standardize logging fields

Author: vchudnov-g

gapic/templates/%namespace/%name_%version/%sub/services/%service/_shared_macros.j2

@@ -195,7 +195,7 @@ def _get_http_options():
     Args:
         body_spec (str): The http options body i.e. method.http_options[0].body
         method_name (str): The method name.
-        service_name (str): The service name.
+        service: The service.
         is_async (bool): Used to determine the code path i.e. whether for sync or async call. #}
 {% macro rest_call_method_common(body_spec, method_name, service, is_async=False) %}
 {% set service_name = service.name %}
@@ -216,15 +216,18 @@ def _get_http_options():
     if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor(logging.DEBUG):  # pragma: NO COVER
         request_url = "{host}{uri}".format(host=self._host, uri=transcoded_request['uri'])
         method = transcoded_request['method']
+        http_request = {
+          "payload":   type(request).to_json(request),
+          "requestmethod": method,
+          "requestUrl": request_url,
+        }
         _LOGGER.debug(
-            f"Sending request via {{ service.meta.address.proto_package_versioned }}.{{ service.client_name }}.{{ method_name }}",
+            f"Sending request for  {{ service.meta.address.proto_package_versioned }}.{{ service.client_name }}.{{ method_name }}",
             extra = {
                 "serviceName": "{{ service.meta.address.proto }}",
                 "rpcName": "{{ method_name }}",
-                "httpRequest": type(request).to_json(request),
-                "httpRequestMethod": method,
-                "httpRequestUrl": request_url,
                 "metadata": str(dict(metadata)),
+                "httpRequest": http_request,
             },
         )
 

gapic/templates/%namespace/%name_%version/%sub/services/%service/transports/rest.py.j2

@@ -256,13 +256,17 @@ class {{service.name}}RestTransport(_Base{{ service.name }}RestTransport):
             {% endif %}{# method.lro #}
             resp = self._interceptor.post_{{ method.name|snake_case }}(resp)
             if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor(logging.DEBUG):  # pragma: NO COVER
+                http_response = {
+                "payload": {% if method.output.ident.is_proto_plus_type %}{{ method.output.ident }}.to_json(resp){% else %}json_format.MessageToJson(resp){% endif %},
+                "status": "OK", # need to obtain this properly
+                }
                 _LOGGER.debug(
                     "Received response for {{ service.meta.address.proto_package_versioned }}.{{ service.client_name }}.{{ method.transport_safe_name|snake_case }}",
                     extra = {
                         "serviceName": "{{ service.meta.address.proto }}",
                         "rpcName": "{{ method.name }}",
-                        "response": {% if method.output.ident.is_proto_plus_type %}{{ method.output.ident }}.to_json(resp){% else %}json_format.MessageToJson(resp){% endif %},
                         "metadata": str(dict(response.headers)),
+                        "httpResponse": http_response,
                     },
                 )
             return resp

gapic/templates/%namespace/%name_%version/%sub/services/%service/transports/rest_asyncio.py.j2

@@ -218,17 +218,21 @@ class Async{{service.name}}RestTransport(_Base{{ service.name }}RestTransport):
             {% endif %}{# if method.server_streaming #}
             resp = await self._interceptor.post_{{ method.name|snake_case }}(resp)
             if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor(logging.DEBUG):  # pragma: NO COVER
+                http_response = {
+                    "payload": {% if method.output.ident.is_proto_plus_type %}{{ method.output.ident }}.to_json(response){% else %}json_format.MessageToJson(response){% endif %},
+                    "headers":  str(dict(response.headers)),
+                    "status": "OK", # need to obtain this properly
+                }
                 _LOGGER.debug(
                     "Received response for {{ service.meta.address.proto_package_versioned }}.{{ service.async_client_name }}.{{ method.transport_safe_name|snake_case }}",
                     extra = {
                         "serviceName": "{{ service.meta.address.proto }}",
                         "rpcName": "{{ method.name }}",
-                        "retryAttempt": 1,
-                        "response": {% if method.output.ident.is_proto_plus_type %}{{ method.output.ident }}.to_json(response){% else %}json_format.MessageToJson(response){% endif %},
-                        "metadata": str(dict(response.headers)),
+                        "metadata": http_response["headers"],
+                        "httpResponse": http_response,
                     },
                 )
-
+            
             return resp
 
             {% endif %}{# method.void #}