fix common.getKeys logic

Author: amychisholm03

lib/utilization/common.js

@@ -38,8 +38,12 @@ exports.getKeys = function getKeys(data, keys, allValuesMustBeValid = true) {
     const key = keys[i]
     if (!properties.hasOwn(data, key) || !data[key]) {
       logger.debug('Key %s missing from metadata', key)
-      return null
+      if (allValuesMustBeValid) {
+        return null
+      }
+      continue
     }
+
     let value = data[key]
     if (typeof value === 'number') {
       value = value.toString()
@@ -48,10 +52,11 @@ exports.getKeys = function getKeys(data, keys, allValuesMustBeValid = true) {
     if (!checkValueString(value)) {
       logger.debug('Invalid metadata value found: %s -> %s', key, value)
       if (allValuesMustBeValid) {
-        // If any value is invalid, the whole thing must be trashed.
         return null
-      } else continue
+      }
+      continue
     }
+
     results[key] = value
   }
 

lib/utilization/gcp-info.js

@@ -50,17 +50,11 @@ function fetchGCPInfo(agent, callback) {
         data = null
       }
 
-      // Determine if we are in GCP Cloud Run by checking K_SERVICE.
-      // If K_SERVICE is not set yet, fallback to checking for the presence of machineType and name.
-      // If both are missing, assume Cloud Run (need only id and zone).
-      console.debug('process.env.K_SERVICE: ', process.env.K_SERVICE)
-      const needAllKeys = process.env.K_SERVICE
-        ? false
-        : !!(data.machineType && data.name)
-      console.debug('needAllKeys: ', needAllKeys)
-
+      // Most GCP services have id, zone, machineType, and name,
+      // but GCP Cloud Run only has id and zone.
+      // If K_SERVICE is set, we are in GCP Cloud Run.
+      const needAllKeys = !process.env.K_SERVICE
       const results = common.getKeys(data, ['id', 'zone', 'machineType', 'name'], needAllKeys)
-      console.debug('results: ', results)
       if (!results?.id || !results?.zone) {
         // id and zone are required
         logger.debug({ utilization: 'gcp' }, 'GCP metadata was invalid.')