add to defaultLogTransform

aditi-khare-mongoDB · aditi-khare-mongoDB · commit b7f0ee89d763 · 2024-07-01T15:52:46.000-04:00
diff --git a/src/mongo_logger.ts b/src/mongo_logger.ts
@@ -604,6 +604,7 @@ export function defaultLogTransform(
       log = attachConnectionFields(log, logObject);
       log.message = 'Connection ready';
       log.driverConnectionId = logObject.connectionId;
+      log.durationMS = logObject.durationMS;
       return log;
     case CONNECTION_CLOSED:
       log = attachConnectionFields(log, logObject);
@@ -649,6 +650,7 @@ export function defaultLogTransform(
           if (logObject.error) {
             log.error = logObject.error;
           }
+          log.durationMS = logObject.durationMS;
           break;
         default:
           log.reason = `Unknown close reason: ${logObject.reason}`;
@@ -658,6 +660,7 @@ export function defaultLogTransform(
       log = attachConnectionFields(log, logObject);
       log.message = 'Connection checked out';
       log.driverConnectionId = logObject.connectionId;
+      log.durationMS = logObject.durationMS;
       return log;
     case CONNECTION_CHECKED_IN:
       log = attachConnectionFields(log, logObject);
diff --git a/test/integration/connection-monitoring-and-pooling/unified-cmap-node-specs/connection-logging.json b/test/integration/connection-monitoring-and-pooling/unified-cmap-node-specs/connection-logging.json
@@ -110,6 +110,13 @@
                     "int",
                     "long"
                   ]
+                },
+                "durationMS": {
+                  "$$type": [
+                    "double",
+                    "int",
+                    "long"
+                  ]
                 }
               }
             },
diff --git a/test/spec/connection-monitoring-and-pooling/logging/connection-logging.json b/test/spec/connection-monitoring-and-pooling/logging/connection-logging.json
@@ -140,6 +140,13 @@
                     "int",
                     "long"
                   ]
+                },
+                "durationMS": {
+                  "$$type": [
+                    "double",
+                    "int",
+                    "long"
+                  ]
                 }
               }
             },
@@ -162,6 +169,13 @@
                     "int",
                     "long"
                   ]
+                },
+                "durationMS": {
+                  "$$type": [
+                    "double",
+                    "int",
+                    "long"
+                  ]
                 }
               }
             },
@@ -222,6 +236,13 @@
                     "int",
                     "long"
                   ]
+                },
+                "durationMS": {
+                  "$$type": [
+                    "double",
+                    "int",
+                    "long"
+                  ]
                 }
               }
             },
@@ -484,6 +505,13 @@
                 "reason": "An error occurred while trying to establish a new connection",
                 "error": {
                   "$$exists": true
+                },
+                "durationMS": {
+                  "$$type": [
+                    "double",
+                    "int",
+                    "long"
+                  ]
                 }
               }
             }
diff --git a/test/spec/connection-monitoring-and-pooling/logging/connection-logging.yml b/test/spec/connection-monitoring-and-pooling/logging/connection-logging.yml
@@ -66,6 +66,7 @@ tests:
               driverConnectionId: { $$type: [int, long] }
               serverHost: { $$type: string }
               serverPort: { $$type: [int, long] }
+              durationMS: { $$type: [double, int, long] }
 
           - level: debug
             component: connection
@@ -74,6 +75,7 @@ tests:
               driverConnectionId: { $$type: [int, long] }
               serverHost: { $$type: string }
               serverPort: { $$type: [int, long] }
+              durationMS: { $$type: [double, int, long] }
 
           - level: debug
             component: connection
@@ -98,6 +100,7 @@ tests:
               driverConnectionId: { $$type: [int, long] }
               serverHost: { $$type: string }
               serverPort: { $$type: [int, long] }
+              durationMS: { $$type: [double, int, long] }
 
           - level: debug
             component: connection
@@ -218,3 +221,4 @@ tests:
               serverPort: { $$type: [int, long] }
               reason: "An error occurred while trying to establish a new connection"
               error: { $$exists: true }
