[v3.11] CXX-3363 bump downloaded C driver to 1.30.6 (#1475)

kevinAlbs · eramongodb · web-flow · commit 5f7038ef9498 · 2025-10-08T10:59:41.000-04:00
* bump auto-downloaded version to 1.30.6 * Keep required version the same to avoid a minor version dependency bump in a patch release. * regenerate SBOM-lite * update augmented SBOM from Evergreen * update CHANGELOG * fix referenced tag in purls.txt: `v1.30.6` => `1.30.6` * fix empty array test * Related: dc7839a * Condition assert on libmongoc versions. Evergreen tests with both 1.30.6 and 1.28.0. * update SDAM monitoring tests * Related: CXX-3208 * Condition assert on libmongoc versions. Evergreen tests with both 1.30.6 and 1.28.0. * update index test case for forward-compatibility with server 8.3 * remove `test atlas connectivity` * Related: CXX-3270 * remove `test_mongohouse` * Related: CXX-3322 * fix offset checks in examples * Related: CXX-3302 --------- Co-authored-by: Ezra Chung <88335979+eramongodb@users.noreply.github.com>
diff --git a/.mci.yml b/.mci.yml
@@ -543,25 +543,6 @@ functions:
                   export URI="mongodb://bob:pwd123@localhost"
                   ./.evergreen/connect.sh
 
-    "test atlas connectivity":
-        - command: shell.exec
-          params:
-              shell: bash
-              working_dir: "mongo-cxx-driver"
-              silent: true
-              script: |
-
-                  export MONGOC_INSTALL_PREFIX=$(pwd)/../mongoc
-                  export MONGOCXX_INSTALL_PREFIX=$(pwd)/build/install
-                  export LIB_DIR=${lib_dir}
-                  export BUILD_TYPE=${build_type}
-                  export BUILD_DIR=$(pwd)/build
-
-                  # The atlas_serverless_uri expansion is set in the Evergreen project settings.
-                  export URI="${atlas_serverless_uri}"
-
-                  ./.evergreen/connect.sh
-
     "backtrace":
         - command: shell.exec
           params:
@@ -943,7 +924,6 @@ tasks:
         - func: "fetch_c_driver_source"
         - func: "compile"
         - func: "test auth"
-        - func: "test atlas connectivity"
 
     - name: compile_and_test_with_static_libs
       commands:
@@ -1187,16 +1167,6 @@ tasks:
           local_file: rpm.tar.gz
           content_type: ${content_type|application/x-gzip}
 
-
-    - name: test_mongohouse
-      commands:
-        - func: "setup"
-        - func: "fetch_c_driver_source"
-        - func: "compile"
-        - func: "build_mongohouse"
-        - func: "run_mongohouse"
-        - func: "test_mongohouse"
-
     - name: test_versioned_api
       commands:
         - func: "setup"
@@ -2031,14 +2001,6 @@ buildvariants:
         - name: compile_without_tests
         - name: compile_macro_guard_tests
 
-    - name: mongohouse-ubuntu
-      display_name: "Mongohouse Test"
-      expansions:
-          build_type: "Release"
-      run_on: ubuntu2204-small
-      tasks:
-          - name: test_mongohouse
-
     - name: zseries-rhel83-latest
       display_name: "zSeries RHEL 8.3 (MongoDB Latest)"
       batchtime: 1440 # 1 day
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,10 @@ Changes prior to 3.9.0 are documented as [release notes on GitHub](https://githu
 
 - The API version of auto-downloaded C Driver libraries no longer incorrectly inherits the C++ Driver's `BUILD_VERSION` value.
 
+### Changed
+
+- Bump the minimum required C Driver version to [1.30.6](https://github.com/mongodb/mongo-c-driver/releases/tag/1.30.6).
+
 ## 3.11.0
 
 ### Added
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -54,7 +54,7 @@ set(LIBBSON_REQUIRED_ABI_VERSION 1.0)
 
 # Also update etc/purls.txt.
 set(LIBMONGOC_REQUIRED_VERSION 1.28.0)
-set(LIBMONGOC_DOWNLOAD_VERSION 1.28.0)
+set(LIBMONGOC_DOWNLOAD_VERSION 1.30.6)
 set(LIBMONGOC_REQUIRED_ABI_VERSION 1.0)
 
 set(NEED_DOWNLOAD_C_DRIVER false)
diff --git a/etc/augmented.sbom.json b/etc/augmented.sbom.json
@@ -27,16 +27,16 @@
       "version": "v1.1.0"
     },
     {
-      "bom-ref": "pkg:github/mongodb/mongo-c-driver@v1.28.0",
+      "bom-ref": "pkg:github/mongodb/mongo-c-driver@1.30.6",
       "copyright": "Copyright 2009-present MongoDB, Inc.",
       "externalReferences": [
         {
           "type": "distribution",
-          "url": "https://github.com/mongodb/mongo-c-driver/archive/refs/tags/v1.28.0.tar.gz"
+          "url": "https://github.com/mongodb/mongo-c-driver/archive/refs/tags/1.30.6.tar.gz"
         },
         {
           "type": "website",
-          "url": "https://github.com/mongodb/mongo-c-driver/tree/v1.28.0"
+          "url": "https://github.com/mongodb/mongo-c-driver/tree/1.30.6"
         }
       ],
       "group": "mongodb",
@@ -48,21 +48,21 @@
         }
       ],
       "name": "mongo-c-driver",
-      "purl": "pkg:github/mongodb/mongo-c-driver@v1.28.0",
+      "purl": "pkg:github/mongodb/mongo-c-driver@1.30.6",
       "type": "library",
-      "version": "v1.28.0"
+      "version": "1.30.6"
     }
   ],
   "dependencies": [
     {
       "ref": "pkg:github/mnmlstc/core@v1.1.0"
     },
     {
-      "ref": "pkg:github/mongodb/mongo-c-driver@v1.28.0"
+      "ref": "pkg:github/mongodb/mongo-c-driver@1.30.6"
     }
   ],
   "metadata": {
-    "timestamp": "2025-02-19T21:01:34.820453+00:00",
+    "timestamp": "2025-10-07T19:55:06.672956+00:00",
     "tools": [
       {
         "externalReferences": [
diff --git a/etc/cyclonedx.sbom.json b/etc/cyclonedx.sbom.json
@@ -27,16 +27,16 @@
       "version": "v1.1.0"
     },
     {
-      "bom-ref": "pkg:github/mongodb/mongo-c-driver@v1.28.0",
+      "bom-ref": "pkg:github/mongodb/mongo-c-driver@1.30.6",
       "copyright": "Copyright 2009-present MongoDB, Inc.",
       "externalReferences": [
         {
           "type": "distribution",
-          "url": "https://github.com/mongodb/mongo-c-driver/archive/refs/tags/v1.28.0.tar.gz"
+          "url": "https://github.com/mongodb/mongo-c-driver/archive/refs/tags/1.30.6.tar.gz"
         },
         {
           "type": "website",
-          "url": "https://github.com/mongodb/mongo-c-driver/tree/v1.28.0"
+          "url": "https://github.com/mongodb/mongo-c-driver/tree/1.30.6"
         }
       ],
       "group": "mongodb",
@@ -48,21 +48,21 @@
         }
       ],
       "name": "mongo-c-driver",
-      "purl": "pkg:github/mongodb/mongo-c-driver@v1.28.0",
+      "purl": "pkg:github/mongodb/mongo-c-driver@1.30.6",
       "type": "library",
-      "version": "v1.28.0"
+      "version": "1.30.6"
     }
   ],
   "dependencies": [
     {
       "ref": "pkg:github/mnmlstc/core@v1.1.0"
     },
     {
-      "ref": "pkg:github/mongodb/mongo-c-driver@v1.28.0"
+      "ref": "pkg:github/mongodb/mongo-c-driver@1.30.6"
     }
   ],
   "metadata": {
-    "timestamp": "2025-02-19T21:01:34.820453+00:00",
+    "timestamp": "2025-10-07T19:55:06.672956+00:00",
     "tools": [
       {
         "externalReferences": [
diff --git a/etc/make_release.py b/etc/make_release.py
@@ -88,7 +88,7 @@
               show_default=True,
               help='The remote reference which points to the mongodb/mongo-cxx-driver repo')
 @click.option('--c-driver-build-ref',
-              default='1.28.0',
+              default='1.30.6',
               show_default=True,
               help='When building the C driver, build at this Git reference')
 @click.option('--with-c-driver',
diff --git a/etc/purls.txt b/etc/purls.txt
@@ -6,7 +6,7 @@
 # re-generate the SBOM JSON file!
 
 # libbson and libmongoc are obtained via cmake/FetchMongoC.cmake.
-pkg:github/mongodb/mongo-c-driver@v1.28.0
+pkg:github/mongodb/mongo-c-driver@1.30.6
 
 # mnmlstc/core is obtained via cmake/FetchMnmlstcCore.cmake.
 pkg:github/mnmlstc/core@v1.1.0
diff --git a/examples/api/bsoncxx/examples/validation/basic_usage.cpp b/examples/api/bsoncxx/examples/validation/basic_usage.cpp
@@ -62,8 +62,9 @@ void example() {
         ASSERT(bsoncxx::validate(data, length) ==
                bsoncxx::validate(data, length, options, &offset));
 
-        // Not set when valid.
-        ASSERT(offset == 123u);
+        // [libbson  < 1.30.5] Not set when valid.
+        // [libbson >= 1.30.5] Set to 0 when valid.
+        ASSERT(offset == 123u || offset == 0u);
     }
 }
 // [Example]
diff --git a/examples/api/bsoncxx/examples/validation/validator.cpp b/examples/api/bsoncxx/examples/validation/validator.cpp
@@ -77,8 +77,10 @@ void example(const std::uint8_t* bytes, std::size_t length) {
 
         ASSERT(!bsoncxx::validate(bytes, length, options, &offset));
 
-        // Offset of `"$numberInt": "123"` relative to start of the sub-document. (CDRIVER-5710)
-        ASSERT(offset == 4u);
+        // [libbson  < 1.30.5] Offset of `"$numberInt": "123"` relative to start of the
+        //                     sub-document. (CDRIVER-5710)
+        // [libbson >= 1.30.5] Offset of `"$numberInt": "123"` relative to start of the document.
+        ASSERT(offset == 31u || offset == 4u);
     }
 }
 // [Example]
diff --git a/src/bsoncxx/test/json.cpp b/src/bsoncxx/test/json.cpp
@@ -62,7 +62,12 @@ TEST_CASE("empty array is converted correctly to json string") {
     using bsoncxx::to_json;
 
     auto doc = make_document(kvp("array", make_array()));
-    REQUIRE(0 == to_json(doc.view()).compare(R"({ "array" : [  ] })"));
+    if (bson_get_major_version() == 1 && bson_get_minor_version() < 30) {
+        // C driver versions prior to 1.30 have an extra space. Refer: mongoc-c-driver@f2c1bb79
+        REQUIRE(0 == to_json(doc.view()).compare(R"({ "array" : [  ] })"));
+    } else {
+        REQUIRE(0 == to_json(doc.view()).compare(R"({ "array" : [ ] })"));
+    }
 }
 
 TEST_CASE("CXX-941 is resolved") {
diff --git a/src/mongocxx/test/index_view.cpp b/src/mongocxx/test/index_view.cpp
@@ -373,7 +373,10 @@ TEST_CASE("drop_one", "[index_view]") {
         auto cursor = indexes.list();
         REQUIRE(std::distance(cursor.begin(), cursor.end()) == 1);
 
-        REQUIRE_THROWS_AS(indexes.drop_one("foo"), operation_exception);
+        // SERVER-90152: "dropIndex should be idempotent"
+        if (!test_util::newer_than(mongodb_client, "8.3")) {
+            REQUIRE_THROWS_AS(indexes.drop_one("foo"), operation_exception);
+        }
     }
 }
 
diff --git a/src/mongocxx/test/sdam-monitoring.cpp b/src/mongocxx/test/sdam-monitoring.cpp
@@ -63,6 +63,7 @@ TEST_CASE("SDAM Monitoring", "[sdam_monitoring]") {
     SECTION("Server Events") {
         int server_opening_events = 0;
         int server_changed_events = 0;
+        int server_closed_events = 0;
 
         ///////////////////////////////////////////////////////////////////////
         // Begin server description listener lambdas
@@ -117,7 +118,10 @@ TEST_CASE("SDAM Monitoring", "[sdam_monitoring]") {
             BSONCXX_TEST_EXCEPTION_GUARD_END(eguard);
         });
 
-        // We don't expect a ServerClosedEvent unless a replica set member is removed.
+        apm_opts.on_server_closed([&](events::server_closed_event const& event) {
+            server_closed_events++;
+            CHECK(topology_id.value() == event.topology_id());
+        });
 
         ///////////////////////////////////////////////////////////////////////
         // End server description listener lambdas
@@ -127,6 +131,13 @@ TEST_CASE("SDAM Monitoring", "[sdam_monitoring]") {
         BSONCXX_TEST_EXCEPTION_GUARD_CHECK(eguard);
         REQUIRE(server_opening_events > 0);
         REQUIRE(server_changed_events > 0);
+
+        if (mongoc_get_major_version() == 1 && mongoc_get_minor_version() < 30) {
+            // C driver versions prior to 1.30 do not send a serverClosed event.
+            REQUIRE(server_closed_events == 0);
+        } else {
+            REQUIRE(server_closed_events > 0);
+        }
     }
 
     SECTION("Topology Events") {
@@ -171,14 +182,18 @@ TEST_CASE("SDAM Monitoring", "[sdam_monitoring]") {
                 REQUIRE_FALSE(old_td.has_writable_server());
             }
 
-            if (topology_type == "replicaset") {
-                if (new_td.has_writable_server()) {
-                    REQUIRE(new_type == "ReplicaSetWithPrimary");
+            // A topology_changed_event may also be triggered when server monitoring closes,
+            // which transitions the topology description into an "Unknown" state.
+            CHECKED_IF(new_type != "Unknown") {
+                if (topology_type == "replicaset") {
+                    if (new_td.has_writable_server()) {
+                        REQUIRE(new_type == "ReplicaSetWithPrimary");
+                    } else {
+                        REQUIRE(new_type == "ReplicaSetNoPrimary");
+                    }
                 } else {
-                    REQUIRE(new_type == "ReplicaSetNoPrimary");
+                    REQUIRE(new_type == "Single");
                 }
-            } else {
-                REQUIRE(new_type == "Single");
             }
 
             for (auto&& new_sd : new_servers) {

Original file line number	Diff line number	Diff line change
`@@ -27,16 +27,16 @@`
`27`	`27`	`"version": "v1.1.0"`
`28`	`28`	`},`
`29`	`29`	`{`
`30`		`- "bom-ref": "pkg:github/mongodb/mongo-c-driver@v1.28.0",`
	`30`	`+ "bom-ref": "pkg:github/mongodb/mongo-c-driver@1.30.6",`
`31`	`31`	`"copyright": "Copyright 2009-present MongoDB, Inc.",`
`32`	`32`	`"externalReferences": [`
`33`	`33`	`{`
`34`	`34`	`"type": "distribution",`
`35`		`- "url": "https://github.com/mongodb/mongo-c-driver/archive/refs/tags/v1.28.0.tar.gz"`
	`35`	`+ "url": "https://github.com/mongodb/mongo-c-driver/archive/refs/tags/1.30.6.tar.gz"`
`36`	`36`	`},`
`37`	`37`	`{`
`38`	`38`	`"type": "website",`
`39`		`- "url": "https://github.com/mongodb/mongo-c-driver/tree/v1.28.0"`
	`39`	`+ "url": "https://github.com/mongodb/mongo-c-driver/tree/1.30.6"`
`40`	`40`	`}`
`41`	`41`	`],`
`42`	`42`	`"group": "mongodb",`
`@@ -48,21 +48,21 @@`
`48`	`48`	`}`
`49`	`49`	`],`
`50`	`50`	`"name": "mongo-c-driver",`
`51`		`- "purl": "pkg:github/mongodb/mongo-c-driver@v1.28.0",`
	`51`	`+ "purl": "pkg:github/mongodb/mongo-c-driver@1.30.6",`
`52`	`52`	`"type": "library",`
`53`		`- "version": "v1.28.0"`
	`53`	`+ "version": "1.30.6"`
`54`	`54`	`}`
`55`	`55`	`],`
`56`	`56`	`"dependencies": [`
`57`	`57`	`{`
`58`	`58`	`"ref": "pkg:github/mnmlstc/core@v1.1.0"`
`59`	`59`	`},`
`60`	`60`	`{`
`61`		`- "ref": "pkg:github/mongodb/mongo-c-driver@v1.28.0"`
	`61`	`+ "ref": "pkg:github/mongodb/mongo-c-driver@1.30.6"`
`62`	`62`	`}`
`63`	`63`	`],`
`64`	`64`	`"metadata": {`
`65`		`- "timestamp": "2025-02-19T21:01:34.820453+00:00",`
	`65`	`+ "timestamp": "2025-10-07T19:55:06.672956+00:00",`
`66`	`66`	`"tools": [`
`67`	`67`	`{`
`68`	`68`	`"externalReferences": [`
Original file line number	Diff line number	Diff line change
`@@ -62,8 +62,9 @@ void example() {`
`62`	`62`	`ASSERT(bsoncxx::validate(data, length) ==`
`63`	`63`	`bsoncxx::validate(data, length, options, &offset));`
`64`	`64`
`65`		`- // Not set when valid.`
`66`		`- ASSERT(offset == 123u);`
	`65`	`+ // [libbson < 1.30.5] Not set when valid.`
	`66`	`+ // [libbson >= 1.30.5] Set to 0 when valid.`
	`67`	`+ ASSERT(offset == 123u \|\| offset == 0u);`
`67`	`68`	`}`
`68`	`69`	`}`
`69`	`70`	`// [Example]`
Original file line number	Diff line number	Diff line change
`@@ -77,8 +77,10 @@ void example(const std::uint8_t* bytes, std::size_t length) {`
`77`	`77`
`78`	`78`	`ASSERT(!bsoncxx::validate(bytes, length, options, &offset));`
`79`	`79`
`80`		- // Offset of `"$numberInt": "123"` relative to start of the sub-document. (CDRIVER-5710)
`81`		`- ASSERT(offset == 4u);`
	`80`	+ // [libbson < 1.30.5] Offset of `"$numberInt": "123"` relative to start of the
	`81`	`+ // sub-document. (CDRIVER-5710)`
	`82`	+ // [libbson >= 1.30.5] Offset of `"$numberInt": "123"` relative to start of the document.
	`83`	`+ ASSERT(offset == 31u \|\| offset == 4u);`
`82`	`84`	`}`
`83`	`85`	`}`
`84`	`86`	`// [Example]`