@appland/appmap 3.4.1 → 3.5.0

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# [@appland/appmap-v3.5.0](https://github.com/applandinc/appmap-js/compare/@appland/appmap-v3.4.1...@appland/appmap-v3.5.0) (2021-09-15)
+
+
+### Bug Fixes
+
+* `appland.cli.log` is now populated on failure ([916f84c](https://github.com/applandinc/appmap-js/commit/916f84ce2a6eb08ac463d8f37fbbc32bad2486fb))
+* Capture installer information upon failure ([6b01a9b](https://github.com/applandinc/appmap-js/commit/6b01a9b4b8f3e6cad8d6728682b767ccad3f2fa3))
+* Clarify steps to fix missing requirements ([e743176](https://github.com/applandinc/appmap-js/commit/e743176318369f4d887480bcce26869e95feea4b))
+
+
+### Features
+
+* Ask user to confirm installation environment ([17a802b](https://github.com/applandinc/appmap-js/commit/17a802b776b63b8eab5039b8d7905e430e9a8eaa))
+
 # [@appland/appmap-v3.4.1](https://github.com/applandinc/appmap-js/compare/@appland/appmap-v3.4.0...@appland/appmap-v3.4.1) (2021-09-15)
 
 

package/built/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@appland/appmap",
-    "version": "3.4.0",
+    "version": "3.4.1",
     "description": "",
     "bin": "built/src/cli.js",
     "publishConfig": {

package/built/src/cmds/agentInstaller/agentInstallerProcedure.js

@@ -8,9 +8,10 @@ const fs_1 = require("fs");
 const path_1 = require("path");
 const yargs_1 = __importDefault(require("yargs"));
 const utils_1 = require("../../utils");
-const validationError_1 = __importDefault(require("./validationError"));
+const errors_1 = require("./errors");
 const commandRunner_1 = require("./commandRunner");
 const userInteraction_1 = __importDefault(require("./userInteraction"));
+const errors_2 = require("./errors");
 class AgentInstallerProcedure {
     constructor(options, path) {
         this.options = options;
@@ -52,71 +53,103 @@ class AgentInstallerProcedure {
         }
         if (!installer) {
             // This should branch should never occur
-            throw new validationError_1.default(`Invalid selection`);
+            throw new errors_1.ValidationError(`Invalid selection`);
         }
-        if (!availableInstallers.includes(installer)) {
-            const projectPath = chalk_1.default.red(path_1.resolve(this.path));
-            const { name, buildFile } = installer;
-            const message = [
-                `No ${chalk_1.default.red(name)} project was able to be located at ${projectPath}.`,
-            ];
-            if (installer.buildFile) {
-                message.push(`${chalk_1.default.red(buildFile)} was expected to be found at this path, but none could be located.`);
+        try {
+            let writeAppMapYml = true;
+            if (await utils_1.exists(path_1.join(this.path, 'appmap.yml'))) {
+                const USE_EXISTING = 'Use existing';
+                const OVERWRITE = 'Overwrite';
+                const ABORT = 'Abort';
+                const { overwriteAppMapYml } = await userInteraction_1.default.prompt({
+                    type: 'list',
+                    name: 'overwriteAppMapYml',
+                    message: 'An appmap.yml configuration file already exists. How should the conflict be resolved?',
+                    choices: [USE_EXISTING, OVERWRITE, ABORT],
+                });
+                if (overwriteAppMapYml === ABORT) {
+                    yargs_1.default.exit(0, new Error());
+                }
+                if (overwriteAppMapYml === USE_EXISTING) {
+                    writeAppMapYml = false;
+                }
             }
-            throw new validationError_1.default(message.join('\n'));
-        }
-        let writeAppMapYml = true;
-        if (await utils_1.exists(path_1.join(this.path, 'appmap.yml'))) {
-            const USE_EXISTING = 'Use existing';
-            const OVERWRITE = 'Overwrite';
-            const ABORT = 'Abort';
-            const { overwriteAppMapYml } = await userInteraction_1.default.prompt({
-                type: 'list',
-                name: 'overwriteAppMapYml',
-                message: 'An appmap.yml configuration file already exists. How should the conflict be resolved?',
-                choices: [USE_EXISTING, OVERWRITE, ABORT],
+            let env = {
+                'Project type': installer.name,
+                'Project directory': path_1.resolve(this.path),
+            };
+            if (installer.environment) {
+                env = Object.assign(Object.assign({}, env), (await installer.environment()));
+            }
+            const { confirm } = await userInteraction_1.default.prompt({
+                type: 'confirm',
+                name: 'confirm',
+                message: [
+                    `AppMap is about to be installed. Confirm the details below.`,
+                    Object.entries(env).map(([key, value]) => `  ${chalk_1.default.blue(key)}: ${value.trim()}`),
+                    '',
+                    '  Is this correct?',
+                ]
+                    .flat()
+                    .join('\n'),
             });
-            if (overwriteAppMapYml === ABORT) {
-                yargs_1.default.exit(0, new Error());
+            if (!confirm) {
+                userInteraction_1.default.status = 'Aborting installation.';
+                userInteraction_1.default.error([
+                    'Modify the installation environment as needed, and re-run the command.',
+                    `Use ${chalk_1.default.blue('--help')} for more information.`,
+                ].join('\n'));
+                throw new errors_1.AbortError('aborted while confirming installation environment');
             }
-            if (overwriteAppMapYml === USE_EXISTING) {
-                writeAppMapYml = false;
+            if (!availableInstallers.includes(installer)) {
+                const projectPath = chalk_1.default.red(path_1.resolve(this.path));
+                const { name, buildFile } = installer;
+                const message = [
+                    `No ${chalk_1.default.red(name)} project was able to be located at ${projectPath}.`,
+                ];
+                if (installer.buildFile) {
+                    message.push(`${chalk_1.default.red(buildFile)} was expected to be found at this path, but none could be located.`, '', `Switch the current directory or specify a directory using the ${chalk_1.default.blue('-d')} or ${chalk_1.default.blue('--dir')} command line argument.`, `Use ${chalk_1.default.blue('--help')} for more information.`);
+                }
+                throw new errors_1.ValidationError(message.join('\n'));
             }
-        }
-        userInteraction_1.default.status = 'Installing the AppMap agent...';
-        await installer.installAgent();
-        if (installer.verifyCommand) {
-            const cmd = await installer.verifyCommand();
-            await commandRunner_1.run(cmd);
-        }
-        if (writeAppMapYml) {
-            const initCommand = await installer.initCommand();
-            const { stdout } = await commandRunner_1.run(initCommand);
-            const json = JSON.parse(stdout);
-            await fs_1.promises.writeFile(path_1.join(this.path, 'appmap.yml'), json.configuration.contents);
-        }
-        if (installer.validateAgentCommand) {
-            userInteraction_1.default.status = 'Validating the AppMap agent...';
-            const cmd = await installer.validateAgentCommand();
-            try {
+            userInteraction_1.default.status = 'Installing the AppMap agent...';
+            await installer.installAgent();
+            if (installer.verifyCommand) {
+                const cmd = await installer.verifyCommand();
                 await commandRunner_1.run(cmd);
             }
-            catch (e) {
-                userInteraction_1.default.error('Failed to validate the installation.');
-                throw e;
+            if (writeAppMapYml) {
+                const initCommand = await installer.initCommand();
+                const { stdout } = await commandRunner_1.run(initCommand);
+                const json = JSON.parse(stdout);
+                await fs_1.promises.writeFile(path_1.join(this.path, 'appmap.yml'), json.configuration.contents);
             }
+            if (installer.validateAgentCommand) {
+                userInteraction_1.default.status = 'Validating the AppMap agent...';
+                const cmd = await installer.validateAgentCommand();
+                try {
+                    await commandRunner_1.run(cmd);
+                }
+                catch (e) {
+                    userInteraction_1.default.error('Failed to validate the installation.');
+                    throw e;
+                }
+            }
+            const successMessage = [
+                chalk_1.default.green('Success! The AppMap agent has been installed.'),
+            ];
+            if (installer.postInstallMessage) {
+                successMessage.push('', await installer.postInstallMessage(), '');
+            }
+            if (this.documentation) {
+                successMessage.push('For more information, visit', chalk_1.default.blue(this.documentation));
+            }
+            userInteraction_1.default.success(successMessage.join('\n'));
+            return installer;
         }
-        const successMessage = [
-            chalk_1.default.green('Success! The AppMap agent has been installed.'),
-        ];
-        if (installer.postInstallMessage) {
-            successMessage.push('', await installer.postInstallMessage(), '');
-        }
-        if (this.documentation) {
-            successMessage.push('For more information, visit', chalk_1.default.blue(this.documentation));
+        catch (e) {
+            throw new errors_2.InstallError(e, installer);
         }
-        userInteraction_1.default.success(successMessage.join('\n'));
-        return installer;
     }
 }
 exports.default = AgentInstallerProcedure;

package/built/src/cmds/agentInstaller/agentInstallerProcedure.js.map

@@ -1 +1 @@
-{"version":3,"file":"agentInstallerProcedure.js","sourceRoot":"","sources":["../../../../src/cmds/agentInstaller/agentInstallerProcedure.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"agentInstallerProcedure.js","sourceRoot":"","sources":["../../../../src/cmds/agentInstaller/agentInstallerProcedure.ts"],"names":[],"mappings":"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"}

package/built/src/cmds/agentInstaller/commandRunner.js

@@ -13,10 +13,10 @@ class ProcessLog {
         var _a, _b;
         this.buffer.concat(`\n\nRunning command: \`${command}\`\n\n`);
         (_a = childProcess.stdout) === null || _a === void 0 ? void 0 : _a.on('data', (data) => {
-            this.buffer.concat(data);
+            this.buffer = this.buffer.concat(data);
         });
         (_b = childProcess.stderr) === null || _b === void 0 ? void 0 : _b.on('data', (data) => {
-            this.buffer.concat(data);
+            this.buffer = this.buffer.concat(data);
         });
     }
     static recordExit(program, code, signal) {

package/built/src/cmds/agentInstaller/commandRunner.js.map

@@ -1 +1 @@
-{"version":3,"file":"commandRunner.js","sourceRoot":"","sources":["../../../../src/cmds/agentInstaller/commandRunner.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"commandRunner.js","sourceRoot":"","sources":["../../../../src/cmds/agentInstaller/commandRunner.ts"],"names":[],"mappings":"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"}

package/built/src/cmds/agentInstaller/commandStruct.js

@@ -13,5 +13,4 @@ class CommandStruct {
     }
 }
 exports.default = CommandStruct;
-module.exports = CommandStruct;
 //# sourceMappingURL=commandStruct.js.map

package/built/src/cmds/agentInstaller/commandStruct.js.map

@@ -1 +1 @@
-{"version":3,"file":"commandStruct.js","sourceRoot":"","sources":["../../../../src/cmds/agentInstaller/commandStruct.ts"],"names":[],"mappings":";;AACA,qCAA8B;AAE9B,MAAqB,aAAa;IAGhC,YACW,OAAe,EACf,IAAuB,EACvB,IAAc,EACvB,cAAiC,EAAE;QAH1B,YAAO,GAAP,OAAO,CAAQ;QACf,SAAI,GAAJ,IAAI,CAAmB;QACvB,SAAI,GAAJ,IAAI,CAAU;QAGvB,IAAI,CAAC,WAAW,mCAAQ,aAAG,GAAK,WAAW,CAAE,CAAC;IAChD,CAAC;IAED,QAAQ;QACN,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACpD,CAAC;CACF;AAfD,gCAeC;AAOD,MAAM,CAAC,OAAO,GAAG,aAAa,CAAC"}
+{"version":3,"file":"commandStruct.js","sourceRoot":"","sources":["../../../../src/cmds/agentInstaller/commandStruct.ts"],"names":[],"mappings":";;AACA,qCAA8B;AAE9B,MAAqB,aAAa;IAGhC,YACW,OAAe,EACf,IAAuB,EACvB,IAAc,EACvB,cAAiC,EAAE;QAH1B,YAAO,GAAP,OAAO,CAAQ;QACf,SAAI,GAAJ,IAAI,CAAmB;QACvB,SAAI,GAAJ,IAAI,CAAU;QAGvB,IAAI,CAAC,WAAW,mCAAQ,aAAG,GAAK,WAAW,CAAE,CAAC;IAChD,CAAC;IAED,QAAQ;QACN,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACpD,CAAC;CACF;AAfD,gCAeC"}

package/built/src/cmds/agentInstaller/commandUtil.js

@@ -0,0 +1,38 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getOutput = void 0;
+const commandRunner_1 = require("./commandRunner");
+const commandStruct_1 = __importDefault(require("./commandStruct"));
+/**
+ * Small utility method to run a command and return the output - ONE OF stdout OR stderr. This
+ * function won't throw an error if the command fails. This method may be expanded in the future
+ * to return both stdout and stderr combined, but as of now it is not necessary.
+ * @param program The executable to run
+ * @param args The arguments to pass to the executable
+ * @param cwd The working directory to run the command in
+ * @returns The output of the command
+ */
+async function getOutput(program, args, cwd) {
+    try {
+        const { stdout, stderr } = await commandRunner_1.run(new commandStruct_1.default(program, args, cwd));
+        return {
+            output: stdout ? stdout : stderr,
+            ok: true,
+        };
+    }
+    catch (code) {
+        const failure = { output: '' };
+        if (code === 127) {
+            failure.output = `${program} was not found`;
+        }
+        else {
+            failure.output = `${program} failed with code ${code}`;
+        }
+        return failure;
+    }
+}
+exports.getOutput = getOutput;
+//# sourceMappingURL=commandUtil.js.map

package/built/src/cmds/agentInstaller/commandUtil.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"commandUtil.js","sourceRoot":"","sources":["../../../../src/cmds/agentInstaller/commandUtil.ts"],"names":[],"mappings":";;;;;;AAAA,mDAAsC;AACtC,oEAA+D;AAE/D;;;;;;;;GAQG;AACI,KAAK,UAAU,SAAS,CAC7B,OAAe,EACf,IAAc,EACd,GAAW;IAEX,IAAI;QACF,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,mBAAG,CAAC,IAAI,uBAAa,CAAC,OAAO,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC;QAC5E,OAAO;YACL,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM;YAChC,EAAE,EAAE,IAAI;SACT,CAAC;KACH;IAAC,OAAO,IAAI,EAAE;QACb,MAAM,OAAO,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;QAE/B,IAAI,IAAI,KAAK,GAAG,EAAE;YAChB,OAAO,CAAC,MAAM,GAAG,GAAG,OAAO,gBAAgB,CAAC;SAC7C;aAAM;YACL,OAAO,CAAC,MAAM,GAAG,GAAG,OAAO,qBAAqB,IAAI,EAAE,CAAC;SACxD;QAED,OAAO,OAAO,CAAC;KAChB;AACH,CAAC;AAtBD,8BAsBC"}

package/built/src/cmds/agentInstaller/errors.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ValidationError = exports.AbortError = exports.InstallError = void 0;
+class InstallError {
+    constructor(error, installer) {
+        this.error = error;
+        this.installer = installer;
+    }
+}
+exports.InstallError = InstallError;
+class AbortError extends Error {
+}
+exports.AbortError = AbortError;
+class ValidationError extends Error {
+}
+exports.ValidationError = ValidationError;
+//# sourceMappingURL=errors.js.map

package/built/src/cmds/agentInstaller/errors.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../../../src/cmds/agentInstaller/errors.ts"],"names":[],"mappings":";;;AAEA,MAAa,YAAY;IACvB,YAAqB,KAAc,EAAW,SAA0B;QAAnD,UAAK,GAAL,KAAK,CAAS;QAAW,cAAS,GAAT,SAAS,CAAiB;IAAG,CAAC;CAC7E;AAFD,oCAEC;AAED,MAAa,UAAW,SAAQ,KAAK;CAAG;AAAxC,gCAAwC;AACxC,MAAa,eAAgB,SAAQ,KAAK;CAAG;AAA7C,0CAA6C"}

package/built/src/cmds/agentInstaller/install-agent.js

@@ -7,8 +7,7 @@ exports.handler = exports.builder = exports.describe = exports.command = void 0;
 const javaAgentInstaller_1 = __importDefault(require("./javaAgentInstaller"));
 const rubyAgentInstaller_1 = __importDefault(require("./rubyAgentInstaller"));
 const pythonAgentInstaller_1 = __importDefault(require("./pythonAgentInstaller"));
-const validationError_1 = __importDefault(require("./validationError"));
-const abortError_1 = __importDefault(require("./abortError"));
+const errors_1 = require("./errors");
 const utils_1 = require("../../utils");
 const agentInstallerProcedure_1 = __importDefault(require("./agentInstallerProcedure"));
 const chalk_1 = __importDefault(require("chalk"));
@@ -93,7 +92,7 @@ const handler = async (argv) => {
                     `${chalk_1.default.red(installTarget)} is not a supported installer type.`,
                     supportedTargetsMessage(),
                 ].join('\n'));
-                throw new abortError_1.default(`unsupported installer type \'${installTarget}\'`);
+                throw new errors_1.AbortError(`unsupported installer type \'${installTarget}\'`);
             }
             // The user has specified a framework
             installerOptions = installerInfo.installerLanguage;
@@ -111,8 +110,13 @@ const handler = async (argv) => {
             },
         });
     }
-    catch (err) {
+    catch (e) {
         let installersAvailable;
+        let err = e;
+        if (e instanceof errors_1.InstallError) {
+            err = e.error;
+            installer = e.installer;
+        }
         try {
             // Map installers to their available status, e.g.,
             // { maven: true, gradle: false, pip: false }
@@ -134,7 +138,7 @@ const handler = async (argv) => {
                 installersAvailable = String(e);
             }
         }
-        if (err instanceof abortError_1.default) {
+        if (err instanceof errors_1.AbortError) {
             await telemetry_1.default.sendEvent({
                 name: 'install-agent:abort',
                 properties: {
@@ -168,7 +172,7 @@ const handler = async (argv) => {
                 duration: endTime(),
             },
         });
-        if (err instanceof validationError_1.default) {
+        if (err instanceof errors_1.ValidationError) {
             console.warn(err.message);
             return yargs_1.default.exit(1, err);
         }
@@ -180,7 +184,6 @@ const handler = async (argv) => {
         }
         yargs_1.default.exit(3, err);
     }
-    ;
 };
 exports.handler = handler;
 //# sourceMappingURL=install-agent.js.map

package/built/src/cmds/agentInstaller/install-agent.js.map

@@ -1 +1 @@
-{"version":3,"file":"install-agent.js","sourceRoot":"","sources":["../../../../src/cmds/agentInstaller/install-agent.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"install-agent.js","sourceRoot":"","sources":["../../../../src/cmds/agentInstaller/install-agent.ts"],"names":[],"mappings":"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"}

package/built/src/cmds/agentInstaller/javaAgentInstaller.js

@@ -14,10 +14,11 @@ const moo_1 = __importDefault(require("moo"));
 const chalk_1 = __importDefault(require("chalk"));
 const commandStruct_1 = __importDefault(require("./commandStruct"));
 const commandRunner_1 = require("./commandRunner");
+const commandUtil_1 = require("./commandUtil");
 const utils_1 = require("../../utils");
 const userInteraction_1 = __importDefault(require("./userInteraction"));
 const sourceUtil_1 = require("./sourceUtil");
-const abortError_1 = __importDefault(require("./abortError"));
+const errors_1 = require("./errors");
 class JavaBuildToollInstaller {
     constructor(path) {
         this.path = path;
@@ -40,6 +41,17 @@ class JavaBuildToollInstaller {
         }
         return this._agentJar;
     }
+    async environment() {
+        // JDK version is returned as a string similar to:
+        // javac 1.8.0_212-internal (build 1.8.0_212-internal+11)
+        const version = await commandUtil_1.getOutput('javac', ['-version'], this.path);
+        return {
+            JAVA_HOME: process.env.JAVA_HOME || chalk_1.default.yellow('Unspecified'),
+            'JDK Version': version.ok
+                ? version.output.split(/\s/)[1]
+                : chalk_1.default.red(version.output),
+        };
+    }
 }
 class MavenInstaller extends JavaBuildToollInstaller {
     constructor(path) {
@@ -321,7 +333,7 @@ class GradleInstaller extends JavaBuildToollInstaller {
                     choices: ['Abort', 'Continue'],
                 });
                 if (userWillContinue === 'Abort') {
-                    throw new abortError_1.default('no java plugin found');
+                    throw new errors_1.AbortError('no java plugin found');
                 }
             }
             const existingIndex = lines.findIndex((line) => line.match(/com\.appland\.appmap/));

package/built/src/cmds/agentInstaller/javaAgentInstaller.js.map

@@ -1 +1 @@
-{"version":3,"file":"javaAgentInstaller.js","sourceRoot":"","sources":["../../../../src/cmds/agentInstaller/javaAgentInstaller.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"javaAgentInstaller.js","sourceRoot":"","sources":["../../../../src/cmds/agentInstaller/javaAgentInstaller.ts"],"names":[],"mappings":"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"}

package/built/src/cmds/agentInstaller/pythonAgentInstaller.js

@@ -12,13 +12,34 @@ const commandStruct_1 = __importDefault(require("./commandStruct"));
 const utils_1 = require("../../utils");
 const chalk_1 = __importDefault(require("chalk"));
 const commandRunner_1 = require("./commandRunner");
+const commandUtil_1 = require("./commandUtil");
 const REGEX_PKG_DEPENDENCY = /^\s*appmap\s*[=>~]+=.*$/m;
 // include .dev0 so pip will allow prereleases
 const PKG_DEPENDENCY = 'appmap>=1.1.0.dev0';
-class PoetryInstaller {
+class PythonEnvironment {
     constructor(path) {
         this.path = path;
     }
+    async environment() {
+        // Python version is returned as a string similar to:
+        // Python 3.7.0
+        const version = await commandUtil_1.getOutput('python', ['--version'], this.path);
+        const pythonPath = await commandUtil_1.getOutput('python', ['-c', "'import sys; print(sys.prefix)'"], this.path);
+        return {
+            'Python version': version.ok
+                ? version.output.split(/\s/)[1]
+                : chalk_1.default.red(version.output),
+            'Python package directory': pythonPath.ok
+                ? pythonPath.output
+                : chalk_1.default.red(pythonPath.output),
+        };
+    }
+}
+class PoetryInstaller extends PythonEnvironment {
+    constructor(path) {
+        super(path);
+        this.path = path;
+    }
     get name() {
         return 'poetry';
     }
@@ -46,8 +67,9 @@ class PoetryInstaller {
     }
 }
 exports.PoetryInstaller = PoetryInstaller;
-class PipInstaller {
+class PipInstaller extends PythonEnvironment {
     constructor(path) {
+        super(path);
         this.path = path;
     }
     get name() {

package/built/src/cmds/agentInstaller/pythonAgentInstaller.js.map

@@ -1 +1 @@
-{"version":3,"file":"pythonAgentInstaller.js","sourceRoot":"","sources":["../../../../src/cmds/agentInstaller/pythonAgentInstaller.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"pythonAgentInstaller.js","sourceRoot":"","sources":["../../../../src/cmds/agentInstaller/pythonAgentInstaller.ts"],"names":[],"mappings":"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"}

package/built/src/cmds/agentInstaller/rubyAgentInstaller.js

@@ -11,6 +11,7 @@ const fs_1 = require("fs");
 const path_1 = require("path");
 const utils_1 = require("../../utils");
 const commandRunner_1 = require("./commandRunner");
+const commandUtil_1 = require("./commandUtil");
 const commandStruct_1 = __importDefault(require("./commandStruct"));
 const REGEX_GEM_DECLARATION = /(?!\s)(?:gem|group|require)\s/m;
 const REGEX_GEM_DEPENDENCY = /^\s*gem\s+['|"]appmap['|"].*$/m;
@@ -65,6 +66,18 @@ class BundleInstaller {
     async validateAgentCommand() {
         return new commandStruct_1.default('bundle', ['exec', 'appmap-agent-validate'], this.path);
     }
+    async environment() {
+        // Ruby version is returned as a string similar to:
+        // ruby 3.0.0p0 (2020-12-25 revision 95aff21468) [x86_64-linux]
+        const version = await commandUtil_1.getOutput('ruby', ['--version'], this.path);
+        const gemHome = await commandUtil_1.getOutput('gem', ['env', 'home'], this.path);
+        return {
+            'Ruby version': version.ok
+                ? version.output.split(/\s/)[1]
+                : chalk_1.default.red(version.output),
+            'Gem home': gemHome.ok ? gemHome.output : chalk_1.default.red(gemHome.output),
+        };
+    }
 }
 exports.BundleInstaller = BundleInstaller;
 const RubyAgentInstaller = {

package/built/src/cmds/agentInstaller/rubyAgentInstaller.js.map

@@ -1 +1 @@
-{"version":3,"file":"rubyAgentInstaller.js","sourceRoot":"","sources":["../../../../src/cmds/agentInstaller/rubyAgentInstaller.ts"],"names":[],"mappings":";AAAA,2CAA2C;AAC3C,yCAAyC;;;;;;AAEzC,kDAA0B;AAC1B,2BAAqC;AACrC,+BAA4B;AAC5B,uCAAqC;AAErC,mDAAsC;AACtC,oEAA4C;AAE5C,MAAM,qBAAqB,GAAG,gCAAgC,CAAC;AAC/D,MAAM,oBAAoB,GAAG,gCAAgC,CAAC;AAC9D,MAAM,cAAc,GAAG,gDAAgD,CAAC;AAExE,MAAa,eAAe;IAC1B,YAAqB,IAAY;QAAZ,SAAI,GAAJ,IAAI,CAAQ;IAAG,CAAC;IAErC,IAAI,IAAI;QACN,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,IAAI,SAAS;QACX,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,IAAI,aAAa;QACf,OAAO,WAAI,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;IACzC,CAAC;IAED,KAAK,CAAC,kBAAkB;QACtB,OAAO;YACL,uBAAuB,eAAK,CAAC,IAAI,CAAC,aAAa,CAAC,sBAAsB;YACtE,kCAAkC,eAAK,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG;SAC9D,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACf,CAAC;IAED,KAAK,CAAC,SAAS;QACb,OAAO,MAAM,cAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAC1C,CAAC;IAED,KAAK,CAAC,YAAY;QAChB,IAAI,OAAO,GAAG,CAAC,MAAM,aAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;QAClE,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC;QAEpD,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE;YAChB,MAAM,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC,CAAC;YAE9D,IAAI,SAAS,EAAE;gBACb,gDAAgD;gBAChD,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,oBAAoB,EAAE,KAAK,cAAc,EAAE,CAAC,CAAC;aACxE;iBAAM;gBACL,+BAA+B;gBAC/B,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gBAChC,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,EAAE,GAAG,cAAc,MAAM,CAAC,CAAC;gBAChD,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;aAC1B;YAED,MAAM,aAAG,CAAC,SAAS,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;SAClD;aAAM;YACL,MAAM,aAAG,CAAC,SAAS,CACjB,IAAI,CAAC,aAAa,EAClB,GAAG,OAAO,oDAAoD,CAC/D,CAAC;SACH;QAED,MAAM,mBAAG,CAAC,IAAI,uBAAa,CAAC,QAAQ,EAAE,CAAC,SAAS,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IACjE,CAAC;IAED,KAAK,CAAC,WAAW;QACf,OAAO,IAAI,uBAAa,CACtB,QAAQ,EACR,CAAC,MAAM,EAAE,mBAAmB,CAAC,EAC7B,IAAI,CAAC,IAAI,CACV,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,oBAAoB;QACxB,OAAO,IAAI,uBAAa,CACtB,QAAQ,EACR,CAAC,MAAM,EAAE,uBAAuB,CAAC,EACjC,IAAI,CAAC,IAAI,CACV,CAAC;IACJ,CAAC;CACF;AArED,0CAqEC;AAED,MAAM,kBAAkB,GAAG;IACzB,IAAI,EAAE,MAAM;IACZ,aAAa,EAAE,gDAAgD;IAC/D,UAAU,EAAE,CAAC,eAAe,CAAC;CAC9B,CAAC;AAEF,kBAAe,kBAAkB,CAAC"}
+{"version":3,"file":"rubyAgentInstaller.js","sourceRoot":"","sources":["../../../../src/cmds/agentInstaller/rubyAgentInstaller.ts"],"names":[],"mappings":"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"}

package/built/src/cmds/agentInstaller/userInteraction.js

@@ -39,7 +39,9 @@ class UserInteraction {
         if (this.spinner.isSpinning) {
             this.spinner.fail();
         }
-        console.error('\n' + msg);
+        if (msg) {
+            console.error('\n', msg);
+        }
     }
     get status() {
         return this.spinner.text;

package/built/src/cmds/agentInstaller/userInteraction.js.map

@@ -1 +1 @@
-{"version":3,"file":"userInteraction.js","sourceRoot":"","sources":["../../../../src/cmds/agentInstaller/userInteraction.ts"],"names":[],"mappings":";;;;;;AAAA,wDAAwD;AACxD,8CAA+B;AAC/B,kDAA0B;AAC1B,uCAAsC;AAEtC,MAAa,eAAe;IAA5B;QACU,YAAO,GAAQ,aAAG,EAAE,CAAC;IAuD/B,CAAC;IArDC,KAAK,CAAC,MAAM,CAAC,SAA6B;QACxC,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC;QAC5C,IAAI,WAAW,EAAE;YACf,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;YACpB,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;SACtB;QAED,MAAM,MAAM,GAAG,MAAM,kBAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAEhD,IAAI,WAAW,EAAE;YACf,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;SACtB;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,OAAO,CAAC,GAAW;QACjB,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YAC3B,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;SACxB;QAED,OAAO,CAAC,GAAG,CACT,eAAK,CAAC,GAAG,EAAE;YACT,OAAO,EAAE,CAAC;YACV,MAAM,EAAE,CAAC;YACT,WAAW,EAAE,OAAO;YACpB,KAAK,EAAE,QAAQ;SAChB,CAAC,CACH,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,GAAS;QACb,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YAC3B,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;SACrB;QAED,OAAO,CAAC,KAAK,CAAC,IAAI,GAAG,GAAG,CAAC,CAAC;IAC5B,CAAC;IAED,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;IAC3B,CAAC;IAED,IAAI,MAAM,CAAC,KAAa;QACtB,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YAC3B,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;SACxB;QAED,IAAI,CAAC,OAAO,CAAC,IAAI,GAAG,KAAK,CAAC;QAC1B,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,IAAI,CAAC,eAAO,EAAE,EAAE;YAC1C,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;SACtB;IACH,CAAC;CACF;AAxDD,0CAwDC;AAED,MAAM,EAAE,GAAG,IAAI,eAAe,EAAE,CAAC;AACjC,kBAAe,EAAE,CAAC"}
+{"version":3,"file":"userInteraction.js","sourceRoot":"","sources":["../../../../src/cmds/agentInstaller/userInteraction.ts"],"names":[],"mappings":";;;;;;AAAA,wDAAwD;AACxD,8CAA+B;AAC/B,kDAA0B;AAC1B,uCAAsC;AAEtC,MAAa,eAAe;IAA5B;QACU,YAAO,GAAQ,aAAG,EAAE,CAAC;IAyD/B,CAAC;IAvDC,KAAK,CAAC,MAAM,CAAC,SAA6B;QACxC,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC;QAC5C,IAAI,WAAW,EAAE;YACf,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;YACpB,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;SACtB;QAED,MAAM,MAAM,GAAG,MAAM,kBAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAEhD,IAAI,WAAW,EAAE;YACf,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;SACtB;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,OAAO,CAAC,GAAW;QACjB,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YAC3B,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;SACxB;QAED,OAAO,CAAC,GAAG,CACT,eAAK,CAAC,GAAG,EAAE;YACT,OAAO,EAAE,CAAC;YACV,MAAM,EAAE,CAAC;YACT,WAAW,EAAE,OAAO;YACpB,KAAK,EAAE,QAAQ;SAChB,CAAC,CACH,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,GAAS;QACb,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YAC3B,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;SACrB;QAED,IAAI,GAAG,EAAE;YACP,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;SAC1B;IACH,CAAC;IAED,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;IAC3B,CAAC;IAED,IAAI,MAAM,CAAC,KAAa;QACtB,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YAC3B,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;SACxB;QAED,IAAI,CAAC,OAAO,CAAC,IAAI,GAAG,KAAK,CAAC;QAC1B,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,IAAI,CAAC,eAAO,EAAE,EAAE;YAC1C,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;SACtB;IACH,CAAC;CACF;AA1DD,0CA0DC;AAED,MAAM,EAAE,GAAG,IAAI,eAAe,EAAE,CAAC;AACjC,kBAAe,EAAE,CAAC"}

package/built/src/telemetry.js

@@ -150,9 +150,6 @@ class Telemetry {
         return this._client;
     }
     static async sendEvent(data) {
-        if (!this.enabled) {
-            return Promise.resolve();
-        }
         return new Promise((resolve) => {
             try {
                 const transformedProperties = transformProps(data.properties || {});
@@ -163,12 +160,17 @@ class Telemetry {
                     measurements: transformedMetrics,
                     properties,
                 };
-                Telemetry.client.trackEvent(event);
-                Telemetry.client.flush({ callback: () => resolve() });
                 if (this.debug) {
                     console.log(JSON.stringify(event, null, 2));
                 }
-                Telemetry.session.touch();
+                if (this.enabled) {
+                    Telemetry.client.trackEvent(event);
+                    Telemetry.session.touch();
+                    Telemetry.client.flush({ callback: () => resolve() });
+                }
+                else {
+                    resolve();
+                }
             }
             catch (e) {
                 // Don't let telemetry fail the entire command

package/built/src/telemetry.js.map

@@ -1 +1 @@
-{"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../../src/telemetry.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../../src/telemetry.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appland/appmap",
-  "version": "3.4.1",
+  "version": "3.5.0",
   "description": "",
   "bin": "built/src/cli.js",
   "publishConfig": {

package/built/src/cmds/agentInstaller/abortError.js

@@ -1,5 +0,0 @@
-"use strict";
-class AbortError extends Error {
-}
-module.exports = AbortError;
-//# sourceMappingURL=abortError.js.map

package/built/src/cmds/agentInstaller/abortError.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"abortError.js","sourceRoot":"","sources":["../../../../src/cmds/agentInstaller/abortError.js"],"names":[],"mappings":";AAAA,MAAM,UAAW,SAAQ,KAAK;CAAG;AAEjC,MAAM,CAAC,OAAO,GAAG,UAAU,CAAC"}

package/built/src/cmds/agentInstaller/validationError.js

@@ -1,6 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-class ValidationError extends Error {
-}
-exports.default = ValidationError;
-//# sourceMappingURL=validationError.js.map

package/built/src/cmds/agentInstaller/validationError.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"validationError.js","sourceRoot":"","sources":["../../../../src/cmds/agentInstaller/validationError.ts"],"names":[],"mappings":";;AAAA,MAAqB,eAAgB,SAAQ,KAAK;CAAG;AAArD,kCAAqD"}