From 7e2896b6310ffa444d3ba4725c940e0f1f10c9dc Mon Sep 17 00:00:00 2001
From: Jon Wayne Parrott <jonwayne@google.com>
Date: Mon, 12 Feb 2018 11:22:29 -0800
Subject: [PATCH 1/2] Remove gax usage from BigTable

---
 bigtable/google/cloud/bigtable/client.py | 12 ++++--------
 bigtable/setup.py                        |  1 -
 2 files changed, 4 insertions(+), 9 deletions(-)

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..eeca5ac66c14 100644
--- a/bigtable/setup.py
+++ b/bigtable/setup.py
@@ -53,7 +53,6 @@
 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',
 ]
 
 setup(

From 3c5b3b9dd34512a8936c9081bb8c489be400bced Mon Sep 17 00:00:00 2001
From: Jon Wayne Parrott <jonwayne@google.com>
Date: Mon, 12 Feb 2018 13:19:34 -0800
Subject: [PATCH 2/2] Fix setup.py to pull in grpc extra

---
 bigtable/setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bigtable/setup.py b/bigtable/setup.py
index eeca5ac66c14..a4dadf0e389c 100644
--- a/bigtable/setup.py
+++ b/bigtable/setup.py
@@ -52,7 +52,7 @@
 
 REQUIREMENTS = [
     'google-cloud-core >= 0.28.0, < 0.29dev',
-    'google-api-core >= 0.1.1, < 0.2.0dev',
+    'google-api-core[grpc] >= 0.1.1, < 0.2.0dev',
 ]
 
 setup(