feat: setup SQLCommenter and allow client metadata by AjmeraParth132 · Pull Request #3064 · googleapis/mcp-toolbox

AjmeraParth132 · 2026-04-15T07:38:07Z

Description

Currently, there's no way to correlate a SQL query back to the LLM tool invocation, client, or distributed trace that triggered it. The observability chain breaks at the Toolbox server boundary.

PR Checklist

Make sure you reviewed
CONTRIBUTING.md
Make sure to open an issue as a
bug/issue
before writing your code! That way we can discuss the change, evaluate
designs, and agree on the general idea
Ensure the tests and linter pass
Code coverage does not decrease (if any source code was changed)
Appropriate docs were updated (if necessary)
Make sure to add ! if this involve a breaking change

🛠️ Fixes #3061

gemini-code-assist

Code Review

This pull request introduces SQLCommenter support to the MCP Toolbox, allowing SQL statements to be annotated with metadata such as trace information, client attributes, and server versions. The changes include a new sqlcommenter package, updates to various database source implementations to append these comments, and new configuration flags to enable the feature. A critical issue was identified in the sqlcommenter implementation where the comment format and separators did not align with the standard SQLCommenter specification or the provided unit tests; specifically, it used colons and semicolons instead of the required equals signs and commas.

anubhav756 · 2026-04-15T07:58:55Z

/gcbrun

anubhav756 · 2026-04-15T19:39:29Z

/gcbrun

anubhav756 · 2026-04-15T19:44:07Z

/gcbrun

anubhav756 · 2026-04-22T14:11:09Z

/gcbrun

anubhav756 · 2026-05-12T06:02:45Z

/gcbrun

anubhav756 · 2026-05-13T15:28:55Z

/gcbrun

twishabansal · 2026-05-14T15:14:52Z

@anubhav756 gave the quick approval. Please let me know if you need thorough review

anubhav756 · 2026-05-15T10:57:00Z

/gcbrun

anubhav756 · 2026-05-18T14:13:06Z

/gcbrun

anubhav756 · 2026-05-18T16:37:52Z

@AjmeraParth132 Could you PTAL at this lint failure? Thanks! :)

  Error: internal/util/util.go:255:1: File is not properly formatted (goimports)
  }
  ^
  1 issues:
  * goimports: 1
  
  Error: issues found

anubhav756 · 2026-05-18T17:27:37Z

/gcbrun

anubhav756 · 2026-05-18T17:58:57Z

/gcbrun

## Description > Currently, there's no way to correlate a SQL query back to the LLM tool invocation, client, or distributed trace that triggered it. The observability chain breaks at the Toolbox server boundary. ## PR Checklist - [x] Make sure you reviewed [CONTRIBUTING.md](https://github.com/googleapis/mcp-toolbox/blob/main/CONTRIBUTING.md) - [x] Make sure to open an issue as a [bug/issue](https://github.com/googleapis/mcp-toolbox/issues/new/choose) before writing your code! That way we can discuss the change, evaluate designs, and agree on the general idea - [x] Ensure the tests and linter pass - [x] Code coverage does not decrease (if any source code was changed) - [x] Appropriate docs were updated (if necessary) - [ ] Make sure to add `!` if this involve a breaking change 🛠️ Fixes googleapis#3061

🤖 I have created a release *beep* *boop* --- ## [1.3.0](v1.2.0...v1.3.0) (2026-05-21) ### Features * **auth:** Implement MCP auth tool-level scopes validation ([#3049](#3049)) ([c528985](c528985)) * **looker:** Propagate client IP from incoming MCP requests to downstream SDK calls ([#3253](#3253)) ([75da6c2](75da6c2)) * Setup SQLCommenter and allow client metadata ([#3064](#3064)) ([9f1f9b3](9f1f9b3)) * **tool/cloudsqladmin:** Add `cloud-sql-admin-execute-sql-many` and `cloud-sql-admin-sql-many` ([#3083](#3083)) ([ef300a8](ef300a8)) ### Bug Fixes * **auth/generic:** Fix generic auth expiration field and integration with `authRequired` ([#3251](#3251)) ([f4d16c0](f4d16c0)) * Enforce toolset/promptset boundary on tools/call and prompts/get ([#3036](#3036)) ([c739b80](c739b80)) * **tools/http:** Prevent path traversal and base path scope escape ([#3218](#3218)) ([80a6602](80a6602)) * **tools/looker:** Return a 401 error to MCP client when Looker returns a 401 ([#3233](#3233)) ([4f409a3](4f409a3)) * **tools/looker:** Strip wrapping quotes from filter values for unquoted parameters ([#3273](#3273)) ([1e3de96](1e3de96)) * **tools:** Initialize query result slices to empty array ([#3250](#3250)) ([60ddf48](60ddf48)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> Co-authored-by: Yuan Teoh <45984206+Yuan325@users.noreply.github.com>

