Rename customconfiguration to rules. Minor tweaks

plugins/processors/awsappsignals/config.go

@@ -4,12 +4,12 @@
 package awsappsignals
 
 import (
-	"github.com/aws/amazon-cloudwatch-agent/plugins/processors/awsappsignals/customconfiguration"
+	"github.com/aws/amazon-cloudwatch-agent/plugins/processors/awsappsignals/rules"
 )
 
 type Config struct {
-	Resolvers []string                   `mapstructure:"resolvers"`
-	Rules     []customconfiguration.Rule `mapstructure:"rules"`
+	Resolvers []string     `mapstructure:"resolvers"`
+	Rules     []rules.Rule `mapstructure:"rules"`
 }
 
 func (cfg *Config) Validate() error {

plugins/processors/awsappsignals/config_test.go

@@ -12,7 +12,7 @@ import (
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/confmap/confmaptest"
 
-	"github.com/aws/amazon-cloudwatch-agent/plugins/processors/awsappsignals/customconfiguration"
+	"github.com/aws/amazon-cloudwatch-agent/plugins/processors/awsappsignals/rules"
 )
 
 func TestLoadConfig(t *testing.T) {
@@ -27,9 +27,9 @@ func TestLoadConfig(t *testing.T) {
 			id: component.NewIDWithName("awsappsignals", ""),
 			expected: &Config{
 				Resolvers: []string{"eks"},
-				Rules: []customconfiguration.Rule{
+				Rules: []rules.Rule{
 					{
-						Selectors: []customconfiguration.Selector{
+						Selectors: []rules.Selector{
 							{
 								Dimension: "Operation",
 								Match:     "* /api/visits/*",
@@ -43,7 +43,7 @@ func TestLoadConfig(t *testing.T) {
 						RuleName: "keep01",
 					},
 					{
-						Selectors: []customconfiguration.Selector{
+						Selectors: []rules.Selector{
 							{
 								Dimension: "RemoteService",
 								Match:     "UnknownRemoteService",
@@ -56,7 +56,7 @@ func TestLoadConfig(t *testing.T) {
 						Action: "drop",
 					},
 					{
-						Selectors: []customconfiguration.Selector{
+						Selectors: []rules.Selector{
 							{
 								Dimension: "Operation",
 								Match:     "* /api/visits/*",
@@ -66,7 +66,7 @@ func TestLoadConfig(t *testing.T) {
 								Match:     "*",
 							},
 						},
-						Replacements: []customconfiguration.Replacement{
+						Replacements: []rules.Replacement{
 							{
 								TargetDimension: "RemoteOperation",
 								Value:           "ListPetsByCustomer",

plugins/processors/awsappsignals/internal/resolver/eks.go

@@ -43,6 +43,8 @@ const (
 	// To mitigate this issue, we've introduced a 2-minute deletion delay. This ensures that any
 	// metric data that arrives within those 2 minutes, containing the old IP, will still get mapped correctly to a service.
 	deletionDelay = 2 * time.Minute
+
+	jitterKubernetesAPISeconds = 10
 )
 
 var DefaultHostedInAttributeMap = map[string]string{
@@ -518,8 +520,8 @@ func getEksResolver(logger *zap.Logger) subResolver {
 			logger.Fatal("Failed to create eks client", zap.Error(err))
 		}
 
-		// add a time jitter of 10 seconds
-		jitterSleep(10)
+		// jitter calls to the kubernetes api
+		jitterSleep(jitterKubernetesAPISeconds)
 
 		sharedInformerFactory := informers.NewSharedInformerFactory(clientset, 0)
 		podInformer := sharedInformerFactory.Core().V1().Pods().Informer()
@@ -553,8 +555,6 @@ func getEksResolver(logger *zap.Logger) subResolver {
 			workloadPodCount:               podWatcher.workloadPodCount,
 			safeStopCh:                     safeStopCh,
 		}
-
-		go instance.debugPrint()
 	})
 
 	return instance
@@ -587,50 +587,6 @@ func (e *eksResolver) GetWorkloadAndNamespaceByIP(ip string) (string, string, er
 	return "", "", errors.New("no EKS workload found for ip: " + ip)
 }
 
-func printSyncMap(name string, m *sync.Map, logger *zap.Logger) {
-	logger.Debug("", zap.String("MapName", name))
-	m.Range(func(key, value interface{}) bool {
-		logger.Debug("", zap.Any("key", key), zap.Any("value", value))
-		return true
-	})
-	logger.Debug("DEBUG ====================")
-}
-
-func (e *eksResolver) debugPrint() {
-	// call some logic every 5 minutes for ever
-	for {
-		select {
-		case <-time.After(5 * time.Minute):
-			e.debug()
-		case <-e.safeStopCh.ch:
-			return
-		}
-	}
-}
-
-func (e *eksResolver) debug() {
-	e.logger.Debug("start debug print")
-	// print ipToServiceAndNamespace
-	printSyncMap("ipToServiceAndNamespace", e.ipToServiceAndNamespace, e.logger)
-
-	// print serviceAndNamespaceToSelectors
-	printSyncMap("serviceAndNamespaceToSelectors", e.serviceAndNamespaceToSelectors, e.logger)
-
-	// print ipToPod
-	printSyncMap("ipToPod", e.ipToPod, e.logger)
-
-	// print podToWorkloadAndNamespace
-	printSyncMap("podToWorkloadAndNamespace", e.podToWorkloadAndNamespace, e.logger)
-
-	// print workloadAndNamespaceToLabels
-	printSyncMap("workloadAndNamespaceToLabels", e.workloadAndNamespaceToLabels, e.logger)
-
-	// print serviceToWorkload
-	e.logger.Debug("workload pod count", zap.Any("workloadPodCount", e.workloadPodCount))
-	printSyncMap("serviceToWorkload", e.serviceToWorkload, e.logger)
-	e.logger.Debug("end debug print")
-}
-
 func (e *eksResolver) Process(attributes, resourceAttributes pcommon.Map) error {
 	if value, ok := attributes.Get(attr.AWSRemoteService); ok {
 		valueStr := value.AsString()

plugins/processors/awsappsignals/processor.go

@@ -12,9 +12,9 @@ import (
 	"go.opentelemetry.io/collector/pdata/ptrace"
 	"go.uber.org/zap"
 
-	"github.com/aws/amazon-cloudwatch-agent/plugins/processors/awsappsignals/customconfiguration"
 	"github.com/aws/amazon-cloudwatch-agent/plugins/processors/awsappsignals/internal/normalizer"
 	"github.com/aws/amazon-cloudwatch-agent/plugins/processors/awsappsignals/internal/resolver"
+	"github.com/aws/amazon-cloudwatch-agent/plugins/processors/awsappsignals/rules"
 )
 
 const (
@@ -38,7 +38,7 @@ type stopper interface {
 type awsappsignalsprocessor struct {
 	logger            *zap.Logger
 	config            *Config
-	replaceActions    *customconfiguration.ReplaceActions
+	replaceActions    *rules.ReplaceActions
 	allowlistMutators []allowListMutator
 	metricMutators    []attributesMutator
 	traceMutators     []attributesMutator
@@ -53,13 +53,13 @@ func (ap *awsappsignalsprocessor) Start(_ context.Context, _ component.Host) err
 	attributesNormalizer := normalizer.NewAttributesNormalizer(ap.logger)
 	ap.metricMutators = []attributesMutator{attributesResolver, attributesNormalizer}
 
-	ap.replaceActions = customconfiguration.NewReplacer(ap.config.Rules)
+	ap.replaceActions = rules.NewReplacer(ap.config.Rules)
 	ap.traceMutators = []attributesMutator{attributesResolver, attributesNormalizer, ap.replaceActions}
 
-	keeper := customconfiguration.NewKeeper(ap.config.Rules)
+	keeper := rules.NewKeeper(ap.config.Rules)
 	ap.allowlistMutators = []allowListMutator{keeper}
 
-	dropper := customconfiguration.NewDropper(ap.config.Rules)
+	dropper := rules.NewDropper(ap.config.Rules)
 	ap.allowlistMutators = []allowListMutator{dropper}
 
 	return nil

plugins/processors/awsappsignals/customconfiguration/common.go → plugins/processors/awsappsignals/rules/common.go

@@ -1,7 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: MIT
 
-package customconfiguration
+package rules
 
 import (
 	"errors"

plugins/processors/awsappsignals/customconfiguration/common_test.go → plugins/processors/awsappsignals/rules/common_test.go

@@ -1,4 +1,7 @@
-package customconfiguration
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: MIT
+
+package rules
 
 import "go.opentelemetry.io/collector/pdata/pcommon"
 

plugins/processors/awsappsignals/customconfiguration/dropper.go → plugins/processors/awsappsignals/rules/dropper.go

@@ -1,7 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: MIT
 
-package customconfiguration
+package rules
 
 import "go.opentelemetry.io/collector/pdata/pcommon"
 

plugins/processors/awsappsignals/customconfiguration/dropper_test.go → plugins/processors/awsappsignals/rules/dropper_test.go

@@ -1,7 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: MIT
 
-package customconfiguration
+package rules
 
 import (
 	"testing"

plugins/processors/awsappsignals/customconfiguration/keeper.go → plugins/processors/awsappsignals/rules/keeper.go

@@ -1,7 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: MIT
 
-package customconfiguration
+package rules
 
 import "go.opentelemetry.io/collector/pdata/pcommon"
 

plugins/processors/awsappsignals/customconfiguration/keeper_test.go → plugins/processors/awsappsignals/rules/keeper_test.go

@@ -1,7 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: MIT
 
-package customconfiguration
+package rules
 
 import (
 	"testing"

plugins/processors/awsappsignals/customconfiguration/replacer.go → plugins/processors/awsappsignals/rules/replacer.go

@@ -1,7 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: MIT
 
-package customconfiguration
+package rules
 
 import (
 	"go.opentelemetry.io/collector/pdata/pcommon"

plugins/processors/awsappsignals/customconfiguration/replacer_test.go → plugins/processors/awsappsignals/rules/replacer_test.go

@@ -1,7 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: MIT
 
-package customconfiguration
+package rules
 
 import (
 	"testing"

translator/translate/otel/processor/awsappsignals/translator.go

@@ -12,7 +12,7 @@ import (
 	"go.opentelemetry.io/collector/processor"
 
 	"github.com/aws/amazon-cloudwatch-agent/plugins/processors/awsappsignals"
-	"github.com/aws/amazon-cloudwatch-agent/plugins/processors/awsappsignals/customconfiguration"
+	"github.com/aws/amazon-cloudwatch-agent/plugins/processors/awsappsignals/rules"
 	"github.com/aws/amazon-cloudwatch-agent/translator/translate/otel/common"
 )
 
@@ -66,11 +66,11 @@ func (t *translator) Translate(conf *confmap.Conf) (component.Config, error) {
 }
 
 func (t *translator) translateCustomRules(conf *confmap.Conf, configKey string, cfg *awsappsignals.Config) (component.Config, error) {
-	var rules []customconfiguration.Rule
+	var rules []rules.Rule
 	rulesConfigKey := common.ConfigKey(configKey, common.AppSignalsRules)
 	if conf.IsSet(rulesConfigKey) {
 		for _, rule := range conf.Get(rulesConfigKey).([]interface{}) {
-			ruleConfig := customconfiguration.Rule{}
+			ruleConfig := rules.Rule{}
 			ruleMap := rule.(map[string]interface{})
 			selectors := ruleMap["selectors"].([]interface{})
 			action := ruleMap["action"].(string)
@@ -81,11 +81,11 @@ func (t *translator) translateCustomRules(conf *confmap.Conf, configKey string,
 			}
 
 			var err error
-			ruleConfig.Action, err = customconfiguration.GetAllowListAction(action)
+			ruleConfig.Action, err = rules.GetAllowListAction(action)
 			if err != nil {
 				return nil, err
 			}
-			if ruleConfig.Action == customconfiguration.AllowListActionReplace {
+			if ruleConfig.Action == rules.AllowListActionReplace {
 				replacements, ok := ruleMap["replacements"]
 				if !ok {
 					return nil, errors.New("replace action set, but no replacements defined for service rule")
@@ -101,10 +101,10 @@ func (t *translator) translateCustomRules(conf *confmap.Conf, configKey string,
 	return cfg, nil
 }
 
-func getServiceSelectors(selectorsList []interface{}) []customconfiguration.Selector {
-	var selectors []customconfiguration.Selector
+func getServiceSelectors(selectorsList []interface{}) []rules.Selector {
+	var selectors []rules.Selector
 	for _, selector := range selectorsList {
-		selectorConfig := customconfiguration.Selector{}
+		selectorConfig := rules.Selector{}
 		selectorsMap := selector.(map[string]interface{})
 
 		selectorConfig.Dimension = selectorsMap["dimension"].(string)
@@ -114,10 +114,10 @@ func getServiceSelectors(selectorsList []interface{}) []customconfiguration.Sele
 	return selectors
 }
 
-func getServiceReplacements(replacementsList interface{}) []customconfiguration.Replacement {
-	var replacements []customconfiguration.Replacement
+func getServiceReplacements(replacementsList interface{}) []rules.Replacement {
+	var replacements []rules.Replacement
 	for _, replacement := range replacementsList.([]interface{}) {
-		replacementConfig := customconfiguration.Replacement{}
+		replacementConfig := rules.Replacement{}
 		replacementMap := replacement.(map[string]interface{})
 
 		replacementConfig.TargetDimension = replacementMap["target_dimension"].(string)