From 6d50843eeda05a2a06a9638469a024bdbe607015 Mon Sep 17 00:00:00 2001 From: John Knox Date: Thu, 31 Jan 2019 03:17:13 -0800 Subject: [PATCH] Rename recordSuccessMetric to reportPlatformFailures Summary: Change from `recordSuccessMetric` to `reportPlatformFailures`, because the next diff adds `reportPluginFailures` and I want to distinguish the two. Reviewed By: passy Differential Revision: D13878380 fbshipit-source-id: 9c6b8bfe1ed2e1a8bbe5aacbec31d24e9aa39171 --- src/chrome/ScreenCaptureButtons.js | 6 +++--- src/dispatcher/androidDevice.js | 8 ++++---- src/server.js | 6 +++--- src/utils/CertificateProvider.js | 4 ++-- src/utils/metrics.js | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/chrome/ScreenCaptureButtons.js b/src/chrome/ScreenCaptureButtons.js index aa1b0016c..ee303c31a 100644 --- a/src/chrome/ScreenCaptureButtons.js +++ b/src/chrome/ScreenCaptureButtons.js @@ -15,7 +15,7 @@ import adb from 'adbkit-fb'; import {exec, spawn} from 'child_process'; import {remote} from 'electron'; import path from 'path'; -import {recordSuccessMetric} from '../utils/metrics'; +import {reportPlatformFailures} from '../utils/metrics'; let CAPTURE_LOCATION = remote.app.getPath('desktop'); try { @@ -126,7 +126,7 @@ class ScreenCaptureButtons extends Component { const {selectedDevice} = this.props; if (selectedDevice instanceof AndroidDevice) { - return recordSuccessMetric( + return reportPlatformFailures( selectedDevice.adb .screencap(selectedDevice.serial) .then(writePngStreamToFile) @@ -135,7 +135,7 @@ class ScreenCaptureButtons extends Component { ).catch(console.error); } else if (selectedDevice instanceof IOSDevice) { const screenshotPath = path.join(CAPTURE_LOCATION, getFileName('png')); - return recordSuccessMetric( + return reportPlatformFailures( new Promise((resolve, reject) => { exec( `xcrun simctl io booted screenshot "${screenshotPath}"`, diff --git a/src/dispatcher/androidDevice.js b/src/dispatcher/androidDevice.js index 166d14925..e637e0bbe 100644 --- a/src/dispatcher/androidDevice.js +++ b/src/dispatcher/androidDevice.js @@ -13,7 +13,7 @@ import type {Store} from '../reducers/index.js'; import type BaseDevice from '../devices/BaseDevice'; import type Logger from '../fb-stubs/Logger.js'; import {registerDeviceCallbackOnPlugins} from '../utils/onRegisterDevice.js'; -import {recordSuccessMetric} from '../utils/metrics'; +import {reportPlatformFailures} from '../utils/metrics'; const adb = require('adbkit-fb'); function createDevice( @@ -70,7 +70,7 @@ export default (store: Store, logger: Logger) => { const adbPath = process.env.ANDROID_HOME ? `${process.env.ANDROID_HOME}/platform-tools/adb` : 'adb'; - return recordSuccessMetric( + return reportPlatformFailures( promisify(child_process.exec)(`${adbPath} start-server`) .then(result => { if (result.error) { @@ -89,7 +89,7 @@ export default (store: Store, logger: Logger) => { /* In the event that starting adb with the above method fails, fallback to using adbkit, though its known to be unreliable. */ const unsafeClient = adb.createClient(); - return recordSuccessMetric( + return reportPlatformFailures( promiseRetry( (retry, number) => { return unsafeClient @@ -131,7 +131,7 @@ export default (store: Store, logger: Logger) => { }, ); - recordSuccessMetric(createClient(), 'createADBClient') + reportPlatformFailures(createClient(), 'createADBClient') .then(client => { client .trackDevices() diff --git a/src/server.js b/src/server.js index 5a4fb17e6..999cfd6a4 100644 --- a/src/server.js +++ b/src/server.js @@ -17,7 +17,7 @@ import {Single} from 'rsocket-flowable'; import Client from './Client.js'; import type {UninitializedClient} from './UninitializedClient'; import {RecurringError} from './utils/errors'; -import {recordSuccessMetric} from './utils/metrics'; +import {reportPlatformFailures} from './utils/metrics'; const EventEmitter = (require('events'): any); const invariant = require('invariant'); @@ -67,7 +67,7 @@ export default class Server extends EventEmitter { this.insecureServer = this.startServer(insecure); return; }); - recordSuccessMetric(this.initialisePromise, 'initializeServer'); + reportPlatformFailures(this.initialisePromise, 'initializeServer'); return this.initialisePromise; } @@ -182,7 +182,7 @@ export default class Server extends EventEmitter { const {csr, destination} = json; return new Single(subscriber => { subscriber.onSubscribe(); - recordSuccessMetric( + reportPlatformFailures( this.certificateProvider.processCertificateSigningRequest( csr, clientData.os, diff --git a/src/utils/CertificateProvider.js b/src/utils/CertificateProvider.js index 2ae75e450..9892377d4 100644 --- a/src/utils/CertificateProvider.js +++ b/src/utils/CertificateProvider.js @@ -21,7 +21,7 @@ const tmp = require('tmp'); const tmpFile = promisify(tmp.file); const tmpDir = promisify(tmp.dir); import iosUtil from '../fb-stubs/iOSContainerUtility'; -import {recordSuccessMetric} from './metrics'; +import {reportPlatformFailures} from './metrics'; // Desktop file paths const os = require('os'); @@ -78,7 +78,7 @@ export default class CertificateProvider { constructor(server: Server, logger: LogManager) { this.logger = logger; this.adb = adb.createClient(); - this.certificateSetup = recordSuccessMetric( + this.certificateSetup = reportPlatformFailures( this.ensureServerCertExists(), 'ensureServerCertExists', ); diff --git a/src/utils/metrics.js b/src/utils/metrics.js index 02a9ca90f..99bde8c38 100644 --- a/src/utils/metrics.js +++ b/src/utils/metrics.js @@ -12,7 +12,7 @@ import {getInstance} from '../fb-stubs/Logger'; failure state of it, with a given name, based on whether it's fulfilled or rejected. */ -export function recordSuccessMetric( +export function reportPlatformFailures( promise: Promise<*>, name: string, ): Promise<*> {