Merge branch 'mm/chore/uniform-errors-outside-trusted-ips' of github.com:heroku/cli into mm/chore/uniform-errors-outside-trusted-ips

Author: michaelmalave

packages/cli/package.json

@@ -61,7 +61,6 @@
     "printf": "0.6.1",
     "psl": "^1.9.0",
     "redis-parser": "^3.0.0",
-    "rollbar": "^2.26.4",
     "semver": "7.6.1",
     "shell-escape": "^0.2.0",
     "shell-quote": "^1.8.1",

packages/cli/src/global_telemetry.ts

@@ -1,4 +1,3 @@
-import * as Rollbar from 'rollbar'
 import {APIClient} from '@heroku-cli/command'
 import {Config} from '@oclif/core'
 import opentelemetry, {SpanStatusCode} from '@opentelemetry/api'
@@ -23,14 +22,6 @@ function getToken() {
 
 const debug = require('debug')('global_telemetry')
 
-const rollbar = new Rollbar({
-  accessToken: '20783109b0064dbb85be0b2c5a5a5f79',
-  captureUncaught: true,
-  captureUnhandledRejections: true,
-  environment: isDev ? 'development' : 'production',
-  codeVersion: version,
-})
-
 registerInstrumentations({
   instrumentations: [],
 })
@@ -153,22 +144,15 @@ export function reportCmdNotFound(config: any) {
   }
 }
 
-export async function sendTelemetry(currentTelemetry: any,  rollbarCb?: () => void) {
-  // send telemetry to honeycomb and rollbar
+export async function sendTelemetry(currentTelemetry: any) {
+  // send telemetry to honeycomb
   if (isTelemetryDisabled) {
     return
   }
 
   const telemetry = currentTelemetry
 
-  if (telemetry instanceof Error) {
-    await Promise.all([
-      sendToRollbar(telemetry, rollbarCb),
-      sendToHoneycomb(telemetry),
-    ])
-  } else {
-    await sendToHoneycomb(telemetry)
-  }
+  await sendToHoneycomb(telemetry)
 }
 
 export async function sendToHoneycomb(data: Telemetry | CLIError) {
@@ -202,32 +186,3 @@ export async function sendToHoneycomb(data: Telemetry | CLIError) {
     debug('could not send telemetry')
   }
 }
-
-export async function sendToRollbar(data: CLIError, rollbarCb?: () => void) {
-  // Make this awaitable so we can wait for it to finish before exiting
-  let promiseResolve
-  const rollbarPromise = new Promise((resolve, reject) => {
-    promiseResolve = () => {
-      if (rollbarCb) {
-        try {
-          rollbarCb()
-        } catch (error: any) {
-          reject(error)
-        }
-      }
-
-      resolve(null)
-    }
-  })
-
-  const rollbarError = {name: data.name, message: data.message, stack: data.stack, cli_run_duration: data.cliRunDuration}
-  try {
-    // send data to rollbar
-    rollbar.error('Failed to complete execution', rollbarError, promiseResolve)
-  } catch {
-    debug('Could not send error report')
-    return Promise.reject()
-  }
-
-  return rollbarPromise
-}

packages/cli/test/unit/global_telemetry.unit.test.ts

@@ -122,15 +122,4 @@ describe('telemetry', function () {
     await telemetry.sendToHoneycomb(mockTelemetry!)
     honeycombAPI.done()
   })
-
-  it('confirms successful request to rollbar', async function () {
-    const mockRollbarError = {name: 'testError', message: 'testMessage', stack: 'testStack', cli_run_duration: 1234}
-
-    const rollbarAPI = nock('https://api.rollbar.com:443')
-      .post('/api/1/item/', identity)
-      .reply(200)
-
-    await telemetry.sendToRollbar(mockRollbarError)
-    rollbarAPI.done()
-  })
 })

yarn.lock

@@ -6322,7 +6322,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"async@npm:^3.2.3, async@npm:~3.2.3":
+"async@npm:^3.2.3":
   version: 3.2.4
   resolution: "async@npm:3.2.4"
   checksum: 43d07459a4e1d09b84a20772414aa684ff4de085cbcaec6eea3c7a8f8150e8c62aa6cd4e699fe8ee93c3a5b324e777d34642531875a0817a35697522c1b02e89
@@ -7403,13 +7403,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"console-polyfill@npm:0.3.0":
-  version: 0.3.0
-  resolution: "console-polyfill@npm:0.3.0"
-  checksum: ad67d05ae9c95db9535981aa9de7e1b5f2e3f9d0b5179b08c051ca85ac7a3fedbc8851082ef9abae72c2e2328c85c87fbc53e8bd88e4a2cc483e9633645f8fe1
-  languageName: node
-  linkType: hard
-
 "constant-case@npm:^3.0.4":
   version: 3.0.4
   resolution: "constant-case@npm:3.0.4"
@@ -7896,15 +7889,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"decache@npm:^3.0.5":
-  version: 3.1.0
-  resolution: "decache@npm:3.1.0"
-  dependencies:
-    find: ^0.2.4
-  checksum: 8e5508a0238e9e7da66f17fe9b8429e7c6c92f5d40b23dedb1dce15219d899f9e5385553d2a143f44a5145a28ff8aab6008cc850ddedafcdd672505a14208c36
-  languageName: node
-  linkType: hard
-
 "decamelize-keys@npm:^1.1.0":
   version: 1.1.1
   resolution: "decamelize-keys@npm:1.1.1"