🤖 I have created a release *beep* *boop* --- ## [1.3.0](v1.2.0...v1.3.0) (2026-05-21) ### Features * **auth:** Implement MCP auth tool-level scopes validation ([#3049](#3049)) ([c528985](c528985)) * **looker:** Propagate client IP from incoming MCP requests to downstream SDK calls ([#3253](#3253)) ([75da6c2](75da6c2)) * Setup SQLCommenter and allow client metadata ([#3064](#3064)) ([9f1f9b3](9f1f9b3)) * **tool/cloudsqladmin:** Add `cloud-sql-admin-execute-sql-many` and `cloud-sql-admin-sql-many` ([#3083](#3083)) ([ef300a8](ef300a8)) ### Bug Fixes * **auth/generic:** Fix generic auth expiration field and integration with `authRequired` ([#3251](#3251)) ([f4d16c0](f4d16c0)) * Enforce toolset/promptset boundary on tools/call and prompts/get ([#3036](#3036)) ([c739b80](c739b80)) * **tools/http:** Prevent path traversal and base path scope escape ([#3218](#3218)) ([80a6602](80a6602)) * **tools/looker:** Return a 401 error to MCP client when Looker returns a 401 ([#3233](#3233)) ([4f409a3](4f409a3)) * **tools/looker:** Strip wrapping quotes from filter values for unquoted parameters ([#3273](#3273)) ([1e3de96](1e3de96)) * **tools:** Initialize query result slices to empty array ([#3250](#3250)) ([60ddf48](60ddf48)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> Co-authored-by: Yuan Teoh <45984206+Yuan325@users.noreply.github.com> b001006

🤖 I have created a release *beep* *boop* --- ## [1.3.0](googleapis/mcp-toolbox@v1.2.0...v1.3.0) (2026-05-21) ### Features * **auth:** Implement MCP auth tool-level scopes validation ([googleapis#3049](googleapis#3049)) ([c528985](googleapis@c528985)) * **looker:** Propagate client IP from incoming MCP requests to downstream SDK calls ([googleapis#3253](googleapis#3253)) ([75da6c2](googleapis@75da6c2)) * Setup SQLCommenter and allow client metadata ([googleapis#3064](googleapis#3064)) ([9f1f9b3](googleapis@9f1f9b3)) * **tool/cloudsqladmin:** Add `cloud-sql-admin-execute-sql-many` and `cloud-sql-admin-sql-many` ([googleapis#3083](googleapis#3083)) ([ef300a8](googleapis@ef300a8)) ### Bug Fixes * **auth/generic:** Fix generic auth expiration field and integration with `authRequired` ([googleapis#3251](googleapis#3251)) ([f4d16c0](googleapis@f4d16c0)) * Enforce toolset/promptset boundary on tools/call and prompts/get ([googleapis#3036](googleapis#3036)) ([c739b80](googleapis@c739b80)) * **tools/http:** Prevent path traversal and base path scope escape ([googleapis#3218](googleapis#3218)) ([80a6602](googleapis@80a6602)) * **tools/looker:** Return a 401 error to MCP client when Looker returns a 401 ([googleapis#3233](googleapis#3233)) ([4f409a3](googleapis@4f409a3)) * **tools/looker:** Strip wrapping quotes from filter values for unquoted parameters ([googleapis#3273](googleapis#3273)) ([1e3de96](googleapis@1e3de96)) * **tools:** Initialize query result slices to empty array ([googleapis#3250](googleapis#3250)) ([60ddf48](googleapis@60ddf48)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> Co-authored-by: Yuan Teoh <45984206+Yuan325@users.noreply.github.com> b001006

