Add aws.remote.resource.account.* attributes to Application Signals EMF logs (#1791)

Author: bjrara

plugins/processors/awsapplicationsignals/common/types.go

@@ -47,6 +47,9 @@ const (
 const (
 	MetricAttributeRemoteDbUser                       = "RemoteDbUser"
 	MetricAttributeRemoteResourceCfnPrimaryIdentifier = "RemoteResourceCfnPrimaryIdentifier"
+	MetricAttributeRemoteResourceAccountID            = "RemoteResourceAccountId"
+	MetricAttributeRemoteResourceAccountAccessKey     = "RemoteResourceAccountAccessKey"
+	MetricAttributeRemoteResourceRegion               = "RemoteResourceRegion"
 )
 
 const (

plugins/processors/awsapplicationsignals/internal/attributes/attributes.go

@@ -15,9 +15,12 @@ const (
 	AWSRemoteTarget                       = "aws.remote.target"
 	AWSRemoteResourceIdentifier           = "aws.remote.resource.identifier"
 	AWSRemoteResourceType                 = "aws.remote.resource.type"
+	AWSRemoteResourceCfnPrimaryIdentifier = "aws.remote.resource.cfn.primary.identifier"
+	AWSRemoteResourceAccountID            = "aws.remote.resource.account.id"
+	AWSRemoteResourceAccountAccessKey     = "aws.remote.resource.account.access_key"
+	AWSRemoteResourceRegion               = "aws.remote.resource.region"
 	AWSHostedInEnvironment                = "aws.hostedin.environment"
 	AWSRemoteDbUser                       = "aws.remote.db.user"
-	AWSRemoteResourceCfnPrimaryIdentifier = "aws.remote.resource.cfn.primary.identifier"
 
 	AWSECSClusterName = "aws.ecs.cluster.name"
 	AWSECSTaskID      = "aws.ecs.task.id"

plugins/processors/awsapplicationsignals/internal/normalizer/attributesnormalizer.go

@@ -43,6 +43,9 @@ var attributesRenamingForMetric = map[string]string{
 	attr.AWSRemoteResourceType:                 common.CWMetricAttributeRemoteResourceType,
 	attr.AWSRemoteDbUser:                       common.MetricAttributeRemoteDbUser,
 	attr.AWSRemoteResourceCfnPrimaryIdentifier: common.MetricAttributeRemoteResourceCfnPrimaryIdentifier,
+	attr.AWSRemoteResourceAccountID:            common.MetricAttributeRemoteResourceAccountID,
+	attr.AWSRemoteResourceAccountAccessKey:     common.MetricAttributeRemoteResourceAccountAccessKey,
+	attr.AWSRemoteResourceRegion:               common.MetricAttributeRemoteResourceRegion,
 	attr.AWSECSClusterName:                     common.MetricAttributeECSCluster,
 	attr.AWSECSTaskID:                          common.MetricAttributeECSTaskId,
 }

plugins/processors/awsapplicationsignals/internal/normalizer/attributesnormalizer_test.go

@@ -78,7 +78,7 @@ func TestRenameAttributes_for_trace(t *testing.T) {
 }
 
 func TestNormalizedResourceAttributeKeys(t *testing.T) {
-	assert.Equal(t, 31, len(normalizedResourceAttributeKeys))
+	assert.Equal(t, 34, len(normalizedResourceAttributeKeys))
 	for key := range attributesRenamingForMetric {
 		assert.Contains(t, normalizedResourceAttributeKeys, key)
 	}