Skip to content

tests: handle internal metadata changes in google-api-core #18037

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

Merged
parthea merged 1 commit into from
Aug 10, 2026
+15 −5
Merged

tests: handle internal metadata changes in google-api-core #18037

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 8 additions & 3 deletions packages/google-cloud-pubsub/tests/unit/pubsub_v1/publisher/test_publisher_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@
from google.api_core import retry as retries
from google.api_core.gapic_v1.client_info import METRICS_METADATA_KEY
from google.api_core.timeout import ConstantTimeout
from opentelemetry import trace

from google.cloud.pubsub_v1 import publisher, types
from google.cloud.pubsub_v1.open_telemetry.context_propagation import (
OpenTelemetryContextSetter,
Expand All @@ -41,6 +39,7 @@
from google.pubsub_v1 import types as gapic_types
from google.pubsub_v1.services.publisher import client as publisher_client
from google.pubsub_v1.services.publisher.transports.grpc import PublisherGrpcTransport
from opentelemetry import trace

C = TypeVar("C", bound=Callable[..., Any])
typed_flaky = cast(Callable[[C], C], flaky(max_runs=5, min_passes=1))
Expand Down Expand Up @@ -119,10 +118,16 @@ def test_init_default_client_info(creds):
expected_client_info = f"gccl/{installed_version}"

for wrapped_method in client.transport._wrapped_methods.values():
# Handle internal changes in google-api-core _GapicCallable
metadata = getattr(
wrapped_method,
"_metadata",
getattr(wrapped_method, "_default_metadata", []),
)
user_agent = next(
(
header_value
for header, header_value in wrapped_method._metadata
for header, header_value in metadata
if header == METRICS_METADATA_KEY
),
None, # pragma: NO COVER
Expand Down
9 changes: 7 additions & 2 deletions packages/google-cloud-pubsub/tests/unit/pubsub_v1/subscriber/test_subscriber_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
import grpc
import pytest
from google.api_core.gapic_v1.client_info import METRICS_METADATA_KEY

from google.cloud.pubsub_v1 import subscriber, types
from google.cloud.pubsub_v1.open_telemetry.context_propagation import (
OpenTelemetryContextGetter,
Expand Down Expand Up @@ -46,10 +45,16 @@ def test_init_default_client_info(creds):
expected_client_info = f"gccl/{installed_version}"

for wrapped_method in client.transport._wrapped_methods.values():
# Handle internal changes in google-api-core _GapicCallable
metadata = getattr(
wrapped_method,
"_metadata",
getattr(wrapped_method, "_default_metadata", []),
)
user_agent = next(
(
header_value
for header, header_value in wrapped_method._metadata
for header, header_value in metadata
if header == METRICS_METADATA_KEY
),
None, # pragma: NO COVER
Expand Down
Loading