Merge origin/main into feat/core-router-and-sql-span-naming

Resolve conflicts from release/2.1.0 merge (PR #29) — keep 2.2.0
version and our branch's superset of changes.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: prathamesh-sonpatki