Merge branch 'master' into merge-release/2.3-into-master-1758856145555

Author: matthewdale

.evergreen/config.yml

@@ -198,7 +198,7 @@ functions:
       params:
         binary: bash
         env:
-          GO_BUILD_TAGS: cse
+          GO_BUILD_TAGS: "cse,mongointernal"
         include_expansions_in_env: ["TOPOLOGY", "AUTH", "SSL", "SKIP_CSOT_TESTS", "MONGODB_URI", "CRYPT_SHARED_LIB_PATH", "SKIP_CRYPT_SHARED_LIB", "RACE", "MONGO_GO_DRIVER_COMPRESSOR", "REQUIRE_API_VERSION", "LOAD_BALANCER"]
         args: [*task-runner, setup-test]
     - command: subprocess.exec
@@ -379,23 +379,6 @@ functions:
         binary: bash
         args: [*task-runner, evg-test-load-balancers]
 
-  run-atlas-data-lake-test:
-    - command: subprocess.exec
-      params:
-        binary: "bash"
-        env: 
-          AUTH: auth
-          SSL: nossl
-          TOPOLOGY: server
-          MONGODB_URI: "mongodb://mhuser:pencil@localhost"
-        args: [*task-runner, setup-test]
-    - command: subprocess.exec
-      type: test
-      retry_on_failure: true
-      params:
-        binary: "bash"
-        args: [*task-runner, evg-test-atlas-data-lake]
-
   run-docker-test:
     - command: subprocess.exec
       type: test
@@ -1161,11 +1144,6 @@ tasks:
           OCSP_ALGORITHM: "ecdsa"
           OCSP_TLS_SHOULD_SUCCEED: "false"
 
-  - name: test-atlas-data-lake
-    commands:
-      - func: bootstrap-mongohoused
-      - func: run-atlas-data-lake-test
-
   - name: test-docker-runner
     commands:
       - func: bootstrap-mongo-orchestration
@@ -2171,16 +2149,6 @@ buildvariants:
     tasks:
       - name: "atlas-test"
 
-  - name: atlas-data-lake-test
-    tags: ["pullrequest"]
-    display_name: "Atlas Data Lake Test"
-    run_on:
-      - ubuntu2004-large
-    expansions:
-      GO_DIST: "/opt/golang/go1.23"
-    tasks:
-      - name: "test-atlas-data-lake"
-
   - name: docker-runner-test
     tags: ["pullrequest"]
     display_name: "Docker Runner Test"

.github/workflows/codeql.yml

@@ -34,7 +34,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/scorecard.yml

@@ -34,7 +34,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@v5
         with:
           persist-credentials: false
 

.github/workflows/test.yml

@@ -16,7 +16,7 @@ jobs:
   pre_commit:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: actions/setup-python@v5
       - uses: actions/setup-go@v5
         with:

README.md

@@ -63,7 +63,7 @@ Make sure to defer a call to `Disconnect` after instantiating your client:
 
 ```go
 defer func() {
-    if err = client.Disconnect(ctx); err != nil {
+    if err := client.Disconnect(ctx); err != nil {
         panic(err)
     }
 }()
@@ -75,7 +75,7 @@ Calling `Connect` does not block for server discovery. If you wish to know if a
 use the `Ping` method:
 
 ```go
-ctx, cancel = context.WithTimeout(context.Background(), 2*time.Second)
+ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
 defer cancel()
 
 _ = client.Ping(ctx, readpref.Primary())
@@ -90,7 +90,7 @@ collection := client.Database("testing").Collection("numbers")
 The `Collection` instance can then be used to insert documents:
 
 ```go
-ctx, cancel = context.WithTimeout(context.Background(), 5*time.Second)
+ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
 defer cancel()
 
 res, _ := collection.InsertOne(ctx, bson.D{{"name", "pi"}, {"value", 3.14159}})
@@ -117,7 +117,7 @@ import (
 Several query methods return a cursor, which can be used like this:
 
 ```go
-ctx, cancel = context.WithTimeout(context.Background(), 30*time.Second)
+ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
 defer cancel()
 
 cur, err := collection.Find(ctx, bson.D{})
@@ -148,10 +148,10 @@ var result struct {
 }
 
 filter := bson.D{{"name", "pi"}}
-ctx, cancel = context.WithTimeout(context.Background(), 5*time.Second)
+ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
 defer cancel()
 
-err = collection.FindOne(ctx, filter).Decode(&result)
+err := collection.FindOne(ctx, filter).Decode(&result)
 if errors.Is(err, mongo.ErrNoDocuments) {
     // Do something when no record was found
 } else if err != nil {

Taskfile.yml

@@ -130,10 +130,6 @@ tasks:
   evg-test:
     - go test -exec "env PKG_CONFIG_PATH=${PKG_CONFIG_PATH} LD_LIBRARY_PATH=${LD_LIBRARY_PATH} DYLD_LIBRARY_PATH=$MACOS_LIBRARY_PATH}" ${BUILD_TAGS} -v -timeout {{.TEST_TIMEOUT}}s -p 1 ./... >> test.suite
 
-  evg-test-atlas-data-lake:
-    - ATLAS_DATA_LAKE_INTEGRATION_TEST=true go test -v ./internal/integration/unified -run TestUnifiedSpec/atlas-data-lake-testing >> spec_test.suite
-    - ATLAS_DATA_LAKE_INTEGRATION_TEST=true go test -v ./internal/integration -run TestAtlasDataLake >> spec_test.suite
-
   evg-test-enterprise-auth:
     - go run -tags gssapi ./internal/cmd/testentauth/main.go
 

etc/perf-pr-comment.sh

@@ -4,23 +4,17 @@
 
 set -eux
 
-pushd ./internal/cmd/perfcomp >/dev/null || exist
-GOWORK=off go build -o ../../../bin/perfcomp .
-popd >/dev/null
-
-# Generate perf report.
-GOWORK=off ./bin/perfcomp compare --project="mongo-go-driver" ${VERSION_ID} > ./internal/cmd/perfcomp/perf-report.txt
+pushd $DRIVERS_TOOLS/.evergreen >/dev/null
+PROJECT="mongo-go-driver" CONTEXT="GoDriver perf task" TASK="perf" VARIANT="perf" sh run-perf-comp.sh
 
 if [[ -n "${BASE_SHA+set}" && -n "${HEAD_SHA+set}" && "$BASE_SHA" != "$HEAD_SHA" ]]; then
-    # Parse and generate perf comparison comment.
-    GOWORK=off ./bin/perfcomp mdreport
     # Make the PR comment.
-    target=$DRIVERS_TOOLS/.evergreen/github_app/create_or_modify_comment.sh
-    bash $target -m "## 🧪 Performance Results" -c "$(pwd)/perf-report.md" -h $HEAD_SHA -o "mongodb" -n "mongo-go-driver"
-    rm ./perf-report.md
+    target=github_app/create_or_modify_comment.sh
+    bash $target -m "## 🧪 Performance Results" -c "$(pwd)/perfcomp/perf-report.md" -h $HEAD_SHA -o "mongodb" -n "mongo-go-driver"
+    rm ./perfcomp/perf-report.md
 else
     # Skip comment if it isn't a PR run.
     echo "Skipping Perf PR comment"
 fi
 
-rm ./internal/cmd/perfcomp/perf-report.txt
+popd >/dev/null