google
diff --git a/‎spanner_orm/admin/api.py‎
Lines changed: 12 additions & 6 deletions b/‎spanner_orm/admin/api.py‎
Lines changed: 12 additions & 6 deletions
diff --git a/‎spanner_orm/api.py‎
Lines changed: 23 additions & 7 deletions b/‎spanner_orm/api.py‎
Lines changed: 23 additions & 7 deletions
diff --git a/‎spanner_orm/tests/api_test.py‎
Lines changed: 33 additions & 0 deletions b/‎spanner_orm/tests/api_test.py‎
Lines changed: 33 additions & 0 deletions
@@ -13,15 +13,15 @@
 # limitations under the License.
 """Class that handles API calls to Spanner that deal with table metadata."""
 
-from typing import Iterable, Optional
+from typing import Any, Dict, Iterable, Optional, Union
 import warnings
 
-from spanner_orm import api
-from spanner_orm import error
-
+from google.api_core import client_options as api_client_options
 from google.auth import credentials as auth_credentials
 from google.cloud.spanner_v1 import database as spanner_database
 from google.cloud.spanner_v1 import pool as spanner_pool
+from spanner_orm import api
+from spanner_orm import error
 
 
 class SpannerAdminApi(api.SpannerReadApi, api.SpannerWriteApi):
@@ -58,7 +58,11 @@ def connect(instance: str,
             project: Optional[str] = None,
             credentials: Optional[auth_credentials.Credentials] = None,
             pool: Optional[spanner_pool.AbstractSessionPool] = None,
-            create_ddl: Optional[Iterable[str]] = None) -> SpannerAdminApi:
+            create_ddl: Optional[Iterable[str]] = None,
+            *,
+            client_options: Union[api_client_options.ClientOptions,
+                                  Dict[Any, Any], None] = None,
+            disable_builtin_metrics: Optional[bool] = None) -> SpannerAdminApi:
   """Connects the global Spanner admin API to a Spanner database.
 
   Deprecated in favor of from_connection().
@@ -72,7 +76,9 @@ def connect(instance: str,
       project=project,
       credentials=credentials,
       pool=pool,
-      create_ddl=create_ddl)
+      create_ddl=create_ddl,
+      client_options=client_options,
+      disable_builtin_metrics=disable_builtin_metrics)
   return from_connection(connection)
 
 
 
@@ -117,6 +117,7 @@ def __init__(
       *,
       client_options: Union[api_client_options.ClientOptions, Dict[Any, Any],
                             None] = None,
+      disable_builtin_metrics: Optional[bool] = None,
   ):
     """Connects to the specified Spanner database."""
     self._instance = instance
@@ -126,15 +127,20 @@ def __init__(
     self._pool = pool
     self._create_ddl = create_ddl
     self._client_options = client_options
+    self._disable_builtin_metrics = disable_builtin_metrics
     self.connect()
 
   def connect(self):
     """Establish a new connection to the specified Spanner database."""
-    client = spanner.Client(
-        project=self._project,
-        credentials=self._credentials,
-        client_options=self._client_options,
-    )
+    client_kwargs = {
+        'project': self._project,
+        'credentials': self._credentials,
+        'client_options': self._client_options,
+    }
+    if self._disable_builtin_metrics is not None:
+      client_kwargs['disable_builtin_metrics'] = self._disable_builtin_metrics
+
+    client = spanner.Client(**client_kwargs)
     instance = client.instance(self._instance)
     self.database = instance.database(
         self._database, pool=self._pool, ddl_statements=self._create_ddl or ())
@@ -164,7 +170,11 @@ def connect(
     database: str,
     project: Optional[str] = None,
     credentials: Optional[auth_credentials.Credentials] = None,
-    pool: Optional[spanner_pool.AbstractSessionPool] = None) -> SpannerApi:
+    pool: Optional[spanner_pool.AbstractSessionPool] = None,
+    *,
+    client_options: Union[api_client_options.ClientOptions, Dict[Any, Any],
+                          None] = None,
+    disable_builtin_metrics: Optional[bool] = None) -> SpannerApi:
   """Connects to the Spanner database and sets the global spanner_api.
 
   Deprecated in favor of from_connection().
@@ -174,7 +184,13 @@ def connect(
           'Please use '
           'spanner_orm.from_connection(spanner_orm.SpannerConnection(...))'))
   connection = SpannerConnection(
-      instance, database, project=project, credentials=credentials, pool=pool)
+      instance,
+      database,
+      project=project,
+      credentials=credentials,
+      pool=pool,
+      client_options=client_options,
+      disable_builtin_metrics=disable_builtin_metrics)
   return from_connection(connection)
 
 
 
@@ -73,6 +73,39 @@ def test_connection_args(self, client):
         client.mock_calls,
     )
 
+  @mock.patch.object(spanner, 'Client', autospec=True, spec_set=True)
+  def test_connection_args_with_disable_builtin_metrics(self, client):
+    client.return_value.instance.return_value.database.return_value = (
+        'fake-database')
+    connection = api.SpannerConnection(
+        instance='some-instance',
+        database='some-database',
+        project='some-project',
+        credentials='fake-credentials',
+        pool='fake-pool',
+        create_ddl=('fake-ddl',),
+        client_options=dict(fake='options'),
+        disable_builtin_metrics=True,
+    )
+    self.assertEqual('fake-database', connection.database)
+    self.assertSequenceEqual(
+        (
+            mock.call(
+                project='some-project',
+                credentials='fake-credentials',
+                client_options=dict(fake='options'),
+                disable_builtin_metrics=True,
+            ),
+            mock.call().instance('some-instance'),
+            mock.call().instance().database(
+                'some-database',
+                pool='fake-pool',
+                ddl_statements=('fake-ddl',),
+            ),
+        ),
+        client.mock_calls,
+    )
+
   @mock.patch('google.cloud.spanner.Client')
   def test_api_connection(self, client):
     connection = self.mock_connection(client)