Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add client logging support for sync gRPC #2284

Merged
merged 12 commits into from
Dec 11, 2024
Merged

feat: add client logging support for sync gRPC #2284

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
30a2939
feat: add client logging support for sync gRPC
ohmayr Dec 10, 2024
39bc84e
address PR feedback
ohmayr Dec 11, 2024
7dfb3f0
address PR feedback
ohmayr Dec 11, 2024
59fe952
address PR feedback
ohmayr Dec 11, 2024
778a170
address PR feedback
ohmayr Dec 11, 2024
cce77eb
update goldens
ohmayr Dec 11, 2024
d401973
remove logging test file
ohmayr Dec 11, 2024
b47a0a9
address PR feedback
ohmayr Dec 11, 2024
b3db0e8
ignore type
ohmayr Dec 11, 2024
1248b7c
fix type ignore
ohmayr Dec 11, 2024
066aa49
address PR feedback
ohmayr Dec 11, 2024
450b6da
change result to request
ohmayr Dec 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions gapic/templates/%namespace/%name_%version/%sub/services/%service/transports/grpc.py.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,10 @@ import google.auth # type: ignore
from google.auth import credentials as ga_credentials # type: ignore
from google.auth.transport.grpc import SslCredentials # type: ignore
from google.protobuf.json_format import MessageToJson
import google.protobuf.message

import grpc # type: ignore
import proto

