heroku 8.4.0-beta.1 → 8.4.0-beta.2

package/lib/global_telemetry.d.ts

@@ -38,7 +38,7 @@ export declare function setupTelemetry(config: any, opts: any): {
         command_not_found: boolean;
     };
     isVersionOrHelp: boolean;
-} | undefined;
+};
 export declare function computeDuration(cmdStartTime: any): number;
 export declare function reportCmdNotFound(config: any): {
     command: string;

package/lib/global_telemetry.js

@@ -6,17 +6,16 @@ const Rollbar = require("rollbar");
 const command_1 = require("@heroku-cli/command");
 const core_1 = require("@oclif/core");
 const api_1 = require("@opentelemetry/api");
-const packageParser_1 = require("./lib/utils/packageParser");
 const { Resource } = require('@opentelemetry/resources');
 const { SemanticResourceAttributes } = require('@opentelemetry/semantic-conventions');
 const { registerInstrumentations } = require('@opentelemetry/instrumentation');
 const { NodeTracerProvider } = require('@opentelemetry/sdk-trace-node');
 const { BatchSpanProcessor } = require('@opentelemetry/sdk-trace-base');
 const { OTLPTraceExporter } = require('@opentelemetry/exporter-trace-otlp-http');
-const isDev = process.env.IS_DEV_ENVIRONMENT === 'true';
 const path = require('path');
-const root = path.resolve(__dirname, '../package.json');
 const { version } = require('../package.json');
+const root = path.resolve(__dirname, '../package.json');
+const isDev = process.env.IS_DEV_ENVIRONMENT === 'true';
 const config = new core_1.Config({ root });
 const heroku = new command_1.APIClient(config);
 const token = heroku.auth;
@@ -26,6 +25,7 @@ const rollbar = new Rollbar({
     captureUncaught: true,
     captureUnhandledRejections: true,
     environment: isDev ? 'development' : 'production',
+    codeVersion: version,
 });
 registerInstrumentations({
     instrumentations: [],
@@ -54,9 +54,8 @@ exports.initializeInstrumentation = initializeInstrumentation;
 function setupTelemetry(config, opts) {
     const now = new Date();
     const cmdStartTime = now.getTime();
-    const isHelpOrVersionCmd = ((0, packageParser_1.getAllVersionFlags)().includes(opts.id) || (0, packageParser_1.getAllHelpFlags)().includes(opts.id));
     const isRegularCmd = Boolean(opts.Command);
-    const baseTelemetryObject = {
+    const irregularTelemetryObject = {
         command: opts.id,
         os: config.platform,
         version: config.version,
@@ -72,12 +71,10 @@ function setupTelemetry(config, opts) {
         },
         isVersionOrHelp: true,
     };
-    if (isHelpOrVersionCmd) {
-        return baseTelemetryObject;
-    }
     if (isRegularCmd) {
-        return Object.assign(Object.assign({}, baseTelemetryObject), { command: opts.Command.id, lifecycleHookCompletion: Object.assign(Object.assign({}, baseTelemetryObject.lifecycleHookCompletion), { prerun: true }), isVersionOrHelp: false });
+        return Object.assign(Object.assign({}, irregularTelemetryObject), { command: opts.Command.id, isVersionOrHelp: false, lifecycleHookCompletion: Object.assign(Object.assign({}, irregularTelemetryObject.lifecycleHookCompletion), { prerun: true }) });
     }
+    return irregularTelemetryObject;
 }
 exports.setupTelemetry = setupTelemetry;
 function computeDuration(cmdStartTime) {

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "8.4.0-beta.1",
+  "version": "8.4.0-beta.2",
   "commands": {
     "console": {
       "id": "console",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "heroku",
   "description": "CLI to interact with Heroku",
-  "version": "8.4.0-beta.1",
+  "version": "8.4.0-beta.2",
   "author": "Jeff Dickey @jdxcode",
   "bin": "./bin/run",
   "bugs": "https://github.com/heroku/cli/issues",
@@ -9,8 +9,8 @@
     "@heroku-cli/color": "1.1.14",
     "@heroku-cli/command": "^10.0.0",
     "@heroku-cli/notifications": "^1.2.2",
-    "@heroku-cli/plugin-addons-v5": "^8.4.0-beta.1",
-    "@heroku-cli/plugin-apps-v5": "^8.4.0-beta.1",
+    "@heroku-cli/plugin-addons-v5": "^8.4.0-beta.2",
+    "@heroku-cli/plugin-apps-v5": "^8.4.0-beta.2",
     "@heroku-cli/plugin-certs-v5": "^8.2.0",
     "@heroku-cli/plugin-ci-v5": "^8.2.0",
     "@heroku-cli/plugin-container-registry-v5": "^8.2.0",
@@ -19,7 +19,7 @@
     "@heroku-cli/plugin-ps": "^8.1.7",
     "@heroku-cli/plugin-ps-exec": "^2.4.0",
     "@heroku-cli/plugin-redis-v5": "^8.2.0",
-    "@heroku-cli/plugin-spaces": "^8.4.0-beta.1",
+    "@heroku-cli/plugin-spaces": "^8.4.0-beta.2",
     "@heroku-cli/schema": "^1.0.25",
     "@heroku/buildpack-registry": "^1.0.1",
     "@heroku/eventsource": "^1.0.7",
@@ -338,5 +338,5 @@
     "version": "oclif readme --multi && git add README.md ../../docs"
   },
   "types": "lib/index.d.ts",
-  "gitHead": "927cfd547875cc2fae94d46e31c000db27d492b6"
+  "gitHead": "d5b7eebcbae429334e25eecff745ebccb9ade4af"
 }