From 8ada5e0a605457c8bca6d1939123e765f84ed48d Mon Sep 17 00:00:00 2001 From: larkee Date: Thu, 18 Nov 2021 13:13:23 +1100 Subject: [PATCH 1/4] perf(dbapi): set headers correctly for dynamic routing --- google/cloud/spanner_dbapi/connection.py | 4 +++- google/cloud/spanner_dbapi/version.py | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/google/cloud/spanner_dbapi/connection.py b/google/cloud/spanner_dbapi/connection.py index e6d1d64db1..291103ffcd 100644 --- a/google/cloud/spanner_dbapi/connection.py +++ b/google/cloud/spanner_dbapi/connection.py @@ -531,7 +531,9 @@ def connect( """ client_info = ClientInfo( - user_agent=user_agent or DEFAULT_USER_AGENT, python_version=PY_VERSION + user_agent=user_agent or DEFAULT_USER_AGENT, + python_version=PY_VERSION, + client_library_version=spanner.__version__ ) if isinstance(credentials, str): diff --git a/google/cloud/spanner_dbapi/version.py b/google/cloud/spanner_dbapi/version.py index 63bd687feb..e75d5da91b 100644 --- a/google/cloud/spanner_dbapi/version.py +++ b/google/cloud/spanner_dbapi/version.py @@ -17,4 +17,4 @@ PY_VERSION = platform.python_version() VERSION = pkg_resources.get_distribution("google-cloud-spanner").version -DEFAULT_USER_AGENT = "dbapi/" + VERSION +DEFAULT_USER_AGENT = "gl-dbapi/" + VERSION From 057810cc79c371487db2ca7e0689ebe68004fd94 Mon Sep 17 00:00:00 2001 From: Owl Bot Date: Thu, 18 Nov 2021 02:17:26 +0000 Subject: [PATCH 2/4] =?UTF-8?q?=F0=9F=A6=89=20Updates=20from=20OwlBot?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --- google/cloud/spanner_dbapi/connection.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google/cloud/spanner_dbapi/connection.py b/google/cloud/spanner_dbapi/connection.py index 291103ffcd..e70141a3dd 100644 --- a/google/cloud/spanner_dbapi/connection.py +++ b/google/cloud/spanner_dbapi/connection.py @@ -533,7 +533,7 @@ def connect( client_info = ClientInfo( user_agent=user_agent or DEFAULT_USER_AGENT, python_version=PY_VERSION, - client_library_version=spanner.__version__ + client_library_version=spanner.__version__, ) if isinstance(credentials, str): From ee3f5ebdb83d1eb27a0686f22edb13539b794c5e Mon Sep 17 00:00:00 2001 From: larkee Date: Thu, 18 Nov 2021 13:24:26 +1100 Subject: [PATCH 3/4] test: update connect test --- tests/system/test_dbapi.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/system/test_dbapi.py b/tests/system/test_dbapi.py index d0ad26e79f..734b7d9a61 100644 --- a/tests/system/test_dbapi.py +++ b/tests/system/test_dbapi.py @@ -409,7 +409,11 @@ def test_user_agent(shared_instance, dbapi_database): conn = connect(shared_instance.name, dbapi_database.name) assert ( conn.instance._client._client_info.user_agent - == "dbapi/" + pkg_resources.get_distribution("google-cloud-spanner").version + == "gl-dbapi/" + pkg_resources.get_distribution("google-cloud-spanner").version + ) + assert ( + conn.instance._client._client_info.client_library_version + == pkg_resources.get_distribution("google-cloud-spanner").version ) From 76f044487005bc54242c65c22f37132ca91e4ecf Mon Sep 17 00:00:00 2001 From: Owl Bot Date: Thu, 18 Nov 2021 02:29:01 +0000 Subject: [PATCH 4/4] =?UTF-8?q?=F0=9F=A6=89=20Updates=20from=20OwlBot?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --- tests/system/test_dbapi.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/system/test_dbapi.py b/tests/system/test_dbapi.py index 734b7d9a61..0f06217a00 100644 --- a/tests/system/test_dbapi.py +++ b/tests/system/test_dbapi.py @@ -412,8 +412,8 @@ def test_user_agent(shared_instance, dbapi_database): == "gl-dbapi/" + pkg_resources.get_distribution("google-cloud-spanner").version ) assert ( - conn.instance._client._client_info.client_library_version - == pkg_resources.get_distribution("google-cloud-spanner").version + conn.instance._client._client_info.client_library_version + == pkg_resources.get_distribution("google-cloud-spanner").version )