don't modify cross agent tests

Author: amychisholm03

lib/collector/facts.js

@@ -33,6 +33,7 @@ async function facts(agent, callback, { logger = defaultLogger } = {}) {
 
   let hostname = agent.config.getHostnameSafe()
   if (agent.config.gcp_cloud_run.use_instance_as_host && process.env.K_SERVICE) {
+    // K_SERVICE is the name of the service in GCP Cloud Run
     hostname = systemInfo.vendors?.gcp?.id
   }
   const results = {

lib/utilization/gcp-info.js

@@ -50,9 +50,11 @@ function fetchGCPInfo(agent, callback) {
         data = null
       }
 
-      // Most GCP services have id, zone, machineType, name
-      // GCP Cloud Run only has id and zone
-      const results = common.getKeys(data, ['id', 'zone', 'machineType', 'name'], false)
+      // 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)
       if (!results?.id || !results?.zone) {
         // id and zone are required
         logger.debug({ utilization: 'gcp' }, 'GCP metadata was invalid.')

test/lib/cross_agent_tests/utilization/utilization_json.json

@@ -211,7 +211,7 @@
     "input_hostname": "myotherhost",
     "input_full_hostname": "myotherhost.com",
     "input_ip_address": ["1.2.3.4"],
-    "input_gcp_id": null,
+    "input_gcp_id": "3161347020215157123",
     "input_gcp_type": "projects/492690098729/machineTypes/custom-1-1024",
     "input_gcp_name": null,
     "input_gcp_zone": "projects/492690098729/zones/us-central1-c",

test/lib/cross_agent_tests/utilization_vendor_specific/gcp.json

@@ -54,16 +54,10 @@
         "timeout": false
       }
     },
-    "expected_vendors_hash": {
-      "gcp": {
-        "id": "3161347020215157123",
-        "name": "aef-default-20170501t160547-7gh8",
-        "zone": "us-central1-c"
-      }
-    },
+    "expected_vendors_hash": null,
     "expected_metrics": {
       "Supportability/utilization/gcp/error": {
-        "call_count": 0
+        "call_count": 1
       }
     }
   },
@@ -80,16 +74,10 @@
         "timeout": false
       }
     },
-    "expected_vendors_hash": {
-      "gcp": {
-        "id": "3161347020215157123",
-        "name": "aef-default-20170501t160547-7gh8",
-        "zone": "us-central1-c"
-      }
-    },
+    "expected_vendors_hash": null,
     "expected_metrics": {
       "Supportability/utilization/gcp/error": {
-        "call_count": 0
+        "call_count": 1
       }
     }
   },
@@ -186,16 +174,10 @@
         "timeout": false
       }
     },
-    "expected_vendors_hash": {
-      "gcp": {
-        "id": "3161347020215157123",
-        "machineType": "custom-1-1024",
-        "zone": "us-central1-c"
-      }
-    },
+    "expected_vendors_hash": null,
     "expected_metrics": {
       "Supportability/utilization/gcp/error": {
-        "call_count": 0
+        "call_count": 1
       }
     }
   },
@@ -212,16 +194,10 @@
         "timeout": false
       }
     },
-    "expected_vendors_hash": {
-      "gcp": {
-        "id": "3161347020215157123",
-        "machineType": "custom-1-1024",
-        "zone": "us-central1-c"
-      }
-    },
+    "expected_vendors_hash": null,
     "expected_metrics": {
       "Supportability/utilization/gcp/error": {
-        "call_count": 0
+        "call_count": 1
       }
     }
   },
@@ -260,16 +236,10 @@
         "timeout": false
       }
     },
-    "expected_vendors_hash": {
-      "gcp": {
-        "id": "3161347020215157123",
-        "machineType": "custom-1-1024",
-        "zone": "us-central1-c"
-      }
-    },
+    "expected_vendors_hash": null,
     "expected_metrics": {
       "Supportability/utilization/gcp/error": {
-        "call_count": 0
+        "call_count": 1
       }
     }
   },
@@ -286,16 +256,10 @@
         "timeout": false
       }
     },
-    "expected_vendors_hash": {
-      "gcp": {
-        "id": "3161347020215157123",
-        "machineType": "custom-1-1024",
-        "zone": "us-central1-c"
-      }
-    },
+    "expected_vendors_hash": null,
     "expected_metrics": {
       "Supportability/utilization/gcp/error": {
-        "call_count": 0
+        "call_count": 1
       }
     }
   },