diff --git a/bigtable/google/cloud/bigtable/client.py b/bigtable/google/cloud/bigtable/client.py index b30ed1aefb36..454cb1816e55 100644 --- a/bigtable/google/cloud/bigtable/client.py +++ b/bigtable/google/cloud/bigtable/client.py @@ -31,7 +31,7 @@ import os -from google.gax.utils import metrics +from google.api_core import gapic_v1 from google.longrunning import operations_grpc from google.cloud._helpers import make_insecure_stub @@ -67,13 +67,9 @@ READ_ONLY_SCOPE = 'https://www.googleapis.com/auth/bigtable.data.readonly' """Scope for reading table data.""" -_METRICS_HEADERS = ( - ('gccl', __version__), -) -_HEADER_STR = metrics.stringify(metrics.fill(_METRICS_HEADERS)) -_GRPC_EXTRA_OPTIONS = ( - ('x-goog-api-client', _HEADER_STR), -) +_CLIENT_INFO = gapic_v1.client_info.ClientInfo( + client_library_version=__version__,) +_GRPC_EXTRA_OPTIONS = (_CLIENT_INFO.to_grpc_metadata(),) # NOTE: 'grpc.max_message_length' will no longer be recognized in # grpcio 1.1 and later. _MAX_MSG_LENGTH_100MB = 100 * 1024 * 1024 diff --git a/bigtable/setup.py b/bigtable/setup.py index fdd2cc1e16c6..a4dadf0e389c 100644 --- a/bigtable/setup.py +++ b/bigtable/setup.py @@ -52,8 +52,7 @@ REQUIREMENTS = [ 'google-cloud-core >= 0.28.0, < 0.29dev', - 'google-api-core >= 0.1.1, < 0.2.0dev', - 'google-gax >= 0.15.7, < 0.16dev', + 'google-api-core[grpc] >= 0.1.1, < 0.2.0dev', ] setup(