{% filter sort_lines %}
{% set import_ns = namespace(has_operations_mixin=false) %}
Expand Down Expand Up @@ -84,9 +86,12 @@ class _LoggingClientInterceptor(grpc.UnaryUnaryClientInterceptor): # pragma: NO
# Convert gRPC metadata `<class 'grpc.aio._metadata.Metadata'>` to list of tuples
metadata = dict([(k, v) for k, v in response_metadata]) if response_metadata else None
result = response.result()
try:
if isinstance(result, proto.Message):
{# TODO(https://github.com/googleapis/gapic-generator-python/issues/2293): Investigate if we can improve this logic
or wait for next gen protobuf.
#}
response_payload = type(result).to_json(result)
except:
elif isinstance(result, google.protobuf.message.Message):
response_payload = MessageToJson(result)
grpc_response = {
"payload": response_payload,
Expand Down
6 changes: 4 additions & 2 deletions ...integration/goldens/asset/google/cloud/asset_v1/services/asset_service/transports/grpc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,10 @@
from google.auth import credentials as ga_credentials # type: ignore
from google.auth.transport.grpc import SslCredentials # type: ignore
from google.protobuf.json_format import MessageToJson
import google.protobuf.message

import grpc # type: ignore
import proto

from google.cloud.asset_v1.types import asset_service
from google.longrunning import operations_pb2 # type: ignore
Expand Down Expand Up @@ -71,9 +73,9 @@ def intercept_unary_unary(self, continuation, client_call_details, request):
# Convert gRPC metadata `<class 'grpc.aio._metadata.Metadata'>` to list of tuples
metadata = dict([(k, v) for k, v in response_metadata]) if response_metadata else None
result = response.result()
try:
if isinstance(result, proto.Message):
response_payload = type(result).to_json(result)
except:
elif isinstance(result, google.protobuf.message.Message):
response_payload = MessageToJson(result)
grpc_response = {
"payload": response_payload,
Expand Down
6 changes: 4 additions & 2 deletions ...goldens/credentials/google/iam/credentials_v1/services/iam_credentials/transports/grpc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,10 @@
from google.auth import credentials as ga_credentials # type: ignore
from google.auth.transport.grpc import SslCredentials # type: ignore
from google.protobuf.json_format import MessageToJson
import google.protobuf.message

import grpc # type: ignore
import proto

from google.iam.credentials_v1.types import common
from .base import IAMCredentialsTransport, DEFAULT_CLIENT_INFO
Expand Down Expand Up @@ -68,9 +70,9 @@ def intercept_unary_unary(self, continuation, client_call_details, request):
# Convert gRPC metadata `<class 'grpc.aio._metadata.Metadata'>` to list of tuples
metadata = dict([(k, v) for k, v in response_metadata]) if response_metadata else None
result = response.result()
try:
if isinstance(result, proto.Message):
response_payload = type(result).to_json(result)
except:
elif isinstance(result, google.protobuf.message.Message):
response_payload = MessageToJson(result)
grpc_response = {
"payload": response_payload,
Expand Down
6 changes: 4 additions & 2 deletions ...ntegration/goldens/eventarc/google/cloud/eventarc_v1/services/eventarc/transports/grpc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,10 @@
from google.auth import credentials as ga_credentials # type: ignore
from google.auth.transport.grpc import SslCredentials # type: ignore
from google.protobuf.json_format import MessageToJson
import google.protobuf.message

import grpc # type: ignore
import proto

from google.cloud.eventarc_v1.types import channel
from google.cloud.eventarc_v1.types import channel_connection
Expand Down Expand Up @@ -79,9 +81,9 @@ def intercept_unary_unary(self, continuation, client_call_details, request):
# Convert gRPC metadata `<class 'grpc.aio._metadata.Metadata'>` to list of tuples
metadata = dict([(k, v) for k, v in response_metadata]) if response_metadata else None
result = response.result()
try:
if isinstance(result, proto.Message):
response_payload = type(result).to_json(result)
except:
elif isinstance(result, google.protobuf.message.Message):
response_payload = MessageToJson(result)
grpc_response = {
"payload": response_payload,
Expand Down
6 changes: 4 additions & 2 deletions ...ion/goldens/logging/google/cloud/logging_v2/services/config_service_v2/transports/grpc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,10 @@
from google.auth import credentials as ga_credentials # type: ignore
from google.auth.transport.grpc import SslCredentials # type: ignore
from google.protobuf.json_format import MessageToJson
import google.protobuf.message

import grpc # type: ignore
import proto

from google.cloud.logging_v2.types import logging_config
from google.longrunning import operations_pb2 # type: ignore
Expand Down Expand Up @@ -71,9 +73,9 @@ def intercept_unary_unary(self, continuation, client_call_details, request):
# Convert gRPC metadata `<class 'grpc.aio._metadata.Metadata'>` to list of tuples
metadata = dict([(k, v) for k, v in response_metadata]) if response_metadata else None
result = response.result()
try:
if isinstance(result, proto.Message):
response_payload = type(result).to_json(result)
except:
elif isinstance(result, google.protobuf.message.Message):
response_payload = MessageToJson(result)
grpc_response = {
"payload": response_payload,
Expand Down
6 changes: 4 additions & 2 deletions ...on/goldens/logging/google/cloud/logging_v2/services/logging_service_v2/transports/grpc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,10 @@
from google.auth import credentials as ga_credentials # type: ignore
from google.auth.transport.grpc import SslCredentials # type: ignore
from google.protobuf.json_format import MessageToJson
import google.protobuf.message

import grpc # type: ignore
import proto

from google.cloud.logging_v2.types import logging
from google.longrunning import operations_pb2 # type: ignore
Expand Down Expand Up @@ -70,9 +72,9 @@ def intercept_unary_unary(self, continuation, client_call_details, request):
# Convert gRPC metadata `<class 'grpc.aio._metadata.Metadata'>` to list of tuples
metadata = dict([(k, v) for k, v in response_metadata]) if response_metadata else None
result = response.result()
try:
if isinstance(result, proto.Message):
response_payload = type(result).to_json(result)
except:
elif isinstance(result, google.protobuf.message.Message):
response_payload = MessageToJson(result)
grpc_response = {
"payload": response_payload,
Expand Down
6 changes: 4 additions & 2 deletions ...on/goldens/logging/google/cloud/logging_v2/services/metrics_service_v2/transports/grpc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,10 @@
from google.auth import credentials as ga_credentials # type: ignore
from google.auth.transport.grpc import SslCredentials # type: ignore
from google.protobuf.json_format import MessageToJson
import google.protobuf.message

import grpc # type: ignore
import proto

from google.cloud.logging_v2.types import logging_metrics
from google.longrunning import operations_pb2 # type: ignore
Expand Down Expand Up @@ -70,9 +72,9 @@ def intercept_unary_unary(self, continuation, client_call_details, request):
# Convert gRPC metadata `<class 'grpc.aio._metadata.Metadata'>` to list of tuples
metadata = dict([(k, v) for k, v in response_metadata]) if response_metadata else None
result = response.result()
try:
if isinstance(result, proto.Message):
response_payload = type(result).to_json(result)
except:
elif isinstance(result, google.protobuf.message.Message):
response_payload = MessageToJson(result)
grpc_response = {
"payload": response_payload,
Expand Down
6 changes: 4 additions & 2 deletions ...s/integration/goldens/redis/google/cloud/redis_v1/services/cloud_redis/transports/grpc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,10 @@
from google.auth import credentials as ga_credentials # type: ignore
from google.auth.transport.grpc import SslCredentials # type: ignore
from google.protobuf.json_format import MessageToJson
import google.protobuf.message

import grpc # type: ignore
import proto

from google.cloud.location import locations_pb2 # type: ignore
from google.cloud.redis_v1.types import cloud_redis
Expand Down Expand Up @@ -71,9 +73,9 @@ def intercept_unary_unary(self, continuation, client_call_details, request):
# Convert gRPC metadata `<class 'grpc.aio._metadata.Metadata'>` to list of tuples
metadata = dict([(k, v) for k, v in response_metadata]) if response_metadata else None
result = response.result()
try:
if isinstance(result, proto.Message):
response_payload = type(result).to_json(result)
except:
elif isinstance(result, google.protobuf.message.Message):
response_payload = MessageToJson(result)
grpc_response = {
"payload": response_payload,
Expand Down
Loading