Skip to content

Commit 066aa49

Browse files
ohmayrohmayr
committed
address PR feedback
1 parent 1248b7c commit 066aa49

File tree

8 files changed

+59
-16
lines changed
  • gapic/templates/%namespace/%name_%version/%sub/services/%service/transports
  • tests/integration/goldens
    • asset/google/cloud/asset_v1/services/asset_service/transports
    • credentials/google/iam/credentials_v1/services/iam_credentials/transports
    • eventarc/google/cloud/eventarc_v1/services/eventarc/transports
    • logging/google/cloud/logging_v2/services
      • config_service_v2/transports
      • logging_service_v2/transports
      • metrics_service_v2/transports
    • redis/google/cloud/redis_v1/services/cloud_redis/transports

8 files changed

+59
-16
lines changed

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

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
{% block content %}
44

55
import logging as std_logging
6+
import pickle
67
import warnings
78
from typing import Callable, Dict, Optional, Sequence, Tuple, Union
89

@@ -60,10 +61,15 @@ class _LoggingClientInterceptor(grpc.UnaryUnaryClientInterceptor): # pragma: NO
6061
logging_enabled = CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor(std_logging.DEBUG)
6162
if logging_enabled: # pragma: NO COVER
6263
request_metadata = client_call_details.metadata
63-
try:
64+
if isinstance(result, proto.Message):
65+
{# TODO(https://github.com/googleapis/gapic-generator-python/issues/2293): Investigate if we can improve this logic
66+
or wait for next gen protobuf.
67+
#}
6468
request_payload = type(request).to_json(request)
65-
except:
69+
elif isinstance(result, google.protobuf.message.Message):
6670
request_payload = MessageToJson(request)
71+
else:
72+
request_payload = f"{type(result).__name__}: {pickle.dumps(request)}"
6773
grpc_request = {
6874
"payload": request_payload,
6975
"requestMethod": "grpc",
@@ -93,6 +99,8 @@ class _LoggingClientInterceptor(grpc.UnaryUnaryClientInterceptor): # pragma: NO
9399
response_payload = type(result).to_json(result)
94100
elif isinstance(result, google.protobuf.message.Message):
95101
response_payload = MessageToJson(result)
102+
else:
103+
response_payload = f"{type(result).__name__}: {pickle.dumps(result)}"
96104
grpc_response = {
97105
"payload": response_payload,
98106
"metadata": metadata,

‎tests/integration/goldens/asset/google/cloud/asset_v1/services/asset_service/transports/grpc.py‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
# limitations under the License.
1515
#
1616
import logging as std_logging
17+
import pickle
1718
import warnings
1819
from typing import Callable, Dict, Optional, Sequence, Tuple, Union
1920

@@ -48,10 +49,12 @@ def intercept_unary_unary(self, continuation, client_call_details, request):
4849
logging_enabled = CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor(std_logging.DEBUG)
4950
if logging_enabled: # pragma: NO COVER
5051
request_metadata = client_call_details.metadata
51-
try:
52+
if isinstance(result, proto.Message):
5253
request_payload = type(request).to_json(request)
53-
except:
54+
elif isinstance(result, google.protobuf.message.Message):
5455
request_payload = MessageToJson(request)
56+
else:
57+
request_payload = f"{type(result).__name__}: {pickle.dumps(request)}"
5558
grpc_request = {
5659
"payload": request_payload,
5760
"requestMethod": "grpc",
@@ -77,6 +80,8 @@ def intercept_unary_unary(self, continuation, client_call_details, request):
7780
response_payload = type(result).to_json(result)
7881
elif isinstance(result, google.protobuf.message.Message):
7982
response_payload = MessageToJson(result)
83+
else:
84+
response_payload = f"{type(result).__name__}: {pickle.dumps(result)}"
8085
grpc_response = {
8186
"payload": response_payload,
8287
"metadata": metadata,

‎tests/integration/goldens/credentials/google/iam/credentials_v1/services/iam_credentials/transports/grpc.py‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
# limitations under the License.
1515
#
1616
import logging as std_logging
17+
import pickle
1718
import warnings
1819
from typing import Callable, Dict, Optional, Sequence, Tuple, Union
1920

@@ -45,10 +46,12 @@ def intercept_unary_unary(self, continuation, client_call_details, request):
4546
logging_enabled = CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor(std_logging.DEBUG)
4647
if logging_enabled: # pragma: NO COVER
4748
request_metadata = client_call_details.metadata
48-
try:
49+
if isinstance(result, proto.Message):
4950
request_payload = type(request).to_json(request)
50-
except:
51+
elif isinstance(result, google.protobuf.message.Message):
5152
request_payload = MessageToJson(request)
53+
else:
54+
request_payload = f"{type(result).__name__}: {pickle.dumps(request)}"
5255
grpc_request = {
5356
"payload": request_payload,
5457
"requestMethod": "grpc",
@@ -74,6 +77,8 @@ def intercept_unary_unary(self, continuation, client_call_details, request):
7477
response_payload = type(result).to_json(result)
7578
elif isinstance(result, google.protobuf.message.Message):
7679
response_payload = MessageToJson(result)
80+
else:
81+
response_payload = f"{type(result).__name__}: {pickle.dumps(result)}"
7782
grpc_response = {
7883
"payload": response_payload,
7984
"metadata": metadata,

‎tests/integration/goldens/eventarc/google/cloud/eventarc_v1/services/eventarc/transports/grpc.py‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
# limitations under the License.
1515
#
1616
import logging as std_logging
17+
import pickle
1718
import warnings
1819
from typing import Callable, Dict, Optional, Sequence, Tuple, Union
1920

@@ -56,10 +57,12 @@ def intercept_unary_unary(self, continuation, client_call_details, request):
5657
logging_enabled = CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor(std_logging.DEBUG)
5758
if logging_enabled: # pragma: NO COVER
5859
request_metadata = client_call_details.metadata
59-
try:
60+
if isinstance(result, proto.Message):
6061
request_payload = type(request).to_json(request)
61-
except:
62+
elif isinstance(result, google.protobuf.message.Message):
6263
request_payload = MessageToJson(request)
64+
else:
65+
request_payload = f"{type(result).__name__}: {pickle.dumps(request)}"
6366
grpc_request = {
6467
"payload": request_payload,
6568
"requestMethod": "grpc",
@@ -85,6 +88,8 @@ def intercept_unary_unary(self, continuation, client_call_details, request):
8588
response_payload = type(result).to_json(result)
8689
elif isinstance(result, google.protobuf.message.Message):
8790
response_payload = MessageToJson(result)
91+
else:
92+
response_payload = f"{type(result).__name__}: {pickle.dumps(result)}"
8893
grpc_response = {
8994
"payload": response_payload,
9095
"metadata": metadata,

‎tests/integration/goldens/logging/google/cloud/logging_v2/services/config_service_v2/transports/grpc.py‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
# limitations under the License.
1515
#
1616
import logging as std_logging
17+
import pickle
1718
import warnings
1819
from typing import Callable, Dict, Optional, Sequence, Tuple, Union
1920

@@ -48,10 +49,12 @@ def intercept_unary_unary(self, continuation, client_call_details, request):
4849
logging_enabled = CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor(std_logging.DEBUG)
4950
if logging_enabled: # pragma: NO COVER
5051
request_metadata = client_call_details.metadata
51-
try:
52+
if isinstance(result, proto.Message):
5253
request_payload = type(request).to_json(request)
53-
except:
54+
elif isinstance(result, google.protobuf.message.Message):
5455
request_payload = MessageToJson(request)
56+
else:
57+
request_payload = f"{type(result).__name__}: {pickle.dumps(request)}"
5558
grpc_request = {
5659
"payload": request_payload,
5760
"requestMethod": "grpc",
@@ -77,6 +80,8 @@ def intercept_unary_unary(self, continuation, client_call_details, request):
7780
response_payload = type(result).to_json(result)
7881
elif isinstance(result, google.protobuf.message.Message):
7982
response_payload = MessageToJson(result)
83+
else:
84+
response_payload = f"{type(result).__name__}: {pickle.dumps(result)}"
8085
grpc_response = {
8186
"payload": response_payload,
8287
"metadata": metadata,

‎tests/integration/goldens/logging/google/cloud/logging_v2/services/logging_service_v2/transports/grpc.py‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
# limitations under the License.
1515
#
1616
import logging as std_logging
17+
import pickle
1718
import warnings
1819
from typing import Callable, Dict, Optional, Sequence, Tuple, Union
1920

@@ -47,10 +48,12 @@ def intercept_unary_unary(self, continuation, client_call_details, request):
4748
logging_enabled = CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor(std_logging.DEBUG)
4849
if logging_enabled: # pragma: NO COVER
4950
request_metadata = client_call_details.metadata
50-
try:
51+
if isinstance(result, proto.Message):
5152
request_payload = type(request).to_json(request)
52-
except:
53+
elif isinstance(result, google.protobuf.message.Message):
5354
request_payload = MessageToJson(request)
55+
else:
56+
request_payload = f"{type(result).__name__}: {pickle.dumps(request)}"
5457
grpc_request = {
5558
"payload": request_payload,
5659
"requestMethod": "grpc",
@@ -76,6 +79,8 @@ def intercept_unary_unary(self, continuation, client_call_details, request):
7679
response_payload = type(result).to_json(result)
7780
elif isinstance(result, google.protobuf.message.Message):
7881
response_payload = MessageToJson(result)
82+
else:
83+
response_payload = f"{type(result).__name__}: {pickle.dumps(result)}"
7984
grpc_response = {
8085
"payload": response_payload,
8186
"metadata": metadata,

‎tests/integration/goldens/logging/google/cloud/logging_v2/services/metrics_service_v2/transports/grpc.py‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
# limitations under the License.
1515
#
1616
import logging as std_logging
17+
import pickle
1718
import warnings
1819
from typing import Callable, Dict, Optional, Sequence, Tuple, Union
1920

@@ -47,10 +48,12 @@ def intercept_unary_unary(self, continuation, client_call_details, request):
4748
logging_enabled = CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor(std_logging.DEBUG)
4849
if logging_enabled: # pragma: NO COVER
4950
request_metadata = client_call_details.metadata
50-
try:
51+
if isinstance(result, proto.Message):
5152
request_payload = type(request).to_json(request)
52-
except:
53+
elif isinstance(result, google.protobuf.message.Message):
5354
request_payload = MessageToJson(request)
55+
else:
56+
request_payload = f"{type(result).__name__}: {pickle.dumps(request)}"
5457
grpc_request = {
5558
"payload": request_payload,
5659
"requestMethod": "grpc",
@@ -76,6 +79,8 @@ def intercept_unary_unary(self, continuation, client_call_details, request):
7679
response_payload = type(result).to_json(result)
7780
elif isinstance(result, google.protobuf.message.Message):
7881
response_payload = MessageToJson(result)
82+
else:
83+
response_payload = f"{type(result).__name__}: {pickle.dumps(result)}"
7984
grpc_response = {
8085
"payload": response_payload,
8186
"metadata": metadata,

‎tests/integration/goldens/redis/google/cloud/redis_v1/services/cloud_redis/transports/grpc.py‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
# limitations under the License.
1515
#
1616
import logging as std_logging
17+
import pickle
1718
import warnings
1819
from typing import Callable, Dict, Optional, Sequence, Tuple, Union
1920

@@ -48,10 +49,12 @@ def intercept_unary_unary(self, continuation, client_call_details, request):
4849
logging_enabled = CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor(std_logging.DEBUG)
4950
if logging_enabled: # pragma: NO COVER
5051
request_metadata = client_call_details.metadata
51-
try:
52+
if isinstance(result, proto.Message):
5253
request_payload = type(request).to_json(request)
53-
except:
54+
elif isinstance(result, google.protobuf.message.Message):
5455
request_payload = MessageToJson(request)
56+
else:
57+
request_payload = f"{type(result).__name__}: {pickle.dumps(request)}"
5558
grpc_request = {
5659
"payload": request_payload,
5760
"requestMethod": "grpc",
@@ -77,6 +80,8 @@ def intercept_unary_unary(self, continuation, client_call_details, request):
7780
response_payload = type(result).to_json(result)
7881
elif isinstance(result, google.protobuf.message.Message):
7982
response_payload = MessageToJson(result)
83+
else:
84+
response_payload = f"{type(result).__name__}: {pickle.dumps(result)}"
8085
grpc_response = {
8186
"payload": response_payload,
8287
"metadata": metadata,

0 commit comments

Comments
 (0)