[turtle-cli] don't require gulp-cli installed globally

* add supervisord

- restart pod only if there is at least 5 failures in 10 minutes

* Update CHANGELOG.md

Co-Authored-By: Dominik Sokal <[email protected]>

* Update scripts/android/supervisordEventListener.sh

Co-Authored-By: Dominik Sokal <[email protected]>

CHANGELOG.md

@@ -5,8 +5,45 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+
+## [0.8.4] - 2019-06-13
+### Changed
+- Upgraded `sharp` from `0.21.3` to `0.22.1`.
+
+## [0.8.3] - 2019-06-13
+### Added
+- Running Android Turtle process with `supervisor` (pod is restarted if there were 5 failures in the last 10 minutes).
+### Changed
+- `turtle-cli` is now fetching the app manifest before running the build.
+
+## [0.8.2] - 2019-06-11
+### Changed
+- Updated Android shell app for SDK33 to remove `expo-face-detector` and `expo-payments-stripe` from standalone builds.
+- Updated Android shell app for SDK33 to get rid of `node_modules` for `tools-public`.
+- From now on, `turtle-cli` installs dependencies for `tools-public` in shell apps for SDK versions < 33.
+### Fixed
+- Android builds with turtle-cli by installing all unmodules if `dependencies` is empty.
+
+## [0.8.1] - 2019-06-10
+### Changed
+- Add expo dependencies when resolving unimodules.
+### Fixed
+- Support for Android tarballs without `universe-package.json`.
+
+## [0.8.0] - 2019-06-07
 ### Added
 - Turtle CLI logo to the project (created by [@zularizal](https://github.com/zularizal))!
+- Shell apps for SDK 33.
+- Support for Android App Bundles (App bundles are built by default, use `-t apk` to build apk).
+### Changed
+- Updated Android shell app for SDK 32 to fix AppAuth issue (https://github.com/expo/expo/pull/4115) and to fix a newer than expected JSC version.
+- Default value for build timeout to 15 minutes.
+- Added filtering of logs (strips out download progress) when downloading SDK tools.
+- `xdl` -> `@expo/xdl`, updated `@expo/xdl`.
+### Fixed
+- Generating Android keystore in turtle when one is not passed to turtle-cli (https://github.com/expo/turtle/pull/65).
+- Upload logs to s3 if build has been canceled or timed out.
+- Unhandled exception on asset download (xdl).
 
 ## [0.7.2] - 2019-05-09
 ### Added

Dockerfile

@@ -20,9 +20,11 @@ RUN dpkg --add-architecture i386 && \
   libc6:i386\
   libncurses5:i386\
   libstdc++6:i386\
+  rsync\
   unzip\
   yarn\
   zlib1g:i386\
+  supervisor\
   --no-install-recommends && \
   apt-get clean
 
@@ -50,20 +52,8 @@ ENV PATH ${ANDROID_HOME}/tools:${PATH}
 ENV PATH ${ANDROID_HOME}/tools/bin:${PATH}
 ENV PATH ${ANDROID_HOME}/build-tools/28.0.3/:${PATH}
 
-RUN yes | sdkmanager --licenses > /dev/null
-RUN yes | sdkmanager \
-  "platforms;android-23" \
-  "platforms;android-24" \
-  "platforms;android-25" \
-  "platforms;android-26" \
-  "platforms;android-27" \
-  "platforms;android-28"
-RUN yes | sdkmanager "platform-tools"
-RUN yes | sdkmanager "build-tools;28.0.3"
-RUN yes | sdkmanager \
-  "extras;android;m2repository" \
-  "extras;google;m2repository" \
-  "extras;google;google_play_services"
+ADD scripts/android/configureAndroidSdk.sh /tmp/configureAndroidSdk.sh
+RUN /tmp/configureAndroidSdk.sh --install-all-platforms
 
 # Install Android NDK
 ENV ANDROID_NDK_VERSION android-ndk-r10e
@@ -99,9 +89,11 @@ RUN rm gradle-4.4-all.zip
 ENV GRADLE_HOME /usr/local/gradle-4.4
 ENV PATH ${GRADLE_HOME}/bin:$PATH
 
-ADD . /app
+ADD . /app/turtle
 
-RUN for SDK_VERSION in `ls /app/workingdir/android/`; do \
+RUN mv /app/turtle/workingdir /app && \
+    for SDK_VERSION in `ls /app/workingdir/android/`; do \
+      echo "preparing $SDK_VERSION shell app" && \
       cd /app/workingdir/android/$SDK_VERSION && \
       if [ -f universe-package.json ]; then \
       mv package.json exponent-package.json && \
@@ -112,11 +104,14 @@ RUN for SDK_VERSION in `ls /app/workingdir/android/`; do \
       else \
       yarn install; \
       fi \
-    ; done
-
-WORKDIR /app
+    ; done && \
+    mv /app/workingdir /app/turtle
 
 ENV NODE_ENV "production"
-ENV TURTLE_WORKING_DIR_PATH /app/workingdir/
+ENV TURTLE_WORKING_DIR_PATH /app/turtle/workingdir/
 
-CMD ["node", "./build/server.js"]
+WORKDIR /app/turtle
+
+ADD supervisord.conf /etc/supervisor/conf.d/supervisord.conf
+
+CMD ["/usr/bin/supervisord"]

k8s/android/turtle-deployment.template.yml

@@ -22,7 +22,7 @@ spec:
         environment: ${NAMESPACE}
     spec:
       restartPolicy: Always
-      terminationGracePeriodSeconds: 1800 ## wait 30 minutes for any builds to complete
+      terminationGracePeriodSeconds: 1200 ## wait 20 minutes for any builds to complete
       tolerations:
       - key: dedicated
         operator: Equal
@@ -128,6 +128,16 @@ spec:
               secretKeyRef:
                 name: turtle-js-config
                 key: api_port
+          - name: DATADOG_API_KEY
+            valueFrom:
+              secretKeyRef:
+                name: turtle-js-config
+                key: datadog_api_key
+          - name: DATADOG_APP_KEY
+            valueFrom:
+              secretKeyRef:
+                name: turtle-js-config
+                key: datadog_app_key
           # other vars
           - name: GRADLE_DAEMON_DISABLED
             value: "1"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "turtle-cli",
-  "version": "0.7.2",
+  "version": "0.8.4",
   "description": "The command-line tool for building standalone Expo apps",
   "preferGlobal": true,
   "scripts": {
@@ -36,7 +36,11 @@
     "set-priorities:default": "expenv ts-node -r tsconfig-paths/register --files src/scripts/setConfigurations.ts",
     "set-priorities:local": "EXPENV_OVERRIDES=local-common,local,local-queue yarn set-priorities:default",
     "set-priorities:staging": "yarn set-priorities:default",
-    "set-priorities:production": "EXPENV_OVERRIDES=prod yarn set-priorities:default"
+    "set-priorities:production": "EXPENV_OVERRIDES=prod yarn set-priorities:default",
+    "set-replica-count:default": "expenv ts-node -r tsconfig-paths/register --files src/scripts/setReplicaCount.ts | bunyan -o short -l debug",
+    "set-replica-count:local": "EXPENV_OVERRIDES=local-common,local,local-queue yarn set-replica-count:default",
+    "set-replica-count:staging": "yarn set-replica-count:default",
+    "set-replica-count:production": "EXPENV_OVERRIDES=prod yarn set-replica-count:default"
   },
   "husky": {
     "hooks": {
@@ -55,7 +59,7 @@
   "files": [
     "bin",
     "build",
-    "scripts/cli",
+    "scripts/android/configureAndroidSdk.sh",
     "shellTarballs"
   ],
   "keywords": [
@@ -79,7 +83,7 @@
     "@types/fs-extra": "^5.0.4",
     "@types/jest": "^23.3.9",
     "@types/joi": "^13.4.3",
-    "@types/lodash": "^4.14.109",
+    "@types/lodash": "^4.14.129",
     "@types/progress": "^2.0.1",
     "@types/raven": "^2.5.1",
     "@types/request": "^2.47.1",
@@ -106,6 +110,7 @@
   },
   "dependencies": {
     "@expo/spawn-async": "^1.4.2",
+    "@expo/xdl": "54.1.4",
     "@google-cloud/logging-bunyan": "^0.9.5",
     "async-retry": "^1.2.1",
     "aws-sdk": "^2.226.1",
@@ -115,22 +120,22 @@
     "commander": "^2.15.1",
     "copy": "^0.3.1",
     "decompress": "^4.2.0",
+    "dogapi": "^2.8.3",
     "fs-extra": "^6.0.0",
     "ioredis": "^3.2.2",
     "is-semver": "^1.0.8",
     "joi": "^13.2.0",
-    "lodash": "^4.17.10",
+    "lodash": "^4.17.11",
     "progress": "^2.0.0",
     "raven": "^2.6.2",
     "request": "^2.88.0",
     "request-progress": "^3.0.0",
     "semver": "^6.0.0",
-    "sharp": "^0.21.0",
+    "sharp": "0.22.1",
     "source-map-support": "^0.5.6",
     "tar": "^4.4.6",
     "uuid": "^3.2.1",
-    "which": "^1.3.1",
-    "xdl": "53.5.4"
+    "which": "^1.3.1"
   },
   "optionalDependencies": {
     "@expo/traveling-fastlane-darwin": "1.9.4"

scripts/android/configureAndroidSdk.sh

@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+SDKMANAGER=$ANDROID_HOME/tools/bin/sdkmanager
+
+yes | $SDKMANAGER --licenses > /dev/null
+if [[ "$1" = "--install-all-platforms" ]]; then
+  yes | $SDKMANAGER \
+    "platforms;android-23" \
+    "platforms;android-24" \
+    "platforms;android-25" \
+    "platforms;android-26" \
+    "platforms;android-27" | grep -v '='; [[ ${PIPESTATUS[1]} = 0 ]]
+fi
+yes | $SDKMANAGER "platforms;android-28" | grep -v '='; [[ ${PIPESTATUS[1]} = 0 ]]
+yes | $SDKMANAGER "platform-tools" | grep -v '='; [[ ${PIPESTATUS[1]} = 0 ]]
+yes | $SDKMANAGER "build-tools;28.0.3" | grep -v '='; [[ ${PIPESTATUS[1]} = 0 ]]
+yes | $SDKMANAGER \
+  "extras;android;m2repository" \
+  "extras;google;m2repository" \
+  "extras;google;google_play_services" | grep -v '='; [[ ${PIPESTATUS[1]} = 0 ]]

scripts/android/supervisordEventListener.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+printf "READY\n"; # signal to superivsord that listener is ready
+
+while read line; do
+  echo "[supervisord:eventlistener] Processing Event: $line" >&2;
+  kill -SIGQUIT $PPID
+done < /dev/stdin

scripts/cli/configureAndroidSdk.sh

@@ -1,12 +0,0 @@
-#!/bin/bash
-
-SDKMANAGER=$ANDROID_HOME/tools/bin/sdkmanager
-
-yes | $SDKMANAGER --licenses > /dev/null
-yes | $SDKMANAGER "platforms;android-28"
-yes | $SDKMANAGER "platform-tools"
-yes | $SDKMANAGER "build-tools;28.0.3"
-yes | $SDKMANAGER \
-  "extras;android;m2repository" \
-  "extras;google;m2repository" \
-  "extras;google;google_play_services"

scripts/setWorkingdirMode.sh

@@ -61,6 +61,10 @@ setup_remote() {
       mv $sdk/package.json $sdk/exponent-package.json
       mv $sdk/universe-package.json $sdk/package.json
       cd $sdk && yarn
+    else
+      if [[ -f "$sdk/package.json" ]]; then
+        cd $sdk && yarn
+      fi
     fi
   done
 }

scripts/tests/runAndroidSmokeTestsCI.sh

@@ -21,5 +21,6 @@ export API_HOSTNAME="staging.expo.io"
 export API_PORT="443"
 export REDIS_URL="noop"
 export REDIS_CONFIG_URL="noop"
+export DATADOG_DISABLED="true"
 
 yarn test:smoke:android

scripts/tests/runIOSSmokeTestsCI.sh

@@ -19,6 +19,7 @@ export API_HOSTNAME="staging.expo.io"
 export API_PORT="443"
 export REDIS_URL="noop"
 export REDIS_CONFIG_URL="noop"
+export DATADOG_DISABLED="true"
 
 ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/../.. && pwd )"
 SDK_VERSION=sdk32 $ROOT_DIR/scripts/ios/fetchRemoteIosTarball.sh

scripts/tests/runUnitTestsCI.sh

@@ -21,5 +21,6 @@ export API_HOSTNAME="noop"
 export API_PORT="443"
 export REDIS_URL="noop"
 export REDIS_CONFIG_URL="noop"
+export DATADOG_DISABLED="true"
 
 yarn test:unit

shellTarballs/android/sdk26

@@ -1 +0,0 @@
-s3://exp-artifacts/android-shell-builder-c19ce0d88a153f481fd790e23bdcd6f2d5ea7fd6.tar.gz

shellTarballs/android/sdk32

@@ -1 +1 @@
-s3://exp-artifacts/android-shell-builder-0cab68670fc50ce1dc16b7d86ca7976870062c39.tar.gz
+s3://exp-artifacts/android-shell-builder-f796aaffa0b5715079b2950faf26c2ff4e53e4c0.tar.gz

shellTarballs/android/sdk33

@@ -0,0 +1 @@
+s3://exp-artifacts/android-shell-builder-e244e865ed8cb8e20d29ea00b6373845d1c61068.tar.gz

shellTarballs/ios/client

@@ -1 +1 @@
-s3://exp-artifacts/ios-expo-client-15bb883c22173d5b01df19421580170e776041d0.tar.gz
+s3://exp-artifacts/ios-expo-client-a2b1e16f330b36fa0dc627a76caabe4d2ff45f77.tar.gz

shellTarballs/ios/sdk26

@@ -1 +0,0 @@
-s3://exp-artifacts/ios-shell-builder-sdk-26-db356a09877642d64023af98e4e2e1e632fbe4df.tar.gz

shellTarballs/ios/sdk33

@@ -0,0 +1 @@
+s3://exp-artifacts/ios-shell-builder-sdk-latest-a2b1e16f330b36fa0dc627a76caabe4d2ff45f77.tar.gz

src/aws/cloudwatch/dimensions.ts

@@ -13,3 +13,28 @@ export const TYPE_DIMENSIONS = (type: string) => [
     { Name: 'host', Value: config.hostname },
   ],
 ];
+
+export const PRIORITY_DIMENSIONS = (type: string, priority: string) => [
+  [
+    { Name: 'env', Value: config.deploymentEnv },
+    { Name: 'platform', Value: config.platform },
+    { Name: 'priority', Value: priority },
+  ],
+  [
+    { Name: 'env', Value: config.deploymentEnv },
+    { Name: 'platform', Value: config.platform },
+    { Name: 'type', Value: type },
+  ],
+  [
+    { Name: 'env', Value: config.deploymentEnv },
+    { Name: 'platform', Value: config.platform },
+    { Name: 'type', Value: type },
+    { Name: 'priority', Value: priority },
+  ],
+  [
+    { Name: 'env', Value: config.deploymentEnv },
+    { Name: 'platform', Value: config.platform },
+    { Name: 'type', Value: type },
+    { Name: 'host', Value: config.hostname },
+  ],
+];

src/bin/commands/build/android.ts

@@ -1,6 +1,5 @@
 import fs from 'fs-extra';
 import _ from 'lodash';
-import uuid from 'uuid';
 
 import { ErrorWithCommandHelp } from 'turtle/bin/commands/ErrorWithCommandHelp';
 import { createBuilderAction } from 'turtle/bin/utils/builder';
@@ -15,18 +14,24 @@ export default (program: any, setCommonCommandOptions: any) => {
     .option(
       '--keystore-path <app.jks>',
       'path to your Keystore (please provide Keystore password and Key password as EXPO_ANDROID_KEYSTORE_PASSWORD'
-      + 'and EXPO_ANDROID_KEY_PASSWORD env variables)',
+      + ' and EXPO_ANDROID_KEY_PASSWORD env variables)',
     )
     .option('--keystore-alias <alias>', 'keystore Alias')
+    .option(
+      '-t --type <build>',
+      'type of build: app-bundle|apk',
+      /^(app-bundle|apk)$/i,
+      'app-bundle',
+    )
     .description(
-      'Build a standalone APK for your project, signed and ready for submission to the Google Play Store.',
+      'Build a standalone APK or App Bundle for your project, signed and ready for submission to the Google Play'
+      + ' Store.',
     )
     .asyncAction(
       createBuilderAction({
         program,
         command,
         prepareCredentials,
-        buildJobObject,
         builder,
         platform: PLATFORMS.ANDROID,
         os: ['darwin', 'linux'],
@@ -34,20 +39,6 @@ export default (program: any, setCommonCommandOptions: any) => {
     );
 };
 
-const buildJobObject = (appJSON: any, { releaseChannel, username, projectDir, publicUrl }: any, credentials: any) => ({
-  config: {
-    ..._.get(appJSON, 'expo.android.config', {}),
-    releaseChannel,
-    publicUrl,
-  },
-  id: uuid.v4(),
-  platform: PLATFORMS.ANDROID,
-  sdkVersion: _.get(appJSON, 'expo.sdkVersion'),
-  projectDir,
-  experienceName: `@${username}/${_.get(appJSON, 'expo.slug')}`,
-  ...(credentials && { credentials }),
-});
-
 const prepareCredentials = async (cmd: any) => {
   const { keystorePath, keystoreAlias } = cmd;
   const keystorePassword = process.env.EXPO_ANDROID_KEYSTORE_PASSWORD;

src/bin/commands/build/ios.ts

@@ -1,11 +1,10 @@
 import fs from 'fs-extra';
 import _ from 'lodash';
-import uuid from 'uuid';
 
 import { ErrorWithCommandHelp } from 'turtle/bin/commands/ErrorWithCommandHelp';
 import { createBuilderAction } from 'turtle/bin/utils/builder';
 import builder from 'turtle/builders/ios';
-import { IOS, PLATFORMS } from 'turtle/constants';
+import { IOS_BUILD_TYPES, PLATFORMS } from 'turtle/constants';
 
 export default (program: any, setCommonCommandOptions: any) => {
   const command = program.command('build:ios [project-dir]');
@@ -32,7 +31,6 @@ export default (program: any, setCommonCommandOptions: any) => {
         program,
         command,
         prepareCredentials,
-        buildJobObject,
         builder,
         platform: PLATFORMS.IOS,
         os: 'darwin',
@@ -40,23 +38,8 @@ export default (program: any, setCommonCommandOptions: any) => {
     );
 };
 
-const buildJobObject = (appJSON: any, { releaseChannel, buildType, username, publicUrl }: any, credentials: any) => ({
-  config: {
-    ..._.get(appJSON, 'expo.ios.config', {}),
-    buildType,
-    releaseChannel,
-    bundleIdentifier: _.get(appJSON, 'expo.ios.bundleIdentifier'),
-    publicUrl,
-  },
-  id: uuid.v4(),
-  platform: PLATFORMS.IOS,
-  sdkVersion: _.get(appJSON, 'expo.sdkVersion'),
-  experienceName: `@${username}/${_.get(appJSON, 'expo.slug')}`,
-  ...(credentials && { credentials }),
-});
-
 const prepareCredentials = async (cmd: any) => {
-  if (cmd.type !== IOS.BUILD_TYPES.ARCHIVE) {
+  if (cmd.type !== IOS_BUILD_TYPES.ARCHIVE) {
     return null;
   }
 

src/bin/index.ts

@@ -1,8 +1,8 @@
 import path from 'path';
 
+import { LoggerDetach, ModuleVersion } from '@expo/xdl';
 import program, { Command } from 'commander';
 import fs from 'fs-extra';
-import { LoggerDetach, ModuleVersion } from 'xdl';
 
 import * as commands from 'turtle/bin/commands';
 import logger from 'turtle/logger';

src/bin/setup/android/index.ts

@@ -1,9 +1,9 @@
 import path from 'path';
 import util from 'util';
 
+import { ExponentTools } from '@expo/xdl';
 import fs from 'fs-extra';
 import _which from 'which';
-import { ExponentTools } from 'xdl';
 
 import ensureAndroidNDKIsPresent from 'turtle/bin/setup/android/ndk';
 import ensureAndroidSDKIsPresent from 'turtle/bin/setup/android/sdk';
@@ -20,10 +20,6 @@ const REQUIRED_TOOLS: IToolDefinition[] = [
     command: 'bash',
     missingDescription: 'Please install bash',
   },
-  {
-    command: 'gulp',
-    missingDescription: 'Run `npm install -g gulp-cli` (or `yarn global add gulp-cli`) to install gulp',
-  },
   {
     command: 'javac',
     missingDescription: 'Please install JDK (version 8 or newer) - check https://jdk.java.net/',
@@ -67,18 +63,26 @@ function formatShellAppTarballUriPath(sdkMajorVersion: string) {
   return path.join(config.directories.shellTarballsDir, PLATFORMS.ANDROID, `sdk${sdkMajorVersion}`);
 }
 
-async function _shellAppPostDownloadAction(workingdir: string) {
+async function _shellAppPostDownloadAction(sdkVersion: string, workingdir: string) {
   const inWorkingdir = (filename: string) => path.join(workingdir, filename);
 
-  await fs.move(inWorkingdir('package.json'), inWorkingdir('exponent-package.json'));
-  await fs.move(inWorkingdir('universe-package.json'), inWorkingdir('package.json'));
-  await _installNodeModules(workingdir);
-  await fs.move(inWorkingdir('package.json'), inWorkingdir('universe-package.json'));
-  await fs.move(inWorkingdir('exponent-package.json'), inWorkingdir('package.json'));
+  if (await fs.pathExists(inWorkingdir('universe-package.json'))) {
+    // legacy shell app built from universe
+    await fs.move(inWorkingdir('package.json'), inWorkingdir('exponent-package.json'));
+    await fs.move(inWorkingdir('universe-package.json'), inWorkingdir('package.json'));
+    await _installNodeModules(workingdir);
+    await fs.move(inWorkingdir('package.json'), inWorkingdir('universe-package.json'));
+    await fs.move(inWorkingdir('exponent-package.json'), inWorkingdir('package.json'));
+  } else {
+    // new shell app built from expo or not
+    await _installNodeModules(workingdir);
+  }
 
-  // TODO: remove following lines after upgrading android shell app
-  const toolsPublicDir = path.join(workingdir, 'tools-public');
-  await _installNodeModules(toolsPublicDir);
+  // TODO: remove this after making sure that we don't need node_modules in tools-public for older sdks
+  if (ExponentTools.parseSdkMajorVersion(sdkVersion) < 33) {
+    const toolsPublicDir = path.join(workingdir, 'tools-public');
+    await _installNodeModules(toolsPublicDir);
+  }
 }
 
 async function _installNodeModules(cwd: string) {

src/bin/setup/android/sdk.ts

@@ -1,9 +1,9 @@
 import os from 'os';
 import path from 'path';
 
+import { ExponentTools } from '@expo/xdl';
 import decompress from 'decompress';
 import fs from 'fs-extra';
-import { ExponentTools } from 'xdl';
 
 import { formatArtifactDownloadPath } from 'turtle/bin/setup/utils/common';
 import download from 'turtle/bin/setup/utils/downloader';
@@ -52,7 +52,7 @@ async function _configureSdk(androidSdkDir: string) {
   await ExponentTools.spawnAsyncThrowError('./configureAndroidSdk.sh', [], {
     pipeToLogger: true,
     loggerFields: LOGGER_FIELDS,
-    cwd: path.join(config.directories.rootDir, 'scripts/cli'),
+    cwd: path.join(config.directories.rootDir, 'scripts/android'),
     env: {
       ...process.env,
       ANDROID_HOME: androidSdkDir,

src/bin/setup/ios.ts

@@ -3,7 +3,7 @@ import trim from 'lodash/trim';
 import path from 'path';
 import semver from 'semver';
 
-import { ExponentTools } from 'xdl';
+import { ExponentTools } from '@expo/xdl';
 
 import { checkSystem, ensureShellAppIsPresent } from 'turtle/bin/setup/utils/common';
 import { IToolDefinition } from 'turtle/bin/setup/utils/toolsDetector';

src/bin/setup/utils/common.ts

@@ -1,8 +1,8 @@
 import path from 'path';
 
+import { ExponentTools } from '@expo/xdl';
 import fs from 'fs-extra';
 import tar from 'tar';
-import { ExponentTools } from 'xdl';
 
 import download from 'turtle/bin/setup/utils/downloader';
 import { ensureToolsAreInstalled, IToolDefinition } from 'turtle/bin/setup/utils/toolsDetector';
@@ -17,7 +17,7 @@ interface IShellAppFormaters {
   formatShellAppTarballUriPath: (sdkMajorVersion: string) => string;
 }
 
-type PostDownloadAction = (workingdir: string) => void;
+type PostDownloadAction = (sdkVersion: string, workingdir: string) => void;
 
 export async function checkSystem(requiredTools: IToolDefinition[]) {
   await ensureToolsAreInstalled(requiredTools);
@@ -35,7 +35,7 @@ export async function ensureShellAppIsPresent(
   l.info(`shell app for SDK ${sdkVersion} doesn't exist, downloading...`);
   await _downloadShellApp(sdkVersion, workingdir, formatters);
   if (postDownloadAction) {
-    await postDownloadAction(workingdir);
+    await postDownloadAction(sdkVersion, workingdir);
   }
 }
 

src/bin/utils/builder.ts

@@ -1,10 +1,13 @@
+import { ExponentTools } from '@expo/xdl';
 import _ from 'lodash';
+import uuid from 'uuid';
 
 import { ErrorWithCommandHelp } from 'turtle/bin/commands/ErrorWithCommandHelp';
 import { ErrorWithProgramHelp } from 'turtle/bin/commands/ErrorWithProgramHelp';
 import setup from 'turtle/bin/setup/setup';
 import * as ProjectUtils from 'turtle/bin/utils/project';
 import * as UserUtils from 'turtle/bin/utils/user';
+import { getExperienceUrl } from 'turtle/builders/utils/common';
 import logger from 'turtle/logger';
 import { sanitizeJob } from 'turtle/validator';
 
@@ -12,7 +15,6 @@ export function createBuilderAction({
   program,
   command,
   prepareCredentials,
-  buildJobObject,
   builder,
   platform,
   os,
@@ -65,7 +67,7 @@ export function createBuilderAction({
       await setup(platform, sdkVersion);
       const credentials = await prepareCredentials(cmd);
       const rawJob = {
-        ...buildJobObject(appJSON, args, credentials),
+        ...await buildJobObject(platform, appJSON, args, credentials),
         ...cmd.buildDir && { fakeUploadDir: ProjectUtils.resolveAbsoluteDir(cmd.buildDir) },
         ...cmd.output && { fakeUploadBuildPath: ProjectUtils.resolveAbsoluteDir(cmd.output) },
       };
@@ -82,3 +84,37 @@ export function createBuilderAction({
     }
   };
 }
+
+const buildJobObject = async (
+  platform: 'android' | 'ios',
+  appJSON: any,
+  { releaseChannel, buildType, username, publicUrl, projectDir }: any,
+  credentials: any,
+) => {
+  const job = {
+    config: {
+      ..._.get(appJSON, 'expo.ios.config', {}),
+      buildType,
+      releaseChannel,
+      ...(platform === 'ios' ? { bundleIdentifier: _.get(appJSON, 'expo.ios.bundleIdentifier') } : {}),
+      ...(platform === 'android' ? { androidPackage: _.get(appJSON, 'expo.android.package') } : {}),
+      publicUrl,
+    },
+    id: uuid.v4(),
+    platform,
+    projectDir,
+    sdkVersion: _.get(appJSON, 'expo.sdkVersion'),
+    experienceName: `@${username}/${_.get(appJSON, 'expo.slug')}`,
+    ...(credentials && { credentials }),
+  };
+  const url = getExperienceUrl(job.experienceName, job.config.publicUrl);
+
+  const manifest = await ExponentTools.getManifestAsync(url, {
+    'Exponent-SDK-Version': _.get(appJSON, 'expo.sdkVersion'),
+    'Exponent-Platform': platform,
+    'Expo-Release-Channel': releaseChannel,
+    'Accept': 'application/expo+json,application/json',
+  });
+
+  return { ...job, manifest };
+};

src/bin/utils/user.ts

@@ -1,4 +1,4 @@
-import { User as UserManager } from 'xdl';
+import { User as UserManager } from '@expo/xdl';
 
 import { ErrorWithProgramHelp } from 'turtle/bin/commands/ErrorWithProgramHelp';
 

src/builders/android.ts

@@ -1,10 +1,11 @@
 import path from 'path';
 
+import { AndroidShellApp, ImageUtils } from '@expo/xdl';
 import fs from 'fs-extra';
 import _ from 'lodash';
 import semver from 'semver';
+import { ANDROID_BUILD_TYPES } from 'turtle/constants';
 import uuidv4 from 'uuid/v4';
-import { AndroidShellApp, ImageUtils } from 'xdl';
 
 import getOrCreateCredentials from 'turtle/builders/utils/android/credentials';
 import { formatShellAppDirectory } from 'turtle/builders/utils/android/workingdir';
@@ -20,13 +21,16 @@ import logger from 'turtle/logger';
 export default async function buildAndroid(jobData: IJob): Promise<IJobResult> {
   await ensureCanBuildSdkVersion(jobData);
   const credentials = await getOrCreateCredentials(jobData);
-  const apkFilePath = await runShellAppBuilder(jobData, credentials);
+  const outputFilePath = await runShellAppBuilder(jobData, credentials);
+
   const randomHex = uuidv4().replace(/-/g, '');
-  const s3Filename = `${jobData.experienceName}-${randomHex}-signed.apk`;
+  const s3FileExtension = jobData.config.buildType === ANDROID_BUILD_TYPES.APP_BUNDLE ? 'aab' : 'apk';
+  const s3Filename = `${jobData.experienceName}-${randomHex}-signed.${s3FileExtension}`;
   const s3FileKey = `android/${s3Filename}`;
   const fakeUploadFilename = s3Filename.replace('/', '\\');
+
   const artifactUrl = await uploadBuildToS3({
-    uploadPath: apkFilePath,
+    uploadPath: outputFilePath,
     s3FileKey,
     ...config.builder.fakeUpload && {
       fakeUploadBuildPath:
@@ -62,7 +66,8 @@ async function runShellAppBuilder(
   ImageUtils.setResizeImageFunction(imageHelpers.resizeIconWithSharpAsync);
   ImageUtils.setGetImageDimensionsFunction(imageHelpers.getImageDimensionsWithSharpAsync);
 
-  const outputFilePath = path.join(temporaryFilesRoot, `shell-signed-${jobData.id}.apk`);
+  const fileExtension = jobData.config.buildType === ANDROID_BUILD_TYPES.APP_BUNDLE ? 'aab' : 'apk';
+  const outputFilePath = path.join(temporaryFilesRoot, `shell-signed-${jobData.id}.${fileExtension}`);
 
   const { config: jobConfig, manifest, sdkVersion: sdkVersionFromJob } = jobData;
   const sdkVersion = _.get(manifest, 'sdkVersion', sdkVersionFromJob);
@@ -70,12 +75,12 @@ async function runShellAppBuilder(
 
   logger.info({ buildPhase: 'resolve native modules' }, 'Resolving universal modules dependencies');
   const enabledModules = semver.satisfies(sdkVersion, '>= 33.0.0')
-    ? await resolveNativeModules(workingDir, manifest.dependencies)
+    ? await resolveNativeModules(workingDir, _.get(manifest, 'dependencies'))
     : null;
 
   try {
     await AndroidShellApp.createAndroidShellAppAsync({
-      url: commonUtils.getExperienceUrl(jobData),
+      url: commonUtils.getExperienceUrl(jobData.experienceName, jobData.config.publicUrl),
       sdkVersion,
       keystore: tempKeystorePath,
       manifest,
@@ -87,6 +92,7 @@ async function runShellAppBuilder(
       workingDir,
       outputFile: outputFilePath,
       modules: enabledModules,
+      buildType: jobData.config.buildType,
     });
   } catch (err) {
     commonUtils.logErrorOnce(err);

src/builders/ios/archive.ts

@@ -1,5 +1,5 @@
+import { IosIPABuilder as createIPABuilder } from '@expo/xdl';
 import _ from 'lodash';
-import { IosIPABuilder as createIPABuilder } from 'xdl';
 
 import { IContext } from 'turtle/builders/ios/context';
 import { logErrorOnce } from 'turtle/builders/utils/common';

src/builders/ios/context.ts

@@ -1,11 +1,11 @@
 import * as path from 'path';
 
+import { IosShellApp } from '@expo/xdl';
 import { v4 as uuidv4 } from 'uuid';
-import { IosShellApp } from 'xdl';
 
 import { formatShellAppDirectory } from 'turtle/builders/utils/ios/workingdir';
 import config from 'turtle/config';
-import { IOS, PLATFORMS } from 'turtle/constants/index';
+import { IOS_BUILD_TYPES, PLATFORMS } from 'turtle/constants/index';
 import { IJob } from 'turtle/job';
 
 export interface IContext {
@@ -27,7 +27,6 @@ export interface IContext {
 }
 
 const { EXPOKIT_APP, EXPONENT_APP } = IosShellApp;
-const { BUILD_TYPES } = IOS;
 
 export function createBuilderContext(job: IJob): IContext {
   const { join } = path;
@@ -57,7 +56,7 @@ export function createBuilderContext(job: IJob): IContext {
   context.tempCertPath = join(context.appDir, 'cert.p12');
   context.baseArchiveDir = join(context.appDir, 'archive');
 
-  if (buildType === BUILD_TYPES.CLIENT) {
+  if (buildType === IOS_BUILD_TYPES.CLIENT) {
     context.applicationFilesSrc = join(
       workingDir,
       'expo-client-build',
@@ -74,7 +73,7 @@ export function createBuilderContext(job: IJob): IContext {
     );
   }
 
-  if (buildType === BUILD_TYPES.ARCHIVE) {
+  if (buildType === IOS_BUILD_TYPES.ARCHIVE) {
     context.outputPath = join(context.appDir, 'archive.xcarchive');
     context.uploadPath = join(context.buildDir, 'archive.ipa');
     context.archiveDir = join(
@@ -92,7 +91,7 @@ export function createBuilderContext(job: IJob): IContext {
       'default',
       `${EXPOKIT_APP}.xcworkspace`,
     );
-  } else if (buildType === BUILD_TYPES.CLIENT) {
+  } else if (buildType === IOS_BUILD_TYPES.CLIENT) {
     context.outputPath = join(context.appDir, 'archive.xcarchive');
     context.uploadPath = join(context.buildDir, 'archive.ipa');
     context.archiveDir = join(
@@ -107,7 +106,7 @@ export function createBuilderContext(job: IJob): IContext {
       'ios',
       `${EXPONENT_APP}.xcworkspace`,
     );
-  } else if (buildType === BUILD_TYPES.SIMULATOR) {
+  } else if (buildType === IOS_BUILD_TYPES.SIMULATOR) {
     context.outputPath = join(context.appDir, 'archive.tar.gz');
     context.uploadPath = join(context.appDir, 'archive.tar.gz');
     context.archiveDir = join(
@@ -117,7 +116,7 @@ export function createBuilderContext(job: IJob): IContext {
     );
   }
 
-  const s3FileExtension = buildType === BUILD_TYPES.SIMULATOR ? 'tar.gz' : 'ipa';
+  const s3FileExtension = buildType === IOS_BUILD_TYPES.SIMULATOR ? 'tar.gz' : 'ipa';
   const s3Filename = `${job.experienceName}-${appUUID}-${buildType}.${s3FileExtension}`;
   if (config.builder.fakeUpload) {
     const fakeUploadFilename = s3Filename.replace('/', '\\');

src/builders/ios/index.ts

@@ -9,13 +9,11 @@ import prepareAdHocBuildCredentials from 'turtle/builders/utils/ios/adhocBuild';
 import { uploadBuildToS3 } from 'turtle/builders/utils/uploader';
 import { ensureCanBuildSdkVersion } from 'turtle/builders/utils/version';
 import config from 'turtle/config';
-import { IOS } from 'turtle/constants/index';
+import { IOS_BUILD_TYPES } from 'turtle/constants';
 import { IJob, IJobResult } from 'turtle/job';
 
-const { BUILD_TYPES } = IOS;
-
 export default async function iosBuilder(job: IJob): Promise<IJobResult> {
-  if (job.config.buildType !== BUILD_TYPES.CLIENT) {
+  if (job.config.buildType !== IOS_BUILD_TYPES.CLIENT) {
     await ensureCanBuildSdkVersion(job);
   }
 
@@ -26,13 +24,13 @@ export default async function iosBuilder(job: IJob): Promise<IJobResult> {
 
     const { buildType } = job.config;
 
-    if (buildType === BUILD_TYPES.CLIENT) {
+    if (buildType === IOS_BUILD_TYPES.CLIENT) {
       await prepareAdHocBuildCredentials(job);
     }
 
-    if ([BUILD_TYPES.ARCHIVE, BUILD_TYPES.CLIENT].includes(buildType!)) {
+    if ([IOS_BUILD_TYPES.ARCHIVE, IOS_BUILD_TYPES.CLIENT].includes(buildType!)) {
       await buildArchive(ctx, job);
-    } else if (buildType === BUILD_TYPES.SIMULATOR) {
+    } else if (buildType === IOS_BUILD_TYPES.SIMULATOR) {
       await buildSimulator(ctx, job);
     } else {
       throw new Error(`Unsupported iOS build type: ${buildType}`);

src/builders/utils/android/credentials.ts

@@ -1,8 +1,9 @@
 import path from 'path';
 
+import { Credentials } from '@expo/xdl';
 import fs from 'fs-extra';
+import get from 'lodash/get';
 import uuidv4 from 'uuid/v4';
-import { Credentials } from 'xdl';
 
 import * as sqs from 'turtle/aws/sqs';
 import { UPDATE_CREDENTIALS } from 'turtle/constants/build';
@@ -19,7 +20,14 @@ async function getOrCreateCredentials(jobData: IJob): Promise<IAndroidCredential
     credentials.keystorePassword = uuidv4().replace(/-/g, '');
     credentials.keyPassword = uuidv4().replace(/-/g, '');
     credentials.keystoreAlias = Buffer.from(jobData.experienceName).toString('base64');
-    const androidPackage = jobData.manifest.android.package;
+    const androidPackage =
+      get(jobData, 'manifest.android.package')
+      || get(jobData, 'config.androidPackage');
+    if (!androidPackage) {
+      throw new Error(
+        'Android package name is not set in the app manifest (please update app.json if you\'re using turtle-cli).',
+      );
+    }
 
     await Credentials.Android.createKeystore(
       {

src/builders/utils/android/workingdir.ts

@@ -1,6 +1,6 @@
 import path from 'path';
 
-import { ExponentTools } from 'xdl';
+import { ExponentTools } from '@expo/xdl';
 
 import { IShellAppDirectoryConfig } from 'turtle/builders/utils/workingdir';
 import config from 'turtle/config';

src/builders/utils/common.ts

@@ -1,13 +1,9 @@
 import * as url from 'url';
 
 import config from 'turtle/config';
-import { IJob } from 'turtle/job';
 import logger from 'turtle/logger';
 
-export function getExperienceUrl(job: IJob) {
-  const { experienceName, config: jobConfig } = job;
-  const { publicUrl } = jobConfig;
-
+export function getExperienceUrl(experienceName: string, publicUrl?: string) {
   // publicUrl is passed in if user wants to build an externally hosted app
   if (publicUrl) {
     return publicUrl;

src/builders/utils/ios/adhocBuild.ts

@@ -1,9 +1,9 @@
 import path from 'path';
 
 import spawnAsync from '@expo/spawn-async';
+import { IosCodeSigning } from '@expo/xdl';
 import fs from 'fs-extra';
 import isEmpty from 'lodash/isEmpty';
-import { IosCodeSigning } from 'xdl';
 
 import * as sqs from 'turtle/aws/sqs';
 import BuildError, { BuildErrorReason } from 'turtle/builders/BuildError';

src/builders/utils/ios/keychain.ts

@@ -1,4 +1,4 @@
-import { IosKeychain } from 'xdl';
+import { IosKeychain } from '@expo/xdl';
 
 import { IContext } from 'turtle/builders/ios/context';
 import * as fileUtils from 'turtle/builders/utils/file';

src/builders/utils/ios/shellAppBuilder.ts

@@ -1,14 +1,14 @@
 import path from 'path';
 import util from 'util';
 
+import { ImageUtils, IosShellApp } from '@expo/xdl';
 import copy from 'copy';
 import _ from 'lodash';
-import { ImageUtils, IosShellApp } from 'xdl';
 
 import { IContext } from 'turtle/builders/ios/context';
 import * as commonUtils from 'turtle/builders/utils/common';
 import * as imageHelpers from 'turtle/builders/utils/image';
-import { IOS } from 'turtle/constants/index';
+import { IOS_BUILD_TYPES } from 'turtle/constants/index';
 import { IJob } from 'turtle/job';
 import logger from 'turtle/logger/index';
 
@@ -37,13 +37,13 @@ export default async function runShellAppBuilder(ctx: IContext, job: IJob): Prom
     output: ctx.outputPath,
     verbose: true,
   };
-  if (buildType === IOS.BUILD_TYPES.CLIENT) {
+  if (buildType === IOS_BUILD_TYPES.CLIENT) {
     Object.assign(shellAppParams, {
       workspacePath: path.join(ctx.workingDir, 'ios'),
     });
   } else {
     Object.assign(shellAppParams, {
-      url: commonUtils.getExperienceUrl(job),
+      url: commonUtils.getExperienceUrl(job.experienceName, job.config.publicUrl),
       releaseChannel,
       sdkVersion,
     });

src/builders/utils/ios/workingdir.ts

@@ -1,14 +1,14 @@
 import path from 'path';
 
-import { ExponentTools } from 'xdl';
+import { ExponentTools } from '@expo/xdl';
 
 import { IShellAppDirectoryConfig } from 'turtle/builders/utils/workingdir';
 import config from 'turtle/config';
-import { IOS, PLATFORMS } from 'turtle/constants';
+import { IOS_BUILD_TYPES, PLATFORMS } from 'turtle/constants';
 
 export function formatShellAppDirectory({ sdkVersion, buildType }: IShellAppDirectoryConfig) {
   const { workingDir } = config.directories;
-  if (buildType === IOS.BUILD_TYPES.CLIENT) {
+  if (buildType === IOS_BUILD_TYPES.CLIENT) {
     return path.join(workingDir, PLATFORMS.IOS, 'client');
   } else if (config.builder.useLocalWorkingDir) {
     return path.join(workingDir, 'local');

src/builders/utils/unimodules.ts

@@ -44,9 +44,11 @@ export async function resolveNativeModules(workingdir: string, packages?: string
 
 async function readCorePackages(workingdir: string) {
   const pkgJsonPath = path.join(workingdir, 'node_modules', 'react-native-unimodules', 'package.json');
-  if (await fs.pathExists(pkgJsonPath)) {
+  const expoPkgJsonPath = path.join(workingdir, 'packages', 'expo', 'package.json');
+  if (await fs.pathExists(pkgJsonPath) && await fs.pathExists(expoPkgJsonPath)) {
     const packageJson = JSON.parse(await fs.readFile(pkgJsonPath, 'utf-8'));
-    return keys(packageJson.dependencies);
+    const expoPackageJson = JSON.parse(await fs.readFile(expoPkgJsonPath, 'utf-8'));
+    return keys(packageJson.dependencies).concat(keys(expoPackageJson.dependencies));
   } else {
     logger.warn('No core packages detected');
     return [];

src/builders/utils/version.ts

@@ -1,6 +1,6 @@
+import { ExponentTools } from '@expo/xdl';
 import fs from 'fs-extra';
 import path from 'path';
-import { ExponentTools } from 'xdl';
 
 import config from 'turtle/config';
 import { IJob } from 'turtle/job';

src/builders/utils/workingdir.ts

@@ -1,6 +1,6 @@
-import { IOS } from 'turtle/constants';
+import { ANDROID_BUILD_TYPES, IOS_BUILD_TYPES } from 'turtle/constants';
 
 export interface IShellAppDirectoryConfig {
   sdkVersion: string;
-  buildType?: IOS.BUILD_TYPES;
+  buildType?: IOS_BUILD_TYPES & ANDROID_BUILD_TYPES;
 }

src/config.ts

@@ -2,7 +2,7 @@ import os from 'os';
 import path from 'path';
 
 import { PLATFORMS } from 'turtle/constants';
-import { env, envNum, envOptional, envTransform } from 'turtle/utils/env';
+import { env, envBoolean, envNum, envOptional, envTransform } from 'turtle/utils/env';
 
 export default {
   env: env('NODE_ENV'),
@@ -37,6 +37,12 @@ export default {
     intervalMs: envNum('AWS_CLOUDWATCH_INTERVAL_MS', 30000),
     namespace: env('AWS_CLOUDWATCH_NAMESPACE', 'Turtle'),
   },
+  datadog: {
+    disabled: envBoolean('DATADOG_DISABLED', false),
+    apiKey: envOptional('DATADOG_API_KEY'),
+    appKey: envOptional('DATADOG_APP_KEY'),
+    intervalMs: env('DATADOG_INTERVAL_MS', 5 * 60 * 1000),
+  },
   redis: {
     url: env('REDIS_URL'),
     configUrl: env('REDIS_CONFIG_URL'),
@@ -64,7 +70,7 @@ export default {
       (val: string) => env('NODE_ENV') === 'development' && val === '1',
     ),
     fakeUpload: envTransform('TURTLE_FAKE_UPLOAD', '0', (val: string) => val === '1'),
-    maxJobTimeMs: envNum('TURTLE_MAX_JOB_TIME_MS', 60 * 60 * 1000),
+    maxJobTimeMs: envNum('TURTLE_MAX_JOB_TIME_MS', 15 * 60 * 1000),
     useLocalWorkingDir: envTransform('TURTLE_USE_LOCAL_WORKING_DIR', '0', (val: string) => val === '1'),
   },
   directories: {

src/constants/index.ts

@@ -1,9 +1,19 @@
 import * as BUILD from './build';
-import * as IOS from './ios';
 
 export enum PLATFORMS {
   IOS = 'ios',
   ANDROID = 'android',
 }
 
-export { IOS, BUILD };
+export enum IOS_BUILD_TYPES {
+  ARCHIVE = 'archive',
+  CLIENT = 'client',
+  SIMULATOR = 'simulator',
+}
+
+export enum ANDROID_BUILD_TYPES {
+  APK = 'apk',
+  APP_BUNDLE = 'app-bundle',
+}
+
+export { BUILD };

src/constants/ios.ts

@@ -1,5 +0,0 @@
-export enum BUILD_TYPES {
-  ARCHIVE = 'archive',
-  CLIENT = 'client',
-  SIMULATOR = 'simulator',
-}

src/job.ts

@@ -1,4 +1,4 @@
-import { IOS } from 'turtle/constants';
+import { ANDROID_BUILD_TYPES, IOS_BUILD_TYPES } from 'turtle/constants';
 
 export interface IJob {
   platform: 'android' | 'ios';
@@ -9,9 +9,11 @@ export interface IJob {
   config: {
     releaseChannel: string;
     publicUrl?: string;
+    buildType: IOS_BUILD_TYPES & ANDROID_BUILD_TYPES;
     // ios
-    buildType?: IOS.BUILD_TYPES;
     bundleIdentifier?: string;
+    // android
+    androidPackage?: string;
   };
   credentials: {
     // android

src/jobManager.ts

@@ -64,7 +64,10 @@ async function processJob(jobData: any) {
     setCurrentJobId(job.id);
     const pingerHandle = sqs.changeMessageVisibilityRecurring(priority, jobData.ReceiptHandle, job.id);
 
-    logger.info(`Doing job MessageId=${jobData.MessageId} BuildId=${job.id} ${Date.now()}`);
+    logger.info(
+      `Doing job MessageId=${jobData.MessageId} BuildId=${job.id} `
+      + `Priority=${priority.slice(0, priority.length - 8)} ${Date.now()}`,
+    );
 
     const cancelled = await redis.checkIfCancelled(job.id);
     if (cancelled) {
@@ -76,10 +79,10 @@ async function processJob(jobData: any) {
       const buildType = _.get(job, 'config.buildType', 'default');
       try {
         const status = await build(job);
-        buildStatusMetric.add(buildType, status);
+        buildStatusMetric.add(buildType, priority, status);
         buildFailed = !status;
       } catch (err) {
-        buildStatusMetric.add(buildType, false);
+        buildStatusMetric.add(buildType, priority, false);
         buildFailed = true;
         throw err;
       } finally {
@@ -113,7 +116,8 @@ function failAfterMaxJobTime(priority: string, receiptHandle: string, job: any)
       sqs.sendMessage(job.id, BUILD.JOB_STATES.ERRORED, { turtleVersion });
       await deleteMessage(priority, receiptHandle);
     } finally {
-      logger.error('Going to terminate turtle agent, just in case...');
+      logger.error('Build timed out. Going to terminate turtle agent.');
+      await logger.cleanup();
       process.exit(1);
     }
   }, config.builder.maxJobTimeMs);

src/jobsSchemas/ios.ts

@@ -1,13 +1,13 @@
 import Joi from 'joi';
 
-import { IOS, PLATFORMS } from 'turtle/constants/index';
+import { IOS_BUILD_TYPES, PLATFORMS } from 'turtle/constants/index';
 import baseJobSchema from 'turtle/jobsSchemas/base';
 
 export default baseJobSchema.concat(
   Joi.object().keys({
     platform: Joi.string().valid(PLATFORMS.IOS),
     config: Joi.object().keys({
-      buildType: Joi.string().default(IOS.BUILD_TYPES.ARCHIVE),
+      buildType: Joi.string().default(IOS_BUILD_TYPES.ARCHIVE),
       bundleIdentifier: Joi.string().regex(/^[a-zA-Z][a-zA-Z0-9\-.]+$/),
     }),
     credentials: Joi.object()
@@ -21,7 +21,7 @@ export default baseJobSchema.concat(
         udids: Joi.array().items(Joi.string()),
       })
       .when('config.buildType', {
-        is: IOS.BUILD_TYPES.SIMULATOR,
+        is: IOS_BUILD_TYPES.SIMULATOR,
         then: Joi.optional(),
         otherwise: Joi.required(),
       }),

src/metrics/buildStatus.ts

@@ -1,5 +1,5 @@
 import * as cloudwatch from 'turtle/aws/cloudwatch';
-import { TYPE_DIMENSIONS } from 'turtle/aws/cloudwatch/dimensions';
+import { PRIORITY_DIMENSIONS } from 'turtle/aws/cloudwatch/dimensions';
 import * as reducers from 'turtle/aws/cloudwatch/reducers';
 import config from 'turtle/config';
 import logger from 'turtle/logger';
@@ -24,11 +24,11 @@ export function register() {
   });
 }
 
-export function add(type: string, success = true) {
+export function add(type: string, priority: string, success = true) {
   cloudwatch.addMetricData({
     name: BUILD_METRIC_NAME,
     value: 1,
     success,
-    extraDimensions: TYPE_DIMENSIONS(type),
+    extraDimensions: PRIORITY_DIMENSIONS(type, priority),
   });
 }

src/metrics/buildersConfig.ts

@@ -0,0 +1,54 @@
+import groupBy from 'lodash/groupBy';
+import mapValues from 'lodash/mapValues';
+import take from 'lodash/take';
+
+import logger from 'turtle/logger';
+import { sendMetric } from 'turtle/metrics/datadog';
+import { getReplicaCount } from 'turtle/utils/metadata';
+import { getLabeledConfiguration, TurtleModeLabels } from 'turtle/utils/priorities';
+
+const createMetricName = () => `turtle.replicaCount`;
+const createModeMetricName = (mode: TurtleModeLabels) => `${createMetricName()}.${mode}`;
+const createModeTag = (mode: TurtleModeLabels) => `mode:${mode}`;
+
+export default async function sendConfigToDatadog() {
+  const configuration = await getLabeledConfiguration();
+  const replicaCount = await getReplicaCount();
+  const currentReplicaCount = replicaCount === null ? configuration.length : replicaCount;
+
+  const replicaCounts = mapValues(
+    groupBy<string>(take(configuration, currentReplicaCount)),
+    (i) => i.length,
+  );
+
+  const metricName = createMetricName();
+
+  const normalReplicaCount = replicaCounts[TurtleModeLabels.Normal] || 0;
+  const highReplicaCount = replicaCounts[TurtleModeLabels.High] || 0;
+  const highOnlyReplicaCount = replicaCounts[TurtleModeLabels.HighOnly] || 0;
+
+  const normalTag = createModeTag(TurtleModeLabels.Normal);
+  const normalMetricName = createModeMetricName(TurtleModeLabels.Normal);
+  logger.debug(
+    `Sending ${metricName}=${normalReplicaCount} (${normalTag}), ${normalMetricName}=${normalReplicaCount} to Datadog`,
+  );
+  await sendMetric(metricName, normalReplicaCount, [normalTag]);
+  await sendMetric(normalMetricName, normalReplicaCount);
+
+  const highTag = createModeTag(TurtleModeLabels.High);
+  const highMetricName = createModeMetricName(TurtleModeLabels.High);
+  logger.debug(
+    `Sending ${metricName}=${highReplicaCount} (${highTag}), ${highMetricName}=${highReplicaCount} to Datadog`,
+  );
+  await sendMetric(metricName, highReplicaCount, [highTag]);
+  await sendMetric(highMetricName, highReplicaCount);
+
+  const highOnlyTag = createModeTag(TurtleModeLabels.HighOnly);
+  const highOnlyMetricName = createModeMetricName(TurtleModeLabels.HighOnly);
+  logger.debug(
+    `Sending ${metricName}=${highOnlyReplicaCount} (${highOnlyTag}),`
+    + ` ${highOnlyMetricName}=${highOnlyReplicaCount} to Datadog`,
+  );
+  await sendMetric(metricName, highOnlyReplicaCount, [highOnlyTag]);
+  await sendMetric(highOnlyMetricName, highOnlyReplicaCount);
+}

src/metrics/datadog/index.ts

@@ -0,0 +1,24 @@
+import dogapi from 'dogapi';
+import util from 'util';
+
+import config from 'turtle/config';
+
+const datadogSendMetric = util.promisify(dogapi.metric.send);
+
+if (!config.datadog.disabled) {
+  dogapi.initialize({
+    api_key: config.datadog.apiKey,
+    app_key: config.datadog.appKey,
+   });
+}
+
+const tags = [
+  `env:${config.deploymentEnv}`,
+  `platform:${config.platform}`,
+];
+
+export function sendMetric(name: string, value: number, additionalTags?: string[]) {
+  if (!config.datadog.disabled) {
+    return datadogSendMetric(name, value, { tags: [...tags, ...(additionalTags || [])] });
+  }
+}

src/scripts/setConfigurations.ts

@@ -28,22 +28,18 @@ const TIMEOUT = 3000;
 
 const AVAILABLE_CONFIGURATIONS_IOS = [
   HIGH_CONFIGURATION,
-  HIGH_ONLY_CONFIGURATION,
   HIGH_CONFIGURATION,
   HIGH_ONLY_CONFIGURATION,
+  HIGH_ONLY_CONFIGURATION,
+  HIGH_ONLY_CONFIGURATION,
+  // there are 5 iOS builders at the moment
+  HIGH_CONFIGURATION,
   HIGH_CONFIGURATION,
   HIGH_CONFIGURATION,
 ];
 
 const AVAILABLE_CONFIGURATIONS_ANDROID = [
   HIGH_CONFIGURATION,
-  HIGH_ONLY_CONFIGURATION,
-  HIGH_CONFIGURATION,
-  HIGH_ONLY_CONFIGURATION,
-  HIGH_CONFIGURATION,
-  HIGH_ONLY_CONFIGURATION,
-  HIGH_CONFIGURATION,
-  HIGH_ONLY_CONFIGURATION,
   HIGH_CONFIGURATION,
   HIGH_CONFIGURATION,
   HIGH_CONFIGURATION,
@@ -52,6 +48,16 @@ const AVAILABLE_CONFIGURATIONS_ANDROID = [
   HIGH_CONFIGURATION,
   HIGH_CONFIGURATION,
   HIGH_CONFIGURATION,
+  HIGH_CONFIGURATION,
+  HIGH_CONFIGURATION,
+  HIGH_CONFIGURATION,
+  HIGH_CONFIGURATION,
+  HIGH_CONFIGURATION,
+  HIGH_CONFIGURATION,
+  // there are 15 Android builders at the moment
+  HIGH_CONFIGURATION,
+  HIGH_CONFIGURATION,
+  HIGH_CONFIGURATION,
 ];
 
 const DEFAULT_CONFIGURATION = HIGH_CONFIGURATION;

src/scripts/setReplicaCount.ts

@@ -0,0 +1,38 @@
+import isNaN from 'lodash/isNaN';
+
+import { PLATFORMS } from 'turtle/constants';
+import logger from 'turtle/logger';
+import { setReplicaCount } from 'turtle/utils/metadata';
+import { getRedisClient, RedisClient } from 'turtle/utils/redis';
+
+async function run() {
+  const platform = process.env.SCRIPT_PLATFORM;
+  const replicaCountRaw = process.env.SCRIPT_REPLICA_COUNT;
+  const replicaCount = Number(replicaCountRaw);
+
+  if (!platform || !replicaCountRaw) {
+    throw new Error('You must set both SCRIPT_PLATFORM and SCRIPT_REPLICA_COUNT env variables.');
+  }
+
+  if (!Object.values(PLATFORMS).includes(platform)) {
+    throw new Error(`Unsupported platform: ${platform}`);
+  }
+
+  if (isNaN(replicaCount)) {
+    throw new Error(`Wrong value for replica count: ${replicaCountRaw}`);
+  }
+
+  const redis = await getRedisClient(RedisClient.Configuration);
+  logger.info(`[${platform}] Setting replica count in redis to ${replicaCount}`);
+  await setReplicaCount(platform as PLATFORMS, replicaCount);
+  redis.disconnect();
+}
+
+if (require.main === module) {
+  run()
+    .then(() => logger.info('All done'))
+    .catch((err) => {
+      logger.error('Error:', err);
+      process.exit(1);
+    });
+}

src/server.ts

@@ -1,4 +1,4 @@
-import { LoggerDetach } from 'xdl';
+import { LoggerDetach } from '@expo/xdl';
 
 import config from 'turtle/config';
 import { doJob } from 'turtle/jobManager';

src/setup/common.ts

@@ -1,10 +1,23 @@
 import fs from 'fs-extra';
 
 import config from 'turtle/config';
+import logger from 'turtle/logger';
 import * as metrics from 'turtle/metrics';
+import sendConfigToDatadog from 'turtle/metrics/buildersConfig';
 
 export default async function commonSetup() {
+  announceBuildersConfig();
   await metrics.init();
   await fs.remove(config.directories.temporaryFilesRoot);
   await fs.remove(config.directories.tempS3LogsDir);
 }
+
+async function announceBuildersConfig() {
+  try {
+    await sendConfigToDatadog();
+  } catch (err) {
+    logger.error({ err }, 'Failed to send metrics to Datadog');
+  } finally {
+    setTimeout(announceBuildersConfig, config.datadog.intervalMs);
+  }
+}

src/types/declarations.d.ts

@@ -1,9 +1,10 @@
-declare module 'copy';
-declare module 'xdl';
+declare module 'async-retry';
 declare module 'bunyan';
 declare module 'bunyan-sentry-stream';
 declare module 'bunyan-debug-stream';
-declare module 'async-retry';
+declare module 'copy';
+declare module 'dogapi';
 declare module 'ioredis';
-declare module 'request-progress';
 declare module 'is-semver';
+declare module 'request-progress';
+declare module '@expo/xdl';

src/utils/env.ts

@@ -16,5 +16,16 @@ export const env = (varName: string, defaultValue?: any) => {
 export const envOptional = (varName: string) => env(varName, null);
 export const envTransform = (varName: string, defaultValue: any, fn: any) => fn(env(varName, defaultValue));
 export const envNum = (varName: string, defaultValue?: number) => parseInt(env(varName, defaultValue), 10);
+export const envBoolean = (varName: string, defaultValue?: boolean) => {
+  let defaultString;
+  if (defaultValue === true) {
+    defaultString = 'true';
+  } else if (defaultValue === false) {
+    defaultString = 'false';
+  } else {
+    defaultString = defaultValue;
+  }
+  return env(varName, defaultString) === 'true';
+};
 
 const isOffline = () => process.env.TURTLE_MODE === 'offline';

src/utils/metadata.ts

@@ -0,0 +1,21 @@
+import config from 'turtle/config';
+import { PLATFORMS } from 'turtle/constants';
+import { getRedisClient, RedisClient } from 'turtle/utils/redis';
+
+const createKeyPrefix = (platform: PLATFORMS) => `${config.deploymentEnv}:${platform}`;
+const createReplicaCountKey = (platform: PLATFORMS) => `${createKeyPrefix(platform)}:replicaCount`;
+
+export async function setReplicaCount(platform: PLATFORMS, replicaCount: number) {
+  const redis = await getRedisClient(RedisClient.Configuration);
+  await redis.set(
+    createReplicaCountKey(platform),
+    replicaCount,
+  );
+}
+
+export async function getReplicaCount(maybePlatform?: PLATFORMS) {
+  const platform = maybePlatform || config.platform;
+  const redis = await getRedisClient(RedisClient.Configuration);
+  const result = await redis.get(createReplicaCountKey(platform));
+  return result === null ? null : Number(result);
+}

src/utils/priorities.ts

@@ -1,4 +1,5 @@
 import Joi from 'joi';
+import isEqual from 'lodash/isEqual';
 import os from 'os';
 
 import config from 'turtle/config';
@@ -8,6 +9,12 @@ import { getRedisClient, RedisClient } from 'turtle/utils/redis';
 export const NORMAL = 'normalPriority';
 export const HIGH = 'highPriority';
 
+export enum TurtleModeLabels {
+  Normal = 'normal',
+  High = 'high',
+  HighOnly = 'highOnly',
+}
+
 export const NORMAL_CONFIGURATION = [NORMAL, HIGH];
 export const HIGH_CONFIGURATION = [HIGH, NORMAL];
 export const HIGH_ONLY_CONFIGURATION = [HIGH];
@@ -56,7 +63,7 @@ export async function getPriorities() {
     }
 
     try {
-      const configurations = JSON.parse(await redis.get(createConfigurationsKey()));
+      const configurations = await getConfiguration(redis);
       const configurationsIndex = await redis.getConfig(createConfigurationsKey(), os.hostname());
       logger.debug(`Using configuration at index ${configurationsIndex} pulled from redis`);
       const { error, value: configValue } = configSchema.validate(configurations[configurationsIndex]);
@@ -85,3 +92,21 @@ export async function getPriorities() {
     }
   }
 }
+
+export async function getConfiguration(currentRedisClient: any) {
+  const redis = currentRedisClient || await getRedisClient(RedisClient.Configuration);
+  return JSON.parse(await redis.get(createConfigurationsKey()));
+}
+
+export async function getLabeledConfiguration(currentRedisClient?: any) {
+  const configuration = await getConfiguration(currentRedisClient);
+  return configuration.map((i: string[]) => {
+    if (isEqual(i, NORMAL_CONFIGURATION)) {
+      return TurtleModeLabels.Normal;
+    } else if (isEqual(i, HIGH_CONFIGURATION)) {
+      return TurtleModeLabels.High;
+    } else {
+      return TurtleModeLabels.HighOnly;
+    }
+  });
+}

src/utils/redis.ts

@@ -79,6 +79,7 @@ export async function registerListener(jobId: string, deleteMessage: any) {
       if (message === jobId) {
         logger.info({ lastBuildLog: true }, 'Job cancelled - killing process');
         await deleteMessage();
+        await logger.cleanup();
         setTimeout(() => process.exit(1), MILLIS_TO_UPLOAD_LOGS);
       }
     });

supervisord.conf

@@ -0,0 +1,13 @@
+[supervisord]
+nodaemon=true
+
+[program:turtle]
+directory=/app/turtle
+command=node ./build/server.js
+autorestart=true
+startretries=5
+startsecs=600
+
+[eventlistener:turtle_failure]
+events=PROCESS_STATE_FATAL
+command=/app/turtle/scripts/android/supervisordEventListener.sh