PYTHON-5846 Consolidate CMAP, heartbeat, and SDAM telemetry into _telemetry.py

.github/workflows/codeql.yml

@@ -38,7 +38,7 @@ jobs:
           build-mode: none
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v6.0.3
+      uses: actions/checkout@v7.0.0
       with:
         ref: ${{ inputs.ref }}
         persist-credentials: false

.github/workflows/dist.yml

@@ -46,7 +46,7 @@ jobs:
 
     steps:
       - name: Checkout pymongo
-        uses: actions/checkout@v6.0.3
+        uses: actions/checkout@v7.0.0
         with:
           fetch-depth: 0
           persist-credentials: false
@@ -105,7 +105,7 @@ jobs:
     name: Make SDist
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v6.0.3
+      - uses: actions/checkout@v7.0.0
         with:
           fetch-depth: 0
           persist-credentials: false

.github/workflows/sbom.yml

@@ -29,7 +29,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v6.0.3
+        uses: actions/checkout@v7.0.0
         with:
           persist-credentials: false
 

.github/workflows/test-python.yml

@@ -22,7 +22,7 @@ jobs:
   static:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6.0.3
+      - uses: actions/checkout@v7.0.0
         with:
           persist-credentials: false
       - name: Install uv
@@ -67,7 +67,7 @@ jobs:
 
     name: Python ${{ matrix.python-version }}-${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v6.0.3
+      - uses: actions/checkout@v7.0.0
         with:
           persist-credentials: false
       - name: Install uv
@@ -89,7 +89,7 @@ jobs:
 
     name: Coverage
     steps:
-      - uses: actions/checkout@v6.0.3
+      - uses: actions/checkout@v7.0.0
         with:
           persist-credentials: false
       - name: Install uv
@@ -117,7 +117,7 @@ jobs:
     runs-on: ubuntu-latest
     name: DocTest
     steps:
-      - uses: actions/checkout@v6.0.3
+      - uses: actions/checkout@v7.0.0
         with:
           persist-credentials: false
       - name: Install uv
@@ -142,7 +142,7 @@ jobs:
     name: Docs Checks
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6.0.3
+      - uses: actions/checkout@v7.0.0
         with:
           persist-credentials: false
       - name: Install uv
@@ -164,7 +164,7 @@ jobs:
       matrix:
         python: ["3.10", "3.11"]
     steps:
-      - uses: actions/checkout@v6.0.3
+      - uses: actions/checkout@v7.0.0
         with:
           persist-credentials: false
       - name: Install uv
@@ -185,7 +185,7 @@ jobs:
     runs-on: ubuntu-latest
     name: Integration Tests
     steps:
-      - uses: actions/checkout@v6.0.3
+      - uses: actions/checkout@v7.0.0
         with:
           persist-credentials: false
       - name: Install uv
@@ -215,7 +215,7 @@ jobs:
     runs-on: ubuntu-latest
     name: "Make an sdist"
     steps:
-      - uses: actions/checkout@v6.0.3
+      - uses: actions/checkout@v7.0.0
         with:
           persist-credentials: false
       - uses: actions/setup-python@v6
@@ -275,7 +275,7 @@ jobs:
       runs-on: ubuntu-latest
       name: Test minimum dependencies and Python
       steps:
-        - uses: actions/checkout@v6.0.3
+        - uses: actions/checkout@v7.0.0
           with:
             persist-credentials: false
         - name: Install uv

.github/workflows/zizmor.yml

@@ -14,8 +14,8 @@ jobs:
       security-events: write
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v6.0.3
+        uses: actions/checkout@v7.0.0
         with:
           persist-credentials: false
       - name: Run zizmor 🌈
-        uses: zizmorcore/zizmor-action@5f14fd08f7cf1cb1609c1e344975f152c7ee938d # v0.5.6
+        uses: zizmorcore/zizmor-action@192e21d79ab29983730a13d1382995c2307fbcaa # v0.5.7

AGENTS.md

@@ -4,7 +4,6 @@
 Official Python driver for MongoDB.
 
 ## Tech Stack
-- **Build/env:** `hatch` — use `hatch run test:test` and `hatch run test:test-async`, not `pytest` directly
 - **Task runner:** `just` (Justfile at repo root)
 - **Linter/formatter:** `ruff` via pre-commit
 - **Type checker:** `mypy` (strict)
@@ -13,37 +12,31 @@ Official Python driver for MongoDB.
 > **Never** run `pip install bson`. PyMongo ships its own `bson`; the PyPI `bson` package silently breaks things.
 
 ## Project Structure
-- `pymongo/synchronous/` — sync driver (MongoClient, Collection, Database, etc.) generated from `pymongo/asynchronous/` using unasync
-- `pymongo/asynchronous/` — async API, mirrors `pymongo/synchronous/`
+- `pymongo/asynchronous/` — async driver (AsyncMongoClient, AsyncCollection, etc.)
+- `pymongo/synchronous/` — sync driver (MongoClient, Collection, etc.) generated from `pymongo/asynchronous/` using `just synchro`
 - `bson/` — BSON implementation
 - `gridfs/` — GridFS API
-- `test/` — sync test suite
-- `test/asynchronous/` — async test suite, mirrors `test/`
+- `test/asynchronous/` — async test suite
+- `test/` — sync test suite (generated from `test/asynchronous/` by `just synchro`) and shared test suite
 - `test/unified_format/` — cross-driver spec tests (Unified Test Format)
-- `tools/convert_test_to_async.py` — generates async test stubs from sync tests
+
+Do not edit files in `pymongo/synchronous/` or mirrored files in `test/` directly: they are generated by `just synchro` from `pymongo/asynchronous/` and `test/asynchronous/`.
+A file in `test/` is mirrored if a file of the same name exists in `test/asynchronous/`.
 
 ## Commands
 ```bash
-just install          # set up venv + pre-commit hook
-just typing-mypy      # type check
-just run lint-manual  # ruff linter
-
-hatch run test:test         # run sync tests
-hatch run test:test-async   # run async tests
-
-MONGODB_VERSION=8.0 just run-server  # start a local MongoDB server
+just install                # set up venv + pre-commit hooks
+just typing                 # type check
+just lint-manual            # pre-commit linting and synchro
+just synchro                # generate synchronous driver and mirrored tests
+just test                   # run all tests
+just test test/asynchronous # run async tests
+MONGODB_VERSION=8.0 just run-server  # start a local MongoDB 8.0 server
 ```
 
 ## Testing
 Tests require a live MongoDB server (`just run-server` above).
 
-Never modify pymongo/synchronous code first; update the async counterpart and run our `tools/synchro.py` script:
-1. Make changes in `pymongo/asynchronous` or top-level `pymongo/` files and `test/`.
-2. Run `tools/convert_test_to_async.py` on the sync test file to generate a starting-point async version.
-3. Manually complete the async version in `test/asynchronous/`.
-
-Do not edit files in `pymongo/synchronous/` or mirrored files in `test/` directly — they are auto-generated by `tools/synchro.py` from `pymongo/asynchronous/` and `test/asynchronous/`. Only edit them if the change includes a `_IS_SYNC` statement.
-
 Async functions must not call blocking I/O.
 
 New features need integration tests. Bug fixes need regression tests.

CONTRIBUTING.md

@@ -529,14 +529,6 @@ Python errors, such as missing imports, incorrect syntax, or other fatal typos.
 run `pre-commit run --all-files --hook-stage manual ruff` and fix all reported errors before running the `synchro`
 hook again.
 
-## Converting a test to async
-
-The `tools/convert_test_to_async.py` script takes in an existing synchronous test file and outputs a
-partially-converted asynchronous version of the same name to the `test/asynchronous` directory.
-Use this generated file as a starting point for the completed conversion.
-
-The script is used like so: `python tools/convert_test_to_async.py [test_file.py]`
-
 ## CPU profiling
 
 To profile a test script and generate a flame graph, follow these steps:

bson/codec_options.py

@@ -377,14 +377,16 @@ def __new__(
             datetime_conversion: Optional[DatetimeConversion] = DatetimeConversion.DATETIME,
         ) -> CodecOptions:
             doc_class = document_class or dict
-            # issubclass can raise TypeError for generic aliases like SON[str, Any].
-            # In that case we can use the base class for the comparison.
-            is_mapping = False
+            # Generic aliases like SON[str, Any] or dict[str, Any] aren't classes, so
+            # resolve to their origin before the subclass check. Whether issubclass()
+            # raises TypeError or just returns False for such aliases is inconsistent
+            # across Python implementations (e.g. PyPy vs CPython), so check the
+            # origin proactively instead of relying on catching the error.
+            check_class = getattr(doc_class, "__origin__", doc_class)
             try:
-                is_mapping = issubclass(doc_class, _MutableMapping)
+                is_mapping = issubclass(check_class, _MutableMapping)
             except TypeError:
-                if hasattr(doc_class, "__origin__"):
-                    is_mapping = issubclass(doc_class.__origin__, _MutableMapping)
+                is_mapping = False
             if not (is_mapping or _raw_document_class(doc_class)):
                 raise TypeError(
                     "document_class must be dict, bson.son.SON, "

justfile

@@ -64,6 +64,11 @@ lint *args="": && resync
 lint-manual *args="": && resync
     uvx pre-commit run --all-files --hook-stage manual {{args}}
 
+# Run synchro
+[group('lint')]
+synchro: && resync
+    uvx pre-commit run --all-files synchro
+
 # Run pytest (e.g. just test test/test_uri_parser.py)
 [group('test')]
 test *args="-v --durations=5 --maxfail=10": && resync