From 08cdcbb25754224a6791cba275358b5225ab1b7e Mon Sep 17 00:00:00 2001
From: jsubirat <jsubirat@users.noreply.github.com>
Date: Mon, 13 Jan 2025 11:29:09 +0100
Subject: [PATCH] fix: fix infra-host definition so it uses the EC2 instanceId
 as the identifier of the entity (#1849)

* fix: fix infra-host definition so it uses the EC2 instanceId as the identifier of the entity

* Removed unnecessary rule for infra-host because API Polling also uses instanceId and not entityId

---------

Co-authored-by: vlopeziglesias <vlopeziglesias@newrelic.com>
---
 entity-types/infra-host/definition.yml | 26 ++------------------------
 1 file changed, 2 insertions(+), 24 deletions(-)

diff --git a/entity-types/infra-host/definition.yml b/entity-types/infra-host/definition.yml
index bc72ee8eb..cc1ff8a03 100644
--- a/entity-types/infra-host/definition.yml
+++ b/entity-types/infra-host/definition.yml
@@ -292,28 +292,8 @@ synthesis:
           entityTagNames: [hostname]
         instrumentation.provider:
     # AWS EC2 host synthesized via ElasticBeanstalk logs
-    # Legacy API Polling entities not using the ARN to compute the entity.guid, but directly providing the entityId
-    - identifier: entityId
-      name: aws.ec2.InstanceId
-      encodeIdentifierInGUID: false
-      legacyFeatures:
-        overrideGuidType: true
-      conditions:
-        - attribute: eventType
-          prefix: Log
-        - attribute: aws.Arn
-          present: true
-        - attribute: aws.ec2.InstanceId
-          present: true
-        - attribute: entityId
-          present: true
-      tags:
-        aws.Arn:
-        # Used in AWSEC2.yml for entity relationship candidates
-        aws.ec2.InstanceId:
-    # AWS EC2 host synthesized via ElasticBeanstalk logs
-    # Metrics Streams and API Polling entities using the ARN to compute the entity.guid
-    - identifier: aws.Arn
+    # Metrics Streams and API Polling entities use the instanceId to compute the entity.guid
+    - identifier: aws.ec2.InstanceId
       name: aws.ec2.InstanceId
       encodeIdentifierInGUID: true
       legacyFeatures:
@@ -325,8 +305,6 @@ synthesis:
           present: true
         - attribute: aws.ec2.InstanceId
           present: true
-        - attribute: entityId
-          present: false
       tags:
         aws.Arn:
         # Used in AWSEC2.yml for entity relationship candidates