BUG/MINOR: aws: sanity checking for instance service tags

Author: prometherion

discovery/aws_service_discovery_instance.go

@@ -249,6 +249,8 @@ func (a *awsInstance) updateServices(api *ec2.Client) (err error) {
 			var sn string
 			sn, err = a.serviceNameFromEC2(i)
 			if err != nil {
+				a.logErrorf("unable to retrieve service name for the instance %s", *i.InstanceId)
+
 				continue
 			}
 			// creating empty service in case it isn't there
@@ -262,6 +264,13 @@ func (a *awsInstance) updateServices(api *ec2.Client) (err error) {
 				}
 			}
 			instanceID := aws.ToString(i.InstanceId)
+
+			if _, portErr := mapService[sn].instancePortFromEC2(i); portErr != nil {
+				a.logErrorf("unable to retrieve service port for the instance %s", *i.InstanceId)
+
+				continue
+			}
+
 			mapService[sn].instances[instanceID] = i
 		}
 	}