@@ -8334,15 +8318,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"error-stack-parser@npm:^2.0.4":
-  version: 2.1.4
-  resolution: "error-stack-parser@npm:2.1.4"
-  dependencies:
-    stackframe: ^1.3.4
-  checksum: 3b916d2d14c6682f287c8bfa28e14672f47eafe832701080e420e7cdbaebb2c50293868256a95706ac2330fe078cf5664713158b49bc30d7a5f2ac229ded0e18
-  languageName: node
-  linkType: hard
-
 "es-abstract@npm:^1.19.0, es-abstract@npm:^1.20.4":
   version: 1.21.2
   resolution: "es-abstract@npm:1.21.2"
@@ -9618,15 +9593,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"find@npm:^0.2.4":
-  version: 0.2.9
-  resolution: "find@npm:0.2.9"
-  dependencies:
-    traverse-chain: ~0.1.0
-  checksum: a308a3cf419a9ec06d41b4930fe152e929dc38425dfe93ea940c62fe9d0ba4636ff07a5c39a31e6be5764f4743ac6a9c80f40539f1ff92376b53d21a32d88e3d
-  languageName: node
-  linkType: hard
-
 "flat-cache@npm:^3.0.4":
   version: 3.0.4
   resolution: "flat-cache@npm:3.0.4"
@@ -10839,7 +10805,6 @@ __metadata:
     read-pkg: ^4.0.1
     redis-parser: ^3.0.0
     rimraf: 5.0.5
-    rollbar: ^2.26.4
     semver: 7.6.1
     shell-escape: ^0.2.0
     shell-quote: ^1.8.1
@@ -12161,7 +12126,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"json-stringify-safe@npm:^5.0.1, json-stringify-safe@npm:~5.0.0":
+"json-stringify-safe@npm:^5.0.1":
   version: 5.0.1
   resolution: "json-stringify-safe@npm:5.0.1"
   checksum: 48ec0adad5280b8a96bb93f4563aa1667fd7a36334f79149abd42446d0989f2ddc58274b479f4819f1f00617957e6344c886c55d05a4e15ebb4ab931e4a6a8ee
@@ -12659,13 +12624,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lru-cache@npm:~2.2.1":
-  version: 2.2.4
-  resolution: "lru-cache@npm:2.2.4"
-  checksum: 359545b52ea5256d4ffda8a262e200f6df279896aaeee9d228034a9a94dc0ba9faa7a87d169f45aa1d8622d428741005dd6b4dd8592a24ceae3658ff015a4b39
-  languageName: node
-  linkType: hard
-
 "make-dir@npm:^2.1.0":
   version: 2.1.0
   resolution: "make-dir@npm:2.1.0"
@@ -15192,13 +15150,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"request-ip@npm:~3.3.0":
-  version: 3.3.0
-  resolution: "request-ip@npm:3.3.0"
-  checksum: 9ca26f814201da19cb6f1a18da4f036803b770665ec0e7c556ea975ba553321922a5f04909f6dfc2371f695ca8aaa3c66f02c00a5e902c76435029804cdc4964
-  languageName: node
-  linkType: hard
-
 "require-directory@npm:^2.1.1":
   version: 2.1.1
   resolution: "require-directory@npm:2.1.1"
@@ -15449,25 +15400,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rollbar@npm:^2.26.4":
-  version: 2.26.4
-  resolution: "rollbar@npm:2.26.4"
-  dependencies:
-    async: ~3.2.3
-    console-polyfill: 0.3.0
-    decache: ^3.0.5
-    error-stack-parser: ^2.0.4
-    json-stringify-safe: ~5.0.0
-    lru-cache: ~2.2.1
-    request-ip: ~3.3.0
-    source-map: ^0.5.7
-  dependenciesMeta:
-    decache:
-      optional: true
-  checksum: ea0b24264a101112c720e786b7c8903e9f8d2cdf8ebab77ced64e4bb3899a0a1ed5f52c6ba0aa10a01faa85e354fb5142e6d0c4f3a282ad2e038175f3bba6ff0
-  languageName: node
-  linkType: hard
-
 "root-workspace-0b6124@workspace:.":
   version: 0.0.0-use.local
   resolution: "root-workspace-0b6124@workspace:."
@@ -16056,13 +15988,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"source-map@npm:^0.5.7":
-  version: 0.5.7
-  resolution: "source-map@npm:0.5.7"
-  checksum: 5dc2043b93d2f194142c7f38f74a24670cd7a0063acdaf4bf01d2964b402257ae843c2a8fa822ad5b71013b5fcafa55af7421383da919752f22ff488bc553f4d
-  languageName: node
-  linkType: hard
-
 "source-map@npm:^0.6.0, source-map@npm:^0.6.1":
   version: 0.6.1
   resolution: "source-map@npm:0.6.1"
@@ -16221,13 +16146,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"stackframe@npm:^1.3.4":
-  version: 1.3.4
-  resolution: "stackframe@npm:1.3.4"
-  checksum: bae1596873595c4610993fa84f86a3387d67586401c1816ea048c0196800c0646c4d2da98c2ee80557fd9eff05877efe33b91ba6cd052658ed96ddc85d19067d
-  languageName: node
-  linkType: hard
-
 "standard-engine@npm:^15.0.0":
   version: 15.1.0
   resolution: "standard-engine@npm:15.1.0"
@@ -16865,13 +16783,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"traverse-chain@npm:~0.1.0":
-  version: 0.1.0
-  resolution: "traverse-chain@npm:0.1.0"
-  checksum: dea79231a429a3dd80a829ff83e8914b6d0032d55dd0971f69d5273e95155869fca400dd9e22f0d91c3b0dda9668aaeeb694f525d7e5a55ca7f695cc149088a2
-  languageName: node
-  linkType: hard
-
 "treeify@npm:^1.1.0":
   version: 1.1.0
   resolution: "treeify@npm:1.1.0"