AjmeraParth132 requested review from a team as code owners April 15, 2026 07:38

blunderbuss-gcf Bot assigned Yuan325 Apr 15, 2026

gemini-code-assist Bot reviewed Apr 15, 2026

View reviewed changes

Comment thread internal/sources/sqlcommenter/sqlcommenter.go Outdated

Comment thread internal/sources/sqlcommenter/sqlcommenter_test.go Outdated

AjmeraParth132 changed the title ~~feat: Set Up SQL Commenter, w Client Data read~~ feat: setup SQLCommenter and allow client metadata Apr 15, 2026

AjmeraParth132 force-pushed the feat/sql-commenter branch from e673c8f to 30b2e7f Compare April 15, 2026 19:03

anubhav756 force-pushed the feat/sql-commenter branch from 30b2e7f to 94a1d99 Compare April 15, 2026 19:38

anubhav756 force-pushed the feat/sql-commenter branch from 94a1d99 to 0f9ecc3 Compare April 15, 2026 19:43

Yuan325 assigned anubhav756 and unassigned Yuan325 Apr 16, 2026

anubhav756 added the priority: p1 Important issue which blocks shipping the next release. Will be fixed prior to next release. label Apr 22, 2026

anubhav756 force-pushed the feat/sql-commenter branch from 0f9ecc3 to 0f592f3 Compare April 22, 2026 14:10

anubhav756 approved these changes Apr 22, 2026

View reviewed changes

AjmeraParth132 force-pushed the feat/sql-commenter branch from 0f592f3 to c79c48a Compare May 12, 2026 05:38

anubhav756 force-pushed the feat/sql-commenter branch from c79c48a to da51fa5 Compare May 12, 2026 06:02

anubhav756 force-pushed the feat/sql-commenter branch from da51fa5 to 625498e Compare May 13, 2026 09:49

twishabansal approved these changes May 14, 2026

View reviewed changes

AjmeraParth132 force-pushed the feat/sql-commenter branch from 0bcf6b8 to 39d9ce4 Compare May 18, 2026 17:09

AjmeraParth132 added 2 commits May 18, 2026 23:28

feat: setup SQLCommenter and allow client metadata

73f4027

feat: tests + export client metadata

ff658bc

anubhav756 force-pushed the feat/sql-commenter branch from 39d9ce4 to ff658bc Compare May 18, 2026 17:58

anubhav756 merged commit 9f1f9b3 into googleapis:main May 18, 2026
23 checks passed

release-please Bot mentioned this pull request May 18, 2026

chore(main): release 1.3.0 #3228

Merged

AjmeraParth132 mentioned this pull request May 20, 2026

Add SQLCommenter observability to all sources #2899

Open

1 task

BrewTestBot mentioned this pull request May 21, 2026

mcp-toolbox 1.3.0 Homebrew/homebrew-core#284130

Merged

roanny mentioned this pull request May 25, 2026

feat(tools/bigquery): Wire SQLCommenter for BigQuery source (mirror postgres/mysql pattern) #3286

Open

Conversation

AjmeraParth132 commented Apr 15, 2026

Description

PR Checklist

Uh oh!

gemini-code-assist Bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

Uh oh!

Uh oh!

anubhav756 commented Apr 15, 2026

Uh oh!

anubhav756 commented Apr 15, 2026

Uh oh!

anubhav756 commented Apr 15, 2026

Uh oh!

anubhav756 commented Apr 22, 2026

Uh oh!

anubhav756 commented May 12, 2026

Uh oh!

anubhav756 commented May 13, 2026

Uh oh!

twishabansal commented May 14, 2026

Uh oh!

anubhav756 commented May 15, 2026

Uh oh!

anubhav756 commented May 18, 2026

Uh oh!

anubhav756 commented May 18, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

anubhav756 commented May 18, 2026

Uh oh!

anubhav756 commented May 18, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

anubhav756 commented May 18, 2026 •

edited

Loading