Do not update RemoteService dimension on the to be aggregated depende…

…ncy metrics (#1062)
aws · Feb 29, 2024 · 1d5b5eb · 1d5b5eb
1 parent ad93eb1
commit 1d5b5eb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/plugins/processors/awsappsignals/internal/cardinalitycontrol/metrics_limiter.go b/plugins/processors/awsappsignals/internal/cardinalitycontrol/metrics_limiter.go
@@ -19,8 +19,8 @@ import (
 )
 
 const (
-	UnprocessedServiceOperationValue = "AllOtherOperations"
-	UnprocessedRemoteServiceValue    = "AllOtherDependencies"
+	UnprocessedServiceOperationValue       = "AllOtherOperations"
+	UnprocessedRemoteServiceOperationValue = "AllOtherRemoteOperations"
 )
 
 const (
@@ -338,13 +338,13 @@ func (s *service) admitMetricData(metric *MetricData) bool {
 
 func (s *service) rollupMetricData(attributes pcommon.Map) {
 	for _, indexAttr := range awsDeclaredMetricAttributes {
-		if strings.HasPrefix(indexAttr, "HostedIn.") || (indexAttr == common.MetricAttributeLocalService) {
+		if strings.HasPrefix(indexAttr, "HostedIn.") || (indexAttr == common.MetricAttributeLocalService) || (indexAttr == common.MetricAttributeRemoteService) {
 			continue
 		}
 		if indexAttr == common.MetricAttributeLocalOperation {
 			attributes.PutStr(indexAttr, UnprocessedServiceOperationValue)
-		} else if indexAttr == common.MetricAttributeRemoteService {
-			attributes.PutStr(indexAttr, UnprocessedRemoteServiceValue)
+		} else if indexAttr == common.MetricAttributeRemoteOperation {
+			attributes.PutStr(indexAttr, UnprocessedRemoteServiceOperationValue)
 		} else {
 			attributes.PutStr(indexAttr, "-")
 		}

diff --git a/plugins/processors/awsappsignals/internal/cardinalitycontrol/metrics_limiter_test.go b/plugins/processors/awsappsignals/internal/cardinalitycontrol/metrics_limiter_test.go
@@ -42,14 +42,14 @@ func TestAdmitAndRollup(t *testing.T) {
 			admittedAttributes[uniqKey.AsString()] = attr
 		} else {
 			for _, indexedAttrKey := range awsDeclaredMetricAttributes {
-				if strings.HasPrefix(indexedAttrKey, "HostedIn.") || indexedAttrKey == "Service" {
+				if strings.HasPrefix(indexedAttrKey, "HostedIn.") || indexedAttrKey == "Service" || indexedAttrKey == "RemoteService" {
 					continue
 				}
 				attrValue, _ := attr.Get(indexedAttrKey)
 				if indexedAttrKey == common.MetricAttributeLocalOperation {
 					assert.Equal(t, UnprocessedServiceOperationValue, attrValue.AsString())
-				} else if indexedAttrKey == common.MetricAttributeRemoteService {
-					assert.Equal(t, UnprocessedRemoteServiceValue, attrValue.AsString())
+				} else if indexedAttrKey == common.MetricAttributeRemoteOperation {
+					assert.Equal(t, UnprocessedRemoteServiceOperationValue, attrValue.AsString())
 				} else {
 					assert.Equal(t, "-", attrValue.AsString())
 				}