Skip to content

Commit 20e4bea

Browse files
committed
feat(generator): use setup_request_id from api_core
1 parent df0541a commit 20e4bea

2 files changed

Lines changed: 16 additions & 0 deletions

File tree

  • packages/gapic-generator
    • gapic/templates/%namespace/%name_%version/%sub/services/%service
    • tests/integration/goldens/storagebatchoperations/google/cloud/storagebatchoperations_v1/services/storage_batch_operations

packages/gapic-generator/gapic/templates/%namespace/%name_%version/%sub/services/%service/client.py.j2

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -463,6 +463,14 @@ class {{ service.client_name }}(metaclass={{ service.client_name }}Meta):
463463
field_name (str): The name of the field to populate.
464464
is_proto3_optional (bool): Whether the field is proto3 optional.
465465
"""
466+
try:
467+
from google.api_core.gapic_v1.routing_header import setup_request_id
468+
return setup_request_id(request, field_name, is_proto3_optional)
469+
except ImportError:
470+
pass
471+
472+
# TODO(issue #17813): remove fallback once google-api-core >= 2.26.0 is required
473+
# pragma: NO COVER
466474
if isinstance(request, dict):
467475
if is_proto3_optional:
468476
if field_name not in request:

packages/gapic-generator/tests/integration/goldens/storagebatchoperations/google/cloud/storagebatchoperations_v1/services/storage_batch_operations/client.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -480,6 +480,14 @@ def _setup_request_id(request, field_name: str, is_proto3_optional: bool):
480480
field_name (str): The name of the field to populate.
481481
is_proto3_optional (bool): Whether the field is proto3 optional.
482482
"""
483+
try:
484+
from google.api_core.gapic_v1.routing_header import setup_request_id
485+
return setup_request_id(request, field_name, is_proto3_optional)
486+
except ImportError:
487+
pass
488+
489+
# TODO(issue #17813): remove fallback once google-api-core >= 2.26.0 is required
490+
# pragma: NO COVER
483491
if isinstance(request, dict):
484492
if is_proto3_optional:
485493
if field_name not in request:

0 commit comments

Comments
 (0)