PYTHON-5493 [v4.14] Add a patch for the log order difference (#2482)

blink1073 · web-flow · commit 6611bec9e789 · 2025-08-18T15:03:15.000-05:00
diff --git a/.evergreen/scripts/install-dependencies.sh b/.evergreen/scripts/install-dependencies.sh
@@ -52,6 +52,8 @@ if ! command -v just &>/dev/null; then
   echo "Installing just..."
   mkdir -p "$_BIN_DIR" 2>/dev/null || true
   curl --proto '=https' --tlsv1.2 -sSf https://just.systems/install.sh | bash -s -- $_TARGET --to "$_BIN_DIR" || {
+    # Remove just file if it exists (can be created if there was an install error).
+    rm -f ${_BIN_DIR}/just
     _pip_install rust-just just
   }
   echo "Installing just... done."
diff --git a/.evergreen/spec-patch/PYTHON-5493.patch b/.evergreen/spec-patch/PYTHON-5493.patch
@@ -0,0 +1,99 @@
+diff --git a/test/connection_logging/connection-logging.json b/test/connection_logging/connection-logging.json
+index d40cfbb7e..5799e834d 100644
+--- a/test/connection_logging/connection-logging.json
++++ b/test/connection_logging/connection-logging.json
+@@ -272,7 +272,13 @@
+               "level": "debug",
+               "component": "connection",
+               "data": {
+-                "message": "Connection pool closed",
++                "message": "Connection closed",
++                "driverConnectionId": {
++                  "$$type": [
++                    "int",
++                    "long"
++                  ]
++                },
+                 "serverHost": {
+                   "$$type": "string"
+                 },
+@@ -281,20 +287,15 @@
+                     "int",
+                     "long"
+                   ]
+-                }
++                },
++                "reason": "Connection pool was closed"
+               }
+             },
+             {
+               "level": "debug",
+               "component": "connection",
+               "data": {
+-                "message": "Connection closed",
+-                "driverConnectionId": {
+-                  "$$type": [
+-                    "int",
+-                    "long"
+-                  ]
+-                },
++                "message": "Connection pool closed",
+                 "serverHost": {
+                   "$$type": "string"
+                 },
+@@ -303,8 +304,7 @@
+                     "int",
+                     "long"
+                   ]
+-                },
+-                "reason": "Connection pool was closed"
++                }
+               }
+             }
+           ]
+@@ -446,22 +446,6 @@
+                 }
+               }
+             },
+-            {
+-              "level": "debug",
+-              "component": "connection",
+-              "data": {
+-                "message": "Connection pool cleared",
+-                "serverHost": {
+-                  "$$type": "string"
+-                },
+-                "serverPort": {
+-                  "$$type": [
+-                    "int",
+-                    "long"
+-                  ]
+-                }
+-              }
+-            },
+             {
+               "level": "debug",
+               "component": "connection",
+@@ -514,6 +498,22 @@
+                   ]
+                 }
+               }
++            },
++            {
++              "level": "debug",
++              "component": "connection",
++              "data": {
++                "message": "Connection pool cleared",
++                "serverHost": {
++                  "$$type": "string"
++                },
++                "serverPort": {
++                  "$$type": [
++                    "int",
++                    "long"
++                  ]
++                }
++              }
+             }
+           ]
+         }
diff --git a/test/connection_logging/connection-logging.json b/test/connection_logging/connection-logging.json
@@ -446,22 +446,6 @@
                 }
               }
             },
-            {
-              "level": "debug",
-              "component": "connection",
-              "data": {
-                "message": "Connection pool cleared",
-                "serverHost": {
-                  "$$type": "string"
-                },
-                "serverPort": {
-                  "$$type": [
-                    "int",
-                    "long"
-                  ]
-                }
-              }
-            },
             {
               "level": "debug",
               "component": "connection",
@@ -514,6 +498,22 @@
                   ]
                 }
               }
+            },
+            {
+              "level": "debug",
+              "component": "connection",
+              "data": {
+                "message": "Connection pool cleared",
+                "serverHost": {
+                  "$$type": "string"
+                },
+                "serverPort": {
+                  "$$type": [
+                    "int",
+                    "long"
+                  ]
+                }
+              }
             }
           ]
         }

Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,8 @@ if ! command -v just &>/dev/null; then`
`52`	`52`	`echo "Installing just..."`
`53`	`53`	`mkdir -p "$_BIN_DIR" 2>/dev/null \|\| true`
`54`	`54`	`curl --proto '=https' --tlsv1.2 -sSf https://just.systems/install.sh \| bash -s -- $_TARGET --to "$_BIN_DIR" \|\| {`
	`55`	`+ # Remove just file if it exists (can be created if there was an install error).`
	`56`	`+ rm -f ${_BIN_DIR}/just`
`55`	`57`	`_pip_install rust-just just`
`56`	`58`	`}`
`57`	`59`	`echo "Installing just... done."`
Original file line number	Diff line number	Diff line change
`@@ -446,22 +446,6 @@`
`446`	`446`	`}`
`447`	`447`	`}`
`448`	`448`	`},`
`449`		`- {`
`450`		`- "level": "debug",`
`451`		`- "component": "connection",`
`452`		`- "data": {`
`453`		`- "message": "Connection pool cleared",`
`454`		`- "serverHost": {`
`455`		`- "$$type": "string"`
`456`		`- },`
`457`		`- "serverPort": {`
`458`		`- "$$type": [`
`459`		`- "int",`
`460`		`- "long"`
`461`		`- ]`
`462`		`- }`
`463`		`- }`
`464`		`- },`
`465`	`449`	`{`
`466`	`450`	`"level": "debug",`
`467`	`451`	`"component": "connection",`
`@@ -514,6 +498,22 @@`
`514`	`498`	`]`
`515`	`499`	`}`
`516`	`500`	`}`
	`501`	`+ },`
	`502`	`+ {`
	`503`	`+ "level": "debug",`
	`504`	`+ "component": "connection",`
	`505`	`+ "data": {`
	`506`	`+ "message": "Connection pool cleared",`
	`507`	`+ "serverHost": {`
	`508`	`+ "$$type": "string"`
	`509`	`+ },`
	`510`	`+ "serverPort": {`
	`511`	`+ "$$type": [`
	`512`	`+ "int",`
	`513`	`+ "long"`
	`514`	`+ ]`
	`515`	`+ }`
	`516`	`+ }`
`517`	`517`	`}`
`518`	`518`	`]`
`519`	`519`	`}`