Skip to content
This repository was archived by the owner on Mar 26, 2026. It is now read-only.

Commit 6a95d63

Browse files
partheaparthea
committed
update goldens
1 parent 27463b2 commit 6a95d63

8 files changed

Lines changed: 312 additions & 24 deletions

File tree

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

Lines changed: 38 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,41 @@
4545
_LOGGER = std_logging.getLogger(__name__)
4646

4747

48-
class _LoggingClientInterceptor(grpc.UnaryUnaryClientInterceptor): # pragma: NO COVER
48+
class _LoggingClientInterceptor(grpc.UnaryUnaryClientInterceptor, grpc.UnaryStreamClientInterceptor): # pragma: NO COVER
49+
def intercept_unary_stream(self, continuation, client_call_details, request):
50+
logging_enabled = CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor(std_logging.DEBUG)
51+
if logging_enabled: # pragma: NO COVER
52+
request_metadata = client_call_details.metadata
53+
if isinstance(request, proto.Message):
54+
request_payload = type(request).to_json(request)
55+
elif isinstance(request, google.protobuf.message.Message):
56+
request_payload = MessageToJson(request)
57+
else:
58+
request_payload = f"{type(request).__name__}: {pickle.dumps(request)}"
59+
60+
request_metadata = {
61+
key: value.decode("utf-8") if isinstance(value, bytes) else value
62+
for key, value in request_metadata
63+
}
64+
grpc_request = {
65+
"payload": request_payload,
66+
"requestMethod": "grpc",
67+
"metadata": dict(request_metadata),
68+
}
69+
method = str(client_call_details.method)
70+
_LOGGER.debug(
71+
f"Sending request for {method}",
72+
extra = {
73+
"serviceName": "google.logging.v2.ConfigServiceV2",
74+
"rpcName": method,
75+
"request": grpc_request,
76+
"metadata": grpc_request["metadata"],
77+
},
78+
)
79+
80+
response_it = continuation(client_call_details, request)
81+
return response_it
82+
4983
def intercept_unary_unary(self, continuation, client_call_details, request):
5084
logging_enabled = CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor(std_logging.DEBUG)
5185
if logging_enabled: # pragma: NO COVER
@@ -66,11 +100,12 @@ def intercept_unary_unary(self, continuation, client_call_details, request):
66100
"requestMethod": "grpc",
67101
"metadata": dict(request_metadata),
68102
}
103+
method = str(client_call_details.method)
69104
_LOGGER.debug(
70-
f"Sending request for {client_call_details.method}",
105+
f"Sending request for {method}",
71106
extra = {
72107
"serviceName": "google.logging.v2.ConfigServiceV2",
73-
"rpcName": client_call_details.method,
108+
"rpcName": method,
74109
"request": grpc_request,
75110
"metadata": grpc_request["metadata"],
76111
},

‎tests/integration/goldens/logging_internal/google/cloud/logging_v2/services/config_service_v2/transports/grpc_asyncio.py‎

Lines changed: 40 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,41 @@
4949
_LOGGER = std_logging.getLogger(__name__)
5050

5151

52-
class _LoggingClientAIOInterceptor(grpc.aio.UnaryUnaryClientInterceptor): # pragma: NO COVER
52+
class _LoggingClientAIOInterceptor(grpc.aio.UnaryUnaryClientInterceptor, grpc.aio.UnaryStreamClientInterceptor): # pragma: NO COVER
53+
async def intercept_unary_stream(self, continuation, client_call_details, request):
54+
logging_enabled = CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor(std_logging.DEBUG)
55+
if logging_enabled: # pragma: NO COVER
56+
request_metadata = client_call_details.metadata
57+
if isinstance(request, proto.Message):
58+
request_payload = type(request).to_json(request)
59+
elif isinstance(request, google.protobuf.message.Message):
60+
request_payload = MessageToJson(request)
61+
else:
62+
request_payload = f"{type(request).__name__}: {pickle.dumps(request)}"
63+
64+
request_metadata = {
65+
key: value.decode("utf-8") if isinstance(value, bytes) else value
66+
for key, value in request_metadata
67+
}
68+
grpc_request = {
69+
"payload": request_payload,
70+
"requestMethod": "grpc",
71+
"metadata": dict(request_metadata),
72+
}
73+
method = str(client_call_details.method)
74+
_LOGGER.debug(
75+
f"Sending request for {method}",
76+
extra = {
77+
"serviceName": "google.logging.v2.ConfigServiceV2",
78+
"rpcName": method,
79+
"request": grpc_request,
80+
"metadata": grpc_request["metadata"],
81+
},
82+
)
83+
84+
response_it = await continuation(client_call_details, request)
85+
return response_it
86+
5387
async def intercept_unary_unary(self, continuation, client_call_details, request):
5488
logging_enabled = CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor(std_logging.DEBUG)
5589
if logging_enabled: # pragma: NO COVER
@@ -70,15 +104,17 @@ async def intercept_unary_unary(self, continuation, client_call_details, request
70104
"requestMethod": "grpc",
71105
"metadata": dict(request_metadata),
72106
}
107+
method = str(client_call_details.method)
73108
_LOGGER.debug(
74-
f"Sending request for {client_call_details.method}",
109+
f"Sending request for {method}",
75110
extra = {
76111
"serviceName": "google.logging.v2.ConfigServiceV2",
77-
"rpcName": str(client_call_details.method),
112+
"rpcName": method,
78113
"request": grpc_request,
79114
"metadata": grpc_request["metadata"],
80115
},
81116
)
117+
82118
response = await continuation(client_call_details, request)
83119
if logging_enabled: # pragma: NO COVER
84120
response_metadata = await response.trailing_metadata()
@@ -302,6 +338,7 @@ def __init__(self, *,
302338

303339
self._interceptor = _LoggingClientAIOInterceptor()
304340
self._grpc_channel._unary_unary_interceptors.append(self._interceptor)
341+
self._grpc_channel._unary_stream_interceptors.append(self._interceptor)
305342
self._logged_channel = self._grpc_channel
306343
self._wrap_with_kind = "kind" in inspect.signature(gapic_v1.method_async.wrap_method).parameters
307344
# Wrap messages. This must be done after self._logged_channel exists

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

Lines changed: 38 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,41 @@
4444
_LOGGER = std_logging.getLogger(__name__)
4545

4646

47-
class _LoggingClientInterceptor(grpc.UnaryUnaryClientInterceptor): # pragma: NO COVER
47+
class _LoggingClientInterceptor(grpc.UnaryUnaryClientInterceptor, grpc.UnaryStreamClientInterceptor): # pragma: NO COVER
48+
def intercept_unary_stream(self, continuation, client_call_details, request):
49+
logging_enabled = CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor(std_logging.DEBUG)
50+
if logging_enabled: # pragma: NO COVER
51+
request_metadata = client_call_details.metadata
52+
if isinstance(request, proto.Message):
53+
request_payload = type(request).to_json(request)
54+
elif isinstance(request, google.protobuf.message.Message):
55+
request_payload = MessageToJson(request)
56+
else:
57+
request_payload = f"{type(request).__name__}: {pickle.dumps(request)}"
58+
59+
request_metadata = {
60+
key: value.decode("utf-8") if isinstance(value, bytes) else value
61+
for key, value in request_metadata
62+
}
63+
grpc_request = {
64+
"payload": request_payload,
65+
"requestMethod": "grpc",
66+
"metadata": dict(request_metadata),
67+
}
68+
method = str(client_call_details.method)
69+
_LOGGER.debug(
70+
f"Sending request for {method}",
71+
extra = {
72+
"serviceName": "google.logging.v2.LoggingServiceV2",
73+
"rpcName": method,
74+
"request": grpc_request,
75+
"metadata": grpc_request["metadata"],
76+
},
77+
)
78+
79+
response_it = continuation(client_call_details, request)
80+
return response_it
81+
4882
def intercept_unary_unary(self, continuation, client_call_details, request):
4983
logging_enabled = CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor(std_logging.DEBUG)
5084
if logging_enabled: # pragma: NO COVER
@@ -65,11 +99,12 @@ def intercept_unary_unary(self, continuation, client_call_details, request):
6599
"requestMethod": "grpc",
66100
"metadata": dict(request_metadata),
67101
}
102+
method = str(client_call_details.method)
68103
_LOGGER.debug(
69-
f"Sending request for {client_call_details.method}",
104+
f"Sending request for {method}",
70105
extra = {
71106
"serviceName": "google.logging.v2.LoggingServiceV2",
72-
"rpcName": client_call_details.method,
107+
"rpcName": method,
73108
"request": grpc_request,
74109
"metadata": grpc_request["metadata"],
75110
},

‎tests/integration/goldens/logging_internal/google/cloud/logging_v2/services/logging_service_v2/transports/grpc_asyncio.py‎

Lines changed: 40 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,41 @@
4848
_LOGGER = std_logging.getLogger(__name__)
4949

5050

51-
class _LoggingClientAIOInterceptor(grpc.aio.UnaryUnaryClientInterceptor): # pragma: NO COVER
51+
class _LoggingClientAIOInterceptor(grpc.aio.UnaryUnaryClientInterceptor, grpc.aio.UnaryStreamClientInterceptor): # pragma: NO COVER
52+
async def intercept_unary_stream(self, continuation, client_call_details, request):
53+
logging_enabled = CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor(std_logging.DEBUG)
54+
if logging_enabled: # pragma: NO COVER
55+
request_metadata = client_call_details.metadata
56+
if isinstance(request, proto.Message):
57+
request_payload = type(request).to_json(request)
58+
elif isinstance(request, google.protobuf.message.Message):
59+
request_payload = MessageToJson(request)
60+
else:
61+
request_payload = f"{type(request).__name__}: {pickle.dumps(request)}"
62+
63+
request_metadata = {
64+
key: value.decode("utf-8") if isinstance(value, bytes) else value
65+
for key, value in request_metadata
66+
}
67+
grpc_request = {
68+
"payload": request_payload,
69+
"requestMethod": "grpc",
70+
"metadata": dict(request_metadata),
71+
}
72+
method = str(client_call_details.method)
73+
_LOGGER.debug(
74+
f"Sending request for {method}",
75+
extra = {
76+
"serviceName": "google.logging.v2.LoggingServiceV2",
77+
"rpcName": method,
78+
"request": grpc_request,
79+
"metadata": grpc_request["metadata"],
80+
},
81+
)
82+
83+
response_it = await continuation(client_call_details, request)
84+
return response_it
85+
5286
async def intercept_unary_unary(self, continuation, client_call_details, request):
5387
logging_enabled = CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor(std_logging.DEBUG)
5488
if logging_enabled: # pragma: NO COVER
@@ -69,15 +103,17 @@ async def intercept_unary_unary(self, continuation, client_call_details, request
69103
"requestMethod": "grpc",
70104
"metadata": dict(request_metadata),
71105
}
106+
method = str(client_call_details.method)
72107
_LOGGER.debug(
73-
f"Sending request for {client_call_details.method}",
108+
f"Sending request for {method}",
74109
extra = {
75110
"serviceName": "google.logging.v2.LoggingServiceV2",
76-
"rpcName": str(client_call_details.method),
111+
"rpcName": method,
77112
"request": grpc_request,
78113
"metadata": grpc_request["metadata"],
79114
},
80115
)
116+
81117
response = await continuation(client_call_details, request)
82118
if logging_enabled: # pragma: NO COVER
83119
response_metadata = await response.trailing_metadata()
@@ -300,6 +336,7 @@ def __init__(self, *,
300336

301337
self._interceptor = _LoggingClientAIOInterceptor()
302338
self._grpc_channel._unary_unary_interceptors.append(self._interceptor)
339+
self._grpc_channel._unary_stream_interceptors.append(self._interceptor)
303340
self._logged_channel = self._grpc_channel
304341
self._wrap_with_kind = "kind" in inspect.signature(gapic_v1.method_async.wrap_method).parameters
305342
# Wrap messages. This must be done after self._logged_channel exists

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

Lines changed: 38 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,41 @@
4444
_LOGGER = std_logging.getLogger(__name__)
4545

4646

47-
class _LoggingClientInterceptor(grpc.UnaryUnaryClientInterceptor): # pragma: NO COVER
47+
class _LoggingClientInterceptor(grpc.UnaryUnaryClientInterceptor, grpc.UnaryStreamClientInterceptor): # pragma: NO COVER
48+
def intercept_unary_stream(self, continuation, client_call_details, request):
49+
logging_enabled = CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor(std_logging.DEBUG)
50+
if logging_enabled: # pragma: NO COVER
51+
request_metadata = client_call_details.metadata
52+
if isinstance(request, proto.Message):
53+
request_payload = type(request).to_json(request)
54+
elif isinstance(request, google.protobuf.message.Message):
55+
request_payload = MessageToJson(request)
56+
else:
57+
request_payload = f"{type(request).__name__}: {pickle.dumps(request)}"
58+
59+
request_metadata = {
60+
key: value.decode("utf-8") if isinstance(value, bytes) else value
61+
for key, value in request_metadata
62+
}
63+
grpc_request = {
64+
"payload": request_payload,
65+
"requestMethod": "grpc",
66+
"metadata": dict(request_metadata),
67+
}
68+
method = str(client_call_details.method)
69+
_LOGGER.debug(
70+
f"Sending request for {method}",
71+
extra = {
72+
"serviceName": "google.logging.v2.MetricsServiceV2",
73+
"rpcName": method,
74+
"request": grpc_request,
75+
"metadata": grpc_request["metadata"],
76+
},
77+
)
78+
79+
response_it = continuation(client_call_details, request)
80+
return response_it
81+
4882
def intercept_unary_unary(self, continuation, client_call_details, request):
4983
logging_enabled = CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor(std_logging.DEBUG)
5084
if logging_enabled: # pragma: NO COVER
@@ -65,11 +99,12 @@ def intercept_unary_unary(self, continuation, client_call_details, request):
6599
"requestMethod": "grpc",
66100
"metadata": dict(request_metadata),
67101
}
102+
method = str(client_call_details.method)
68103
_LOGGER.debug(
69-
f"Sending request for {client_call_details.method}",
104+
f"Sending request for {method}",
70105
extra = {
71106
"serviceName": "google.logging.v2.MetricsServiceV2",
72-
"rpcName": client_call_details.method,
107+
"rpcName": method,
73108
"request": grpc_request,
74109
"metadata": grpc_request["metadata"],
75110
},

‎tests/integration/goldens/logging_internal/google/cloud/logging_v2/services/metrics_service_v2/transports/grpc_asyncio.py‎

Lines changed: 40 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,41 @@
4848
_LOGGER = std_logging.getLogger(__name__)
4949

5050

51-
class _LoggingClientAIOInterceptor(grpc.aio.UnaryUnaryClientInterceptor): # pragma: NO COVER
51+
class _LoggingClientAIOInterceptor(grpc.aio.UnaryUnaryClientInterceptor, grpc.aio.UnaryStreamClientInterceptor): # pragma: NO COVER
52+
async def intercept_unary_stream(self, continuation, client_call_details, request):
53+
logging_enabled = CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor(std_logging.DEBUG)
54+
if logging_enabled: # pragma: NO COVER
55+
request_metadata = client_call_details.metadata
56+
if isinstance(request, proto.Message):
57+
request_payload = type(request).to_json(request)
58+
elif isinstance(request, google.protobuf.message.Message):
59+
request_payload = MessageToJson(request)
60+
else:
61+
request_payload = f"{type(request).__name__}: {pickle.dumps(request)}"
62+
63+
request_metadata = {
64+
key: value.decode("utf-8") if isinstance(value, bytes) else value
65+
for key, value in request_metadata
66+
}
67+
grpc_request = {
68+
"payload": request_payload,
69+
"requestMethod": "grpc",
70+
"metadata": dict(request_metadata),
71+
}
72+
method = str(client_call_details.method)
73+
_LOGGER.debug(
74+
f"Sending request for {method}",
75+
extra = {
76+
"serviceName": "google.logging.v2.MetricsServiceV2",
77+
"rpcName": method,
78+
"request": grpc_request,
79+
"metadata": grpc_request["metadata"],
80+
},
81+
)
82+
83+
response_it = await continuation(client_call_details, request)
84+
return response_it
85+
5286
async def intercept_unary_unary(self, continuation, client_call_details, request):
5387
logging_enabled = CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor(std_logging.DEBUG)
5488
if logging_enabled: # pragma: NO COVER
@@ -69,15 +103,17 @@ async def intercept_unary_unary(self, continuation, client_call_details, request
69103
"requestMethod": "grpc",
70104
"metadata": dict(request_metadata),
71105
}
106+
method = str(client_call_details.method)
72107
_LOGGER.debug(
73-
f"Sending request for {client_call_details.method}",
108+
f"Sending request for {method}",
74109
extra = {
75110
"serviceName": "google.logging.v2.MetricsServiceV2",
76-
"rpcName": str(client_call_details.method),
111+
"rpcName": method,
77112
"request": grpc_request,
78113
"metadata": grpc_request["metadata"],
79114
},
80115
)
116+
81117
response = await continuation(client_call_details, request)
82118
if logging_enabled: # pragma: NO COVER
83119
response_metadata = await response.trailing_metadata()
@@ -300,6 +336,7 @@ def __init__(self, *,
300336

301337
self._interceptor = _LoggingClientAIOInterceptor()
302338
self._grpc_channel._unary_unary_interceptors.append(self._interceptor)
339+
self._grpc_channel._unary_stream_interceptors.append(self._interceptor)
303340
self._logged_channel = self._grpc_channel
304341
self._wrap_with_kind = "kind" in inspect.signature(gapic_v1.method_async.wrap_method).parameters
305342
# Wrap messages. This must be done after self._logged_channel exists

0 commit comments

Comments
 (0)