Renamed keys to make ingestion possible

Author: antonpirker

sentry_sdk/integrations/cloud_resource_context.py

@@ -90,8 +90,8 @@ def _is_aws(cls):
     def _get_aws_context(cls):
         # type: () -> Dict[str, str]
         ctx = {
-            "cloud.provider": CLOUD_PROVIDER.AWS,
-            "cloud.platform": CLOUD_PLATFORM.AWS_EC2,
+            "cloud_provider": CLOUD_PROVIDER.AWS,
+            "cloud_platform": CLOUD_PLATFORM.AWS_EC2,
         }
 
         try:
@@ -107,27 +107,27 @@ def _get_aws_context(cls):
             data = json.loads(r.data.decode("utf-8"))
 
             try:
-                ctx["cloud.account.id"] = data["accountId"]
+                ctx["cloud_account_id"] = data["accountId"]
             except Exception:
                 pass
 
             try:
-                ctx["cloud.availability_zone"] = data["availabilityZone"]
+                ctx["cloud_availability_zone"] = data["availabilityZone"]
             except Exception:
                 pass
 
             try:
-                ctx["cloud.region"] = data["region"]
+                ctx["cloud_region"] = data["region"]
             except Exception:
                 pass
 
             try:
-                ctx["host.id"] = data["instanceId"]
+                ctx["host_id"] = data["instanceId"]
             except Exception:
                 pass
 
             try:
-                ctx["host.type"] = data["instanceType"]
+                ctx["host_type"] = data["instanceType"]
             except Exception:
                 pass
 
@@ -159,8 +159,8 @@ def _is_gcp(cls):
     def _get_gcp_context(cls):
         # type: () -> Dict[str, str]
         ctx = {
-            "cloud.provider": CLOUD_PROVIDER.GCP,
-            "cloud.platform": CLOUD_PLATFORM.GCP_COMPUTE_ENGINE,
+            "cloud_provider": CLOUD_PROVIDER.GCP,
+            "cloud_platform": CLOUD_PLATFORM.GCP_COMPUTE_ENGINE,
         }
 
         try:
@@ -177,27 +177,27 @@ def _get_gcp_context(cls):
                 cls.gcp_metadata = json.loads(r.data.decode("utf-8"))
 
             try:
-                ctx["cloud.account.id"] = cls.gcp_metadata["project"]["projectId"]
+                ctx["cloud_account_id"] = cls.gcp_metadata["project"]["projectId"]
             except Exception:
                 pass
 
             try:
-                ctx["cloud.availability_zone"] = cls.gcp_metadata["instance"][
+                ctx["cloud_availability_zone"] = cls.gcp_metadata["instance"][
                     "zone"
                 ].split("/")[-1]
             except Exception:
                 pass
 
             try:
                 # only populated in google cloud run
-                ctx["cloud.region"] = cls.gcp_metadata["instance"]["region"].split("/")[
+                ctx["cloud_region"] = cls.gcp_metadata["instance"]["region"].split("/")[
                     -1
                 ]
             except Exception:
                 pass
 
             try:
-                ctx["host.id"] = cls.gcp_metadata["instance"]["id"]
+                ctx["host_id"] = cls.gcp_metadata["instance"]["id"]
             except Exception:
                 pass
 

tests/integrations/cloud_resource_context/test_cloud_resource_context.py

@@ -142,29 +142,29 @@ def test_is_aw_exception():
             405,
             b"",
             {
-                "cloud.provider": CLOUD_PROVIDER.AWS,
-                "cloud.platform": CLOUD_PLATFORM.AWS_EC2,
+                "cloud_provider": CLOUD_PROVIDER.AWS,
+                "cloud_platform": CLOUD_PLATFORM.AWS_EC2,
             },
         ],
         [
             200,
             b"something-but-not-json",
             {
-                "cloud.provider": CLOUD_PROVIDER.AWS,
-                "cloud.platform": CLOUD_PLATFORM.AWS_EC2,
+                "cloud_provider": CLOUD_PROVIDER.AWS,
+                "cloud_platform": CLOUD_PLATFORM.AWS_EC2,
             },
         ],
         [
             200,
             bytes(json.dumps(AWS_EC2_EXAMPLE_IMDSv2_PAYLOAD), "utf-8"),
             {
-                "cloud.provider": "aws",
-                "cloud.platform": "aws_ec2",
-                "cloud.account.id": "298817902971",
-                "cloud.availability_zone": "us-east-1b",
-                "cloud.region": "us-east-1",
-                "host.id": "i-07d3301297fe0a55a",
-                "host.type": "t2.small",
+                "cloud_provider": "aws",
+                "cloud_platform": "aws_ec2",
+                "cloud_account_id": "298817902971",
+                "cloud_availability_zone": "us-east-1b",
+                "cloud_region": "us-east-1",
+                "host_id": "i-07d3301297fe0a55a",
+                "host_type": "t2.small",
             },
         ],
     ],
@@ -233,27 +233,27 @@ def test_is_gcp_exception():
             405,
             None,
             {
-                "cloud.provider": CLOUD_PROVIDER.GCP,
-                "cloud.platform": CLOUD_PLATFORM.GCP_COMPUTE_ENGINE,
+                "cloud_provider": CLOUD_PROVIDER.GCP,
+                "cloud_platform": CLOUD_PLATFORM.GCP_COMPUTE_ENGINE,
             },
         ],
         [
             200,
             b"something-but-not-json",
             {
-                "cloud.provider": CLOUD_PROVIDER.GCP,
-                "cloud.platform": CLOUD_PLATFORM.GCP_COMPUTE_ENGINE,
+                "cloud_provider": CLOUD_PROVIDER.GCP,
+                "cloud_platform": CLOUD_PLATFORM.GCP_COMPUTE_ENGINE,
             },
         ],
         [
             200,
             bytes(json.dumps(GCP_GCE_EXAMPLE_METADATA_PLAYLOAD), "utf-8"),
             {
-                "cloud.provider": "gcp",
-                "cloud.platform": "gcp_compute_engine",
-                "cloud.account.id": "my-project-internal",
-                "cloud.availability_zone": "northamerica-northeast2-b",
-                "host.id": 1535324527892303790,
+                "cloud_provider": "gcp",
+                "cloud_platform": "gcp_compute_engine",
+                "cloud_account_id": "my-project-internal",
+                "cloud_availability_zone": "northamerica-northeast2-b",
+                "host_id": 1535324527892303790,
             },
         ],
     ],