Skip to content

Add new aws resource cloudformation primary identifier attribute in EMF #1357

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 26, 2024
Merged

Add new aws resource cloudformation primary identifier attribute in EMF #1357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion plugins/processors/awsapplicationsignals/common/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ const (

// Resource attributes used as CloudWatch EMF log fields.
const (
MetricAttributeRemoteDbUser = "RemoteDbUser"
MetricAttributeRemoteDbUser = "RemoteDbUser"
MetricAttributeRemoteResourceCfnPrimaryIdentifier = "RemoteResourceCfnPrimaryIdentifier"
)

const (
Expand Down
25 changes: 13 additions & 12 deletions plugins/processors/awsapplicationsignals/internal/attributes/attributes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,19 @@ package attributes

const (
// aws attributes
AWSSpanKind = "aws.span.kind"
AWSLocalService = "aws.local.service"
AWSLocalEnvironment = "aws.local.environment"
AWSLocalOperation = "aws.local.operation"
AWSRemoteService = "aws.remote.service"
AWSRemoteOperation = "aws.remote.operation"
AWSRemoteEnvironment = "aws.remote.environment"
AWSRemoteTarget = "aws.remote.target"
AWSRemoteResourceIdentifier = "aws.remote.resource.identifier"
AWSRemoteResourceType = "aws.remote.resource.type"
AWSHostedInEnvironment = "aws.hostedin.environment"
AWSRemoteDbUser = "aws.remote.db.user"
AWSSpanKind = "aws.span.kind"
AWSLocalService = "aws.local.service"
AWSLocalEnvironment = "aws.local.environment"
AWSLocalOperation = "aws.local.operation"
AWSRemoteService = "aws.remote.service"
AWSRemoteOperation = "aws.remote.operation"
AWSRemoteEnvironment = "aws.remote.environment"
AWSRemoteTarget = "aws.remote.target"
AWSRemoteResourceIdentifier = "aws.remote.resource.identifier"
AWSRemoteResourceType = "aws.remote.resource.type"
AWSHostedInEnvironment = "aws.hostedin.environment"
AWSRemoteDbUser = "aws.remote.db.user"
AWSRemoteResourceCfnPrimaryIdentifier = "aws.remote.resource.cfn.primary.identifier"

// resource detection processor attributes
ResourceDetectionHostId = "host.id"
Expand Down
21 changes: 11 additions & 10 deletions plugins/processors/awsapplicationsignals/internal/normalizer/attributesnormalizer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,17 @@ type attributesNormalizer struct {
}

var attributesRenamingForMetric = map[string]string{
attr.AWSLocalService: common.CWMetricAttributeLocalService,
attr.AWSLocalOperation: common.CWMetricAttributeLocalOperation,
attr.AWSLocalEnvironment: common.CWMetricAttributeEnvironment,
attr.AWSRemoteService: common.CWMetricAttributeRemoteService,
attr.AWSRemoteOperation: common.CWMetricAttributeRemoteOperation,
attr.AWSRemoteEnvironment: common.CWMetricAttributeRemoteEnvironment,
attr.AWSRemoteTarget: common.CWMetricAttributeRemoteResourceIdentifier,
attr.AWSRemoteResourceIdentifier: common.CWMetricAttributeRemoteResourceIdentifier,
attr.AWSRemoteResourceType: common.CWMetricAttributeRemoteResourceType,
attr.AWSRemoteDbUser: common.MetricAttributeRemoteDbUser,
attr.AWSLocalService: common.CWMetricAttributeLocalService,
attr.AWSLocalOperation: common.CWMetricAttributeLocalOperation,
attr.AWSLocalEnvironment: common.CWMetricAttributeEnvironment,
attr.AWSRemoteService: common.CWMetricAttributeRemoteService,
attr.AWSRemoteOperation: common.CWMetricAttributeRemoteOperation,
attr.AWSRemoteEnvironment: common.CWMetricAttributeRemoteEnvironment,
attr.AWSRemoteTarget: common.CWMetricAttributeRemoteResourceIdentifier,
attr.AWSRemoteResourceIdentifier: common.CWMetricAttributeRemoteResourceIdentifier,
attr.AWSRemoteResourceType: common.CWMetricAttributeRemoteResourceType,
attr.AWSRemoteDbUser: common.MetricAttributeRemoteDbUser,
attr.AWSRemoteResourceCfnPrimaryIdentifier: common.MetricAttributeRemoteResourceCfnPrimaryIdentifier,
}

var resourceAttributesRenamingForTrace = map[string]string{
Expand Down
19 changes: 19 additions & 0 deletions plugins/processors/awsapplicationsignals/internal/normalizer/attributesnormalizer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,3 +239,22 @@ func TestTruncateAttributes_AWSRemoteDbUser(t *testing.T) {
val, _ := attributes.Get(attr.AWSRemoteDbUser)
assert.True(t, len(val.Str()) <= defaultMetricAttributeLength)
}

func TestRenameAttributes_AWSRemoteResourceCfnIdentifier_for_metric(t *testing.T) {
logger, _ := zap.NewDevelopment()
normalizer := NewAttributesNormalizer(logger)

attributes := pcommon.NewMap()
attributes.PutStr(attr.AWSRemoteResourceCfnPrimaryIdentifier, "arn:123:abc-value")

resourceAttributes := pcommon.NewMap()
normalizer.renameAttributes(attributes, resourceAttributes, false)

if _, ok := attributes.Get(attr.AWSRemoteResourceCfnPrimaryIdentifier); ok {
t.Errorf("AWSRemoteResourceCfnPrimaryIdentifier was not removed")
}

if value, ok := attributes.Get("RemoteResourceCfnPrimaryIdentifier"); !ok || value.AsString() != "arn:123:abc-value" {
t.Errorf("RemoteResourceCfnPrimaryIdentifier has incorrect value: got %v, want %v", value.AsString(), "arn:123:abc-value")
}
}
Loading