Drop entity if account ID is not present in cloudwatch exporter

extension/entitystore/extension.go

@@ -11,7 +11,6 @@ import (
 	"github.com/aws/aws-sdk-go/aws/client"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/aws/aws-sdk-go/service/ec2/ec2iface"
-	"github.com/aws/aws-sdk-go/service/sts/stsiface"
 	"github.com/jellydator/ttlcache/v3"
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/extension"
@@ -20,6 +19,7 @@ import (
 	configaws "github.com/aws/amazon-cloudwatch-agent/cfg/aws"
 	"github.com/aws/amazon-cloudwatch-agent/internal/ec2metadataprovider"
 	"github.com/aws/amazon-cloudwatch-agent/internal/retryer"
+	"github.com/aws/amazon-cloudwatch-agent/plugins/processors/awsentity/entityattributes"
 	"github.com/aws/amazon-cloudwatch-agent/sdk/service/cloudwatchlogs"
 	"github.com/aws/amazon-cloudwatch-agent/translator/config"
 )
@@ -31,9 +31,6 @@ const (
 	ServiceNameSourceKey        = "AWS.ServiceNameSource"
 	PlatformType                = "PlatformType"
 	EC2PlatForm                 = "AWS::EC2"
-	Type                        = "Type"
-	Name                        = "Name"
-	Environment                 = "Environment"
 	podTerminationCheckInterval = 5 * time.Minute
 )
 
@@ -74,8 +71,6 @@ type EntityStore struct {
 
 	metadataprovider ec2metadataprovider.MetadataProvider
 
-	stsClient stsiface.STSAPI
-
 	podTerminationCheckInterval time.Duration
 }
 
@@ -225,10 +220,10 @@ func (e *EntityStore) createAttributeMap() map[string]*string {
 // createServiceKeyAttribute creates KeyAttributes for Service entities
 func (e *EntityStore) createServiceKeyAttributes(serviceAttr ServiceAttribute) map[string]*string {
 	serviceKeyAttr := map[string]*string{
-		Type: aws.String(Service),
+		entityattributes.EntityType: aws.String(Service),
 	}
-	addNonEmptyToMap(serviceKeyAttr, Name, serviceAttr.ServiceName)
-	addNonEmptyToMap(serviceKeyAttr, Environment, serviceAttr.Environment)
+	addNonEmptyToMap(serviceKeyAttr, entityattributes.ServiceName, serviceAttr.ServiceName)
+	addNonEmptyToMap(serviceKeyAttr, entityattributes.DeploymentEnvironment, serviceAttr.Environment)
 	return serviceKeyAttr
 }
 

extension/entitystore/extension_test.go

@@ -15,15 +15,14 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/ec2metadata"
 	"github.com/aws/aws-sdk-go/aws/session"
-	"github.com/aws/aws-sdk-go/service/sts"
-	"github.com/aws/aws-sdk-go/service/sts/stsiface"
 	"github.com/jellydator/ttlcache/v3"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
 
 	"github.com/aws/amazon-cloudwatch-agent/internal/ec2metadataprovider"
+	"github.com/aws/amazon-cloudwatch-agent/plugins/processors/awsentity/entityattributes"
 	"github.com/aws/amazon-cloudwatch-agent/sdk/service/cloudwatchlogs"
 	"github.com/aws/amazon-cloudwatch-agent/translator/config"
 )
@@ -64,15 +63,6 @@ func (s *mockServiceProvider) getServiceNameAndSource() (string, string) {
 	return "test-service-name", "UserConfiguration"
 }
 
-type mockSTSClient struct {
-	stsiface.STSAPI
-	accountId string
-}
-
-func (ms *mockSTSClient) GetCallerIdentity(*sts.GetCallerIdentityInput) (*sts.GetCallerIdentityOutput, error) {
-	return &sts.GetCallerIdentityOutput{Account: aws.String(ms.accountId)}, nil
-}
-
 type mockMetadataProvider struct {
 	InstanceIdentityDocument *ec2metadata.EC2InstanceIdentityDocument
 	Tags                     map[string]string
@@ -288,25 +278,25 @@ func TestEntityStore_createServiceKeyAttributes(t *testing.T) {
 			name:        "NameAndEnvironmentSet",
 			serviceAttr: ServiceAttribute{ServiceName: "test-service", Environment: "test-environment"},
 			want: map[string]*string{
-				Environment: aws.String("test-environment"),
-				Name:        aws.String("test-service"),
-				Type:        aws.String(Service),
+				entityattributes.DeploymentEnvironment: aws.String("test-environment"),
+				entityattributes.ServiceName:           aws.String("test-service"),
+				entityattributes.EntityType:            aws.String(Service),
 			},
 		},
 		{
 			name:        "OnlyNameSet",
 			serviceAttr: ServiceAttribute{ServiceName: "test-service"},
 			want: map[string]*string{
-				Name: aws.String("test-service"),
-				Type: aws.String(Service),
+				entityattributes.ServiceName: aws.String("test-service"),
+				entityattributes.EntityType:  aws.String(Service),
 			},
 		},
 		{
 			name:        "OnlyEnvironmentSet",
 			serviceAttr: ServiceAttribute{Environment: "test-environment"},
 			want: map[string]*string{
-				Environment: aws.String("test-environment"),
-				Type:        aws.String(Service),
+				entityattributes.DeploymentEnvironment: aws.String("test-environment"),
+				entityattributes.EntityType:            aws.String(Service),
 			},
 		},
 	}
@@ -320,7 +310,6 @@ func TestEntityStore_createServiceKeyAttributes(t *testing.T) {
 
 func TestEntityStore_createLogFileRID(t *testing.T) {
 	instanceId := "i-abcd1234"
-	accountId := "123456789012"
 	glob := LogFileGlob("glob")
 	group := LogGroupName("group")
 	serviceAttr := ServiceAttribute{
@@ -334,18 +323,16 @@ func TestEntityStore_createLogFileRID(t *testing.T) {
 		mode:             config.ModeEC2,
 		ec2Info:          EC2Info{InstanceID: instanceId},
 		serviceprovider:  sp,
-		metadataprovider: mockMetadataProviderWithAccountId(accountId),
-		stsClient:        &mockSTSClient{accountId: accountId},
 		nativeCredential: &session.Session{},
 	}
 
 	entity := e.CreateLogFileEntity(glob, group)
 
 	expectedEntity := cloudwatchlogs.Entity{
 		KeyAttributes: map[string]*string{
-			Environment: aws.String("test-environment"),
-			Name:        aws.String("test-service"),
-			Type:        aws.String(Service),
+			entityattributes.DeploymentEnvironment: aws.String("test-environment"),
+			entityattributes.ServiceName:           aws.String("test-service"),
+			entityattributes.EntityType:            aws.String(Service),
 		},
 		Attributes: map[string]*string{
 			InstanceIDKey:        aws.String(instanceId),
@@ -543,7 +530,6 @@ func TestEntityStore_GetMetricServiceNameSource(t *testing.T) {
 		ec2Info:          EC2Info{InstanceID: instanceId},
 		serviceprovider:  sp,
 		metadataprovider: mockMetadataProviderWithAccountId(accountId),
-		stsClient:        &mockSTSClient{accountId: accountId},
 		nativeCredential: &session.Session{},
 	}
 

plugins/outputs/cloudwatch/convert_otel.go

@@ -195,7 +195,9 @@ func fetchEntityFields(resourceAttributes pcommon.Map) cloudwatch.Entity {
 	processEntityAttributes(entityattributes.GetKeyAttributeEntityShortNameMap(), keyAttributesMap, resourceAttributes)
 	processEntityAttributes(entityattributes.GetAttributeEntityShortNameMap(platformType), attributeMap, resourceAttributes)
 	removeEntityFields(resourceAttributes)
-
+	if _, ok := keyAttributesMap[entityattributes.AwsAccountId]; !ok {
+		return cloudwatch.Entity{}
+	}
 	return cloudwatch.Entity{
 		KeyAttributes: keyAttributesMap,
 		Attributes:    attributeMap,

plugins/outputs/cloudwatch/convert_otel_test.go

@@ -378,7 +378,7 @@ func TestProcessAndRemoveEntityAttributes(t *testing.T) {
 	}
 }
 
-func TestFetchEntityFields(t *testing.T) {
+func TestFetchEntityFields_WithoutAccountID(t *testing.T) {
 	resourceMetrics := pmetric.NewResourceMetrics()
 	resourceMetrics.Resource().Attributes().PutStr(entityattributes.AttributeEntityType, "Service")
 	resourceMetrics.Resource().Attributes().PutStr(entityattributes.AttributeEntityDeploymentEnvironment, "my-environment")
@@ -390,11 +390,34 @@ func TestFetchEntityFields(t *testing.T) {
 	resourceMetrics.Resource().Attributes().PutStr(entityattributes.AttributeEntityPlatformType, "AWS::EKS")
 	assert.Equal(t, 8, resourceMetrics.Resource().Attributes().Len())
 
+	expectedEntity := cloudwatch.Entity{
+		KeyAttributes: nil,
+		Attributes:    nil,
+	}
+	entity := fetchEntityFields(resourceMetrics.Resource().Attributes())
+	assert.Equal(t, 0, resourceMetrics.Resource().Attributes().Len())
+	assert.Equal(t, expectedEntity, entity)
+}
+
+func TestFetchEntityFields_WithAccountID(t *testing.T) {
+	resourceMetrics := pmetric.NewResourceMetrics()
+	resourceMetrics.Resource().Attributes().PutStr(entityattributes.AttributeEntityType, "Service")
+	resourceMetrics.Resource().Attributes().PutStr(entityattributes.AttributeEntityDeploymentEnvironment, "my-environment")
+	resourceMetrics.Resource().Attributes().PutStr(entityattributes.AttributeEntityServiceName, "my-service")
+	resourceMetrics.Resource().Attributes().PutStr(entityattributes.AttributeEntityNode, "my-node")
+	resourceMetrics.Resource().Attributes().PutStr(entityattributes.AttributeEntityCluster, "my-cluster")
+	resourceMetrics.Resource().Attributes().PutStr(entityattributes.AttributeEntityNamespace, "my-namespace")
+	resourceMetrics.Resource().Attributes().PutStr(entityattributes.AttributeEntityWorkload, "my-workload")
+	resourceMetrics.Resource().Attributes().PutStr(entityattributes.AttributeEntityPlatformType, "AWS::EKS")
+	resourceMetrics.Resource().Attributes().PutStr(entityattributes.AttributeEntityAwsAccountId, "123456789")
+	assert.Equal(t, 9, resourceMetrics.Resource().Attributes().Len())
+
 	expectedEntity := cloudwatch.Entity{
 		KeyAttributes: map[string]*string{
 			entityattributes.EntityType:            aws.String(entityattributes.Service),
 			entityattributes.ServiceName:           aws.String("my-service"),
 			entityattributes.DeploymentEnvironment: aws.String("my-environment"),
+			entityattributes.AwsAccountId:          aws.String("123456789"),
 		},
 		Attributes: map[string]*string{
 			entityattributes.Node:           aws.String("my-node"),
@@ -421,13 +444,15 @@ func TestFetchEntityFieldsOnK8s(t *testing.T) {
 	resourceMetrics.Resource().Attributes().PutStr(entityattributes.AttributeEntityNamespace, "my-namespace")
 	resourceMetrics.Resource().Attributes().PutStr(entityattributes.AttributeEntityWorkload, "my-workload")
 	resourceMetrics.Resource().Attributes().PutStr(entityattributes.AttributeEntityPlatformType, "K8s")
-	assert.Equal(t, 8, resourceMetrics.Resource().Attributes().Len())
+	resourceMetrics.Resource().Attributes().PutStr(entityattributes.AttributeEntityAwsAccountId, "123456789")
+	assert.Equal(t, 9, resourceMetrics.Resource().Attributes().Len())
 
 	expectedEntity := cloudwatch.Entity{
 		KeyAttributes: map[string]*string{
 			entityattributes.EntityType:            aws.String(entityattributes.Service),
 			entityattributes.ServiceName:           aws.String("my-service"),
 			entityattributes.DeploymentEnvironment: aws.String("my-environment"),
+			entityattributes.AwsAccountId:          aws.String("123456789"),
 		},
 		Attributes: map[string]*string{
 			entityattributes.Node:           aws.String("my-node"),
@@ -448,13 +473,15 @@ func TestFetchEntityFieldsOnEc2(t *testing.T) {
 	resourceMetrics.Resource().Attributes().PutStr(entityattributes.AttributeEntityDeploymentEnvironment, "my-environment")
 	resourceMetrics.Resource().Attributes().PutStr(entityattributes.AttributeEntityServiceName, "my-service")
 	resourceMetrics.Resource().Attributes().PutStr(entityattributes.AttributeEntityPlatformType, "AWS::EC2")
-	assert.Equal(t, 4, resourceMetrics.Resource().Attributes().Len())
+	resourceMetrics.Resource().Attributes().PutStr(entityattributes.AttributeEntityAwsAccountId, "123456789")
+	assert.Equal(t, 5, resourceMetrics.Resource().Attributes().Len())
 
 	expectedEntity := cloudwatch.Entity{
 		KeyAttributes: map[string]*string{
 			entityattributes.EntityType:            aws.String(entityattributes.Service),
 			entityattributes.ServiceName:           aws.String("my-service"),
 			entityattributes.DeploymentEnvironment: aws.String("my-environment"),
+			entityattributes.AwsAccountId:          aws.String("123456789"),
 		},
 		Attributes: map[string]*string{
 			entityattributes.Platform: aws.String("AWS::EC2"),

plugins/outputs/cloudwatchlogs/pusher.go

@@ -222,18 +222,15 @@ func (p *pusher) send() {
 	if p.needSort {
 		sort.Stable(ByTimestamp(p.events))
 	}
-	var entity *cloudwatchlogs.Entity
-	if p.logSrc != nil {
-		entity = p.logSrc.Entity()
-	}
-
 	input := &cloudwatchlogs.PutLogEventsInput{
 		LogEvents:     p.events,
 		LogGroupName:  &p.Group,
 		LogStreamName: &p.Stream,
 		SequenceToken: p.sequenceToken,
 	}
-	input.Entity = entity
+	if p.logSrc != nil {
+		input.Entity = p.logSrc.Entity()
+	}
 
 	startTime := time.Now()