tools/android/loading Loading trace database improvements

tools/android/loading/cloud/backend/startup-script.sh

 # Copyright 2016 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Script executed at instance startup. It installs the required dependencies,
 # downloads the source code, and starts a web server.
 
 set -v
 
 get_instance_metadata() {
   curl -fs http://metadata/computeMetadata/v1/instance/attributes/$1 \
       -H "Metadata-Flavor: Google"
 }
 
-# Talk to the metadata server to get the project id
+# Talk to the metadata server to get the project id and the instance id
 PROJECTID=$(curl -s \
     "http://metadata.google.internal/computeMetadata/v1/project/project-id" \
     -H "Metadata-Flavor: Google")
 
+INSTANCE_ID=$(curl -s \
+    "http://metadata.google.internal/computeMetadata/v1/instance/hostname" \
+    -H "Metadata-Flavor: Google")
+
 # Install dependencies from apt
 apt-get update
 # Basic dependencies
 apt-get install -yq git supervisor python-pip python-dev unzip
 # Web server dependencies
 apt-get install -yq libffi-dev libssl-dev
 # Chrome dependencies
 apt-get install -yq libpangocairo-1.0-0 libXcomposite1 libXcursor1 libXdamage1 \
     libXi6 libXtst6 libnss3 libcups2 libgconf2-4 libXss1 libXrandr2 \
     libatk1.0-0 libasound2 libgtk2.0-0
@@ skipping 36 matching lines @@
 
 # Create the configuration file for this deployment.
 DEPLOYMENT_CONFIG_PATH=/opt/app/clovis/deployment_config.json
 TASKQUEUE_TAG=`get_instance_metadata taskqueue_tag`
 cat >$DEPLOYMENT_CONFIG_PATH << EOF
 {
   "project_name" : "$PROJECTID",
   "cloud_storage_path" : "$CLOUD_STORAGE_PATH",
   "chrome_path" : "/opt/app/clovis/binaries/chrome",
   "src_path" : "/opt/app/clovis/src",
-  "taskqueue_tag" : "$TASKQUEUE_TAG"
+  "taskqueue_tag" : "$TASKQUEUE_TAG",
+  "trace_database_filename" : "trace_database_${INSTANCE_ID}.json"
 }
 EOF
 
 # Check if auto-start is enabled
 AUTO_START=`get_instance_metadata auto-start`
 
 # Exit early if auto start is not enabled.
 if [ "$AUTO_START" == "false" ]; then
   exit 1
 fi
@@ skipping 12 matching lines @@
     PATH="/opt/app/clovis/env/bin:/usr/bin", \
     HOME="/home/pythonapp",USER="pythonapp", \
     CHROME_DEVEL_SANDBOX="/usr/local/sbin/chrome-devel-sandbox"
 stdout_logfile=syslog
 stderr_logfile=syslog
 EOF
 
 supervisorctl reread
 supervisorctl update