refactor(Telemetry): Report installed docker version

serverless · Jun 2, 2023 · 39806d6 · 39806d6
1 parent 76454d3
commit 39806d6
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/lib/utils/telemetry/generate-payload.js b/lib/utils/telemetry/generate-payload.js
@@ -139,7 +139,7 @@ module.exports = ({
   commandUsage,
   variableSources,
   isConsoleAuthenticated,
-  isDockerInstalled,
+  dockerVersion,
 }) => {
   let commandDurationMs;
 
@@ -198,7 +198,8 @@ module.exports = ({
   const payload = {
     ciName,
     isTtyTerminal: process.stdin.isTTY && process.stdout.isTTY,
-    isDockerInstalled,
+    isDockerInstalled: dockerVersion === undefined ? undefined : Boolean(dockerVersion),
+    dockerVersion: dockerVersion || undefined,
     cliName: 'serverless',
     command,
     commandOptionNames,

diff --git a/scripts/serverless.js b/scripts/serverless.js
@@ -32,7 +32,7 @@ let serviceDir = null;
 let configuration = null;
 let serverless;
 let isConsoleAuthenticated = false;
-let isDockerInstalled;
+let dockerVersion;
 const commandUsage = {};
 const variableSourcesInConfig = new Set();
 
@@ -82,7 +82,7 @@ const finalize = async ({ error, shouldBeSync, telemetryData, shouldSendTelemetr
       commandUsage,
       variableSources: variableSourcesInConfig,
       isConsoleAuthenticated,
-      isDockerInstalled,
+      dockerVersion,
     }),
     ...telemetryData,
   });
@@ -819,8 +819,13 @@ processSpanPromise = (async () => {
         if (commands.join(' ') === 'deploy') {
           const spawn = require('child-process-ext/spawn');
           spawn('docker', ['--version']).then(
-            () => (isDockerInstalled = true),
-            () => (isDockerInstalled = false)
+            ({ stdoutBuffer }) => {
+              dockerVersion = null;
+              const matcher = String(stdoutBuffer).match(/(?<version>\d+\.\d+\.\d+),/);
+              if (!matcher) return;
+              dockerVersion = matcher.groups.version;
+            },
+            () => (dockerVersion = null)
           );
         }
 

diff --git a/test/unit/lib/utils/telemetry/generate-payload.test.js b/test/unit/lib/utils/telemetry/generate-payload.test.js
@@ -168,6 +168,7 @@ describe('test/unit/lib/utils/telemetry/generate-payload.test.js', () => {
       isAutoUpdateEnabled: false,
       isUsingCompose: false,
       isDockerInstalled: undefined,
+      dockerVersion: undefined,
       notificationsMode: 'on',
       npmDependencies: ['fooDep', 'barDep', 'fooOpt', 'someDev', 'otherDev'],
       triggeredDeprecations: [],
@@ -234,6 +235,7 @@ describe('test/unit/lib/utils/telemetry/generate-payload.test.js', () => {
       isAutoUpdateEnabled: false,
       isUsingCompose: false,
       isDockerInstalled: undefined,
+      dockerVersion: undefined,
       notificationsMode: 'on',
       npmDependencies: [],
       triggeredDeprecations: [],
@@ -277,6 +279,7 @@ describe('test/unit/lib/utils/telemetry/generate-payload.test.js', () => {
       isAutoUpdateEnabled: false,
       isUsingCompose: false,
       isDockerInstalled: undefined,
+      dockerVersion: undefined,
       notificationsMode: 'on',
       triggeredDeprecations: [],
       installationType: 'global:other',
@@ -333,6 +336,7 @@ describe('test/unit/lib/utils/telemetry/generate-payload.test.js', () => {
       isAutoUpdateEnabled: false,
       isUsingCompose: false,
       isDockerInstalled: undefined,
+      dockerVersion: undefined,
       triggeredDeprecations: [],
       installationType: 'global:other',
       notificationsMode: 'on',
@@ -374,6 +378,7 @@ describe('test/unit/lib/utils/telemetry/generate-payload.test.js', () => {
       isAutoUpdateEnabled: false,
       isUsingCompose: false,
       isDockerInstalled: undefined,
+      dockerVersion: undefined,
       notificationsMode: 'on',
       triggeredDeprecations: [],
       installationType: 'global:other',