changes to metadata.cloud.project.* fields collected for GCP (#1901)

Author: trentm

elasticapm/utils/cloud.py

@@ -114,7 +114,7 @@ def gcp_metadata():
         return {
             "provider": "gcp",
             "instance": {"id": str(metadata["instance"]["id"]), "name": metadata["instance"]["name"]},
-            "project": {"id": str(metadata["project"]["numericProjectId"]), "name": metadata["project"]["projectId"]},
+            "project": {"id": metadata["project"]["projectId"]},
             "availability_zone": availability_zone,
             "region": availability_zone.rsplit("-", 1)[0],
             "machine": {"type": metadata["instance"]["machineType"].split("/")[-1]},

tests/utils/cloud_tests.py

@@ -108,7 +108,7 @@ def request(self, *args, **kwargs):
     assert metadata == {
         "provider": "gcp",
         "instance": {"id": "4306570268266786072", "name": "basepi-test"},
-        "project": {"id": "513326162531", "name": "elastic-apm"},
+        "project": {"id": "elastic-apm"},
         "availability_zone": "us-west3-a",
         "region": "us-west3",
         "machine": {"type": "n1-standard-1"},