Merge remote-tracking branch 'origin/main' into MONGOSH-1090-get-log-path

Author: alenakhineika

.evergreen/setup-env.sh

@@ -13,7 +13,8 @@ fi
 export BASEDIR="$PWD/.evergreen"
 export PATH="/cygdrive/c/python/Python311/Scripts:/cygdrive/c/python/Python311:/cygdrive/c/Python311/Scripts:/cygdrive/c/Python311:/opt/python/3.6/bin:$BASEDIR/mingit/cmd:$BASEDIR/mingit/mingw64/libexec/git-core:$BASEDIR/git-2:$BASEDIR/npm-10/node_modules/.bin:$BASEDIR/node-v$NODE_JS_VERSION-win-x64:/opt/java/jdk16/bin:/opt/chefdk/gitbin:/cygdrive/c/cmake/bin:$TOOLCHAIN_PATH:$PATH"
 
-export MONGOSH_TEST_ONLY_MAX_LOG_FILE_COUNT=100000
+export MONGOSH_GLOBAL_CONFIG_FILE_FOR_TESTING="$BASEDIR/../../testing/tests-globalconfig.conf"
+
 export IS_MONGOSH_EVERGREEN_CI=1
 export DEBUG="mongodb*,$DEBUG"
 

THIRD_PARTY_NOTICES.md

@@ -333,7 +333,7 @@ Package|Version|License
 **[mongodb-client-encryption](#d8efb4ae363035b677f38203b1acc7b0d69b22f13b17e95d09d151bf9928072a)**|6.1.1|Apache-2.0
 **[mongodb-connection-string-url](#2e1146256a89ebd24e3398881e03807fe363d58444e6b7952ea50bd6108707bc)**|3.0.1|Apache-2.0
 **[mongodb-crypt-library-version](#003bd2892d6f6fdac0613ba8f9a2fbb054ddd1c26901e1d2fc7e83861b21cf4d)**|1.0.5|Apache-2.0
-**[mongodb-log-writer](#aa6af6c54190e5547bd195c110196863c35a7ecb8f24c593f9f1d9cde3db9f16)**|2.1.0|Apache-2.0
+**[mongodb-log-writer](#0ea266b0fdd89dc0e20fe8fce081aaceb79e60918c606b3ab6e8b3978aa36ab5)**|2.3.0|Apache-2.0
 **[mongodb-redact](#6fe8cef9beca5f3e1e3e999f47975ae99dcf4488419b28fc6d5eafc436081623)**|1.1.5|Apache-2.0
 **[mongodb](#cb726cf7a5329fc15d51574a4bc2e29682afe46afb788a94370b09643ab98a72)**|6.12.0|Apache-2.0
 **[ms](#484b814b85d5028e34246147c8fc901d33570202bd7cdc3703c0ed1078eba0aa)**|2.0.0|MIT
@@ -27372,8 +27372,8 @@ License files:
 
 
 
-<a id="aa6af6c54190e5547bd195c110196863c35a7ecb8f24c593f9f1d9cde3db9f16"></a>
-### [mongodb-log-writer](https://www.npmjs.com/package/mongodb-log-writer) (version 2.1.0)
+<a id="0ea266b0fdd89dc0e20fe8fce081aaceb79e60918c606b3ab6e8b3978aa36ab5"></a>
+### [mongodb-log-writer](https://www.npmjs.com/package/mongodb-log-writer) (version 2.3.0)
 License tags: Apache-2.0
 
 License files:

package-lock.json

@@ -85,7 +85,7 @@
     "is-recoverable-error": "^1.0.3",
     "js-yaml": "^4.1.0",
     "mongodb-connection-string-url": "^3.0.1",
-    "mongodb-log-writer": "^2.1.0",
+    "mongodb-log-writer": "^2.3.0",
     "numeral": "^2.0.6",
     "pretty-repl": "^4.0.1",
     "semver": "^7.5.4",

packages/cli-repl/package.json

@@ -326,6 +326,7 @@ describe('CliRepl', function () {
           'logRetentionDays',
           'logMaxFileCount',
           'logCompressionEnabled',
+          'logRetentionGB',
         ] satisfies (keyof CliUserConfig)[]);
       });
 
@@ -1477,12 +1478,22 @@ describe('CliRepl', function () {
             );
           });
 
+          it('can set log retention GB', async function () {
+            const testLogRetentionGB = 10;
+            cliRepl.config.logRetentionGB = testLogRetentionGB;
+            await cliRepl.start(await testServer.connectionString(), {});
+
+            expect(await cliRepl.getConfig('logRetentionGB')).equals(
+              testLogRetentionGB
+            );
+            expect(cliRepl.logManager?._options.retentionGB).equals(
+              testLogRetentionGB
+            );
+          });
+
           it('can set log max file count', async function () {
             const testMaxFileCount = 123;
             cliRepl.config.logMaxFileCount = testMaxFileCount;
-            const oldEnvironmentLimit =
-              process.env.MONGOSH_TEST_ONLY_MAX_LOG_FILE_COUNT;
-            delete process.env.MONGOSH_TEST_ONLY_MAX_LOG_FILE_COUNT;
             await cliRepl.start(await testServer.connectionString(), {});
 
             expect(await cliRepl.getConfig('logMaxFileCount')).equals(
@@ -1491,9 +1502,6 @@ describe('CliRepl', function () {
             expect(cliRepl.logManager?._options.maxLogFileCount).equals(
               testMaxFileCount
             );
-
-            process.env.MONGOSH_TEST_ONLY_MAX_LOG_FILE_COUNT =
-              oldEnvironmentLimit;
           });
 
           it('can set log compression', async function () {

packages/cli-repl/src/cli-repl.spec.ts

@@ -268,10 +268,8 @@ export class CliRepl implements MongoshIOProvider {
         this.shellHomeDirectory.localPath('.'),
       retentionDays: await this.getConfig('logRetentionDays'),
       gzip: await this.getConfig('logCompressionEnabled'),
-      maxLogFileCount: +(
-        process.env.MONGOSH_TEST_ONLY_MAX_LOG_FILE_COUNT ||
-        (await this.getConfig('logMaxFileCount'))
-      ),
+      maxLogFileCount: await this.getConfig('logMaxFileCount'),
+      retentionGB: await this.getConfig('logRetentionGB'),
       onerror: (err: Error) => this.bus.emit('mongosh:error', err, 'log'),
       onwarn: (err: Error, path: string) =>
         this.warnAboutInaccessibleFile(err, path),

packages/cli-repl/src/cli-repl.ts

@@ -33,7 +33,7 @@
     "strip-ansi": "^6.0.0"
   },
   "devDependencies": {
-    "mongodb-log-writer": "^2.1.0",
+    "mongodb-log-writer": "^2.3.0",
     "@mongodb-js/eslint-config-mongosh": "^1.0.0",
     "@mongodb-js/oidc-mock-provider": "^0.10.2",
     "@mongodb-js/prettier-config-devtools": "^1.0.1",