test

Author: amychisholm03

lib/utilization/gcp-info.js

@@ -30,7 +30,7 @@ function fetchGCPInfo(agent, callback) {
   common.request(
     {
       host: 'metadata.google.internal',
-      path: '/computeMetadata/v1/instance/?recursive=true',
+      path: '/computeMetadata/v1/instance',
       headers: {
         'Metadata-Flavor': 'Google'
       }
@@ -42,7 +42,7 @@ function fetchGCPInfo(agent, callback) {
         return callback(err)
       }
       try {
-        console.log('data before parse: ', data) 
+        console.log('data before parse: ', data)
         data = JSONbig.parse(data)
         if (typeof data.id !== 'string') {
           data.id = data.id.toString()
@@ -52,20 +52,18 @@ function fetchGCPInfo(agent, callback) {
         data = null
       }
 
-      console.log('getMetadata data: ', data) 
       const results = common.getKeys(data, ['id', 'zone'])
-      console.log('id: ', data.id)
-      console.log('machineType: ', data.machineType)
-      console.log('name: ', data.name)
-      console.log('zone: ', data.zone)
       if (results == null) {
         logger.debug({ utilization: 'gcp' }, 'GCP metadata was invalid.')
         agent.metrics.getOrCreateMetric(NAMES.UTILIZATION.GCP_ERROR).incrementCallCount()
       } else {
-        // normalize
-        // results.machineType = results.machineType.substring(
-        //   results.machineType.lastIndexOf('/') + 1
-        // )
+        if (data.machineType) {
+          results.machineType = data.machineType
+          // normalize
+          results.machineType = results.machineType.substring(
+            results.machineType.lastIndexOf('/') + 1
+          )
+        }
         results.zone = results.zone.substring(results.zone.lastIndexOf('/') + 1)
 
         resultDict = results