+              durationMS: { $$type: [double, int, long] }
diff --git a/test/spec/connection-monitoring-and-pooling/logging/connection-pool-options.json b/test/spec/connection-monitoring-and-pooling/logging/connection-pool-options.json
@@ -128,6 +128,13 @@
                     "int",
                     "long"
                   ]
+                },
+                "durationMS": {
+                  "$$type": [
+                    "double",
+                    "int",
+                    "long"
+                  ]
                 }
               }
             }
diff --git a/test/spec/connection-monitoring-and-pooling/logging/connection-pool-options.yml b/test/spec/connection-monitoring-and-pooling/logging/connection-pool-options.yml
@@ -71,6 +71,7 @@ tests:
               driverConnectionId: { $$type: [int, long] }
               serverHost: { $$type: string }
               serverPort: { $$type: [int, long] }
+              durationMS: { $$type: [double, int, long] }
 
   # Drivers who have not done DRIVERS-1943 will need to skip this test.
   - description: "maxConnecting should be included in connection pool created message when specified"

Original file line number	Diff line number	Diff line change
`@@ -110,6 +110,13 @@`
`110`	`110`	`"int",`
`111`	`111`	`"long"`
`112`	`112`	`]`
	`113`	`+ },`
	`114`	`+ "durationMS": {`
	`115`	`+ "$$type": [`
	`116`	`+ "double",`
	`117`	`+ "int",`
	`118`	`+ "long"`
	`119`	`+ ]`
`113`	`120`	`}`
`114`	`121`	`}`
`115`	`122`	`},`
Original file line number	Diff line number	Diff line change
`@@ -140,6 +140,13 @@`
`140`	`140`	`"int",`
`141`	`141`	`"long"`
`142`	`142`	`]`
	`143`	`+ },`
	`144`	`+ "durationMS": {`
	`145`	`+ "$$type": [`
	`146`	`+ "double",`
	`147`	`+ "int",`
	`148`	`+ "long"`
	`149`	`+ ]`
`143`	`150`	`}`
`144`	`151`	`}`
`145`	`152`	`},`
`@@ -162,6 +169,13 @@`
`162`	`169`	`"int",`
`163`	`170`	`"long"`
`164`	`171`	`]`
	`172`	`+ },`
	`173`	`+ "durationMS": {`
	`174`	`+ "$$type": [`
	`175`	`+ "double",`
	`176`	`+ "int",`
	`177`	`+ "long"`
	`178`	`+ ]`
`165`	`179`	`}`
`166`	`180`	`}`
`167`	`181`	`},`
`@@ -222,6 +236,13 @@`
`222`	`236`	`"int",`
`223`	`237`	`"long"`
`224`	`238`	`]`
	`239`	`+ },`
	`240`	`+ "durationMS": {`
	`241`	`+ "$$type": [`
	`242`	`+ "double",`
	`243`	`+ "int",`
	`244`	`+ "long"`
	`245`	`+ ]`
`225`	`246`	`}`
`226`	`247`	`}`
`227`	`248`	`},`
`@@ -484,6 +505,13 @@`
`484`	`505`	`"reason": "An error occurred while trying to establish a new connection",`
`485`	`506`	`"error": {`
`486`	`507`	`"$$exists": true`
	`508`	`+ },`
	`509`	`+ "durationMS": {`
	`510`	`+ "$$type": [`
	`511`	`+ "double",`
	`512`	`+ "int",`
	`513`	`+ "long"`
	`514`	`+ ]`
`487`	`515`	`}`
`488`	`516`	`}`
`489`	`517`	`}`
Original file line number	Diff line number	Diff line change
`@@ -128,6 +128,13 @@`
`128`	`128`	`"int",`
`129`	`129`	`"long"`
`130`	`130`	`]`
	`131`	`+ },`
	`132`	`+ "durationMS": {`
	`133`	`+ "$$type": [`
	`134`	`+ "double",`
	`135`	`+ "int",`
	`136`	`+ "long"`
	`137`	`+ ]`
`131`	`138`	`}`
`132`	`139`	`}`
`133`	`140`	`}`