Delete more unused code (#4258)

signalfx · Feb 6, 2024 · 6181165 · 6181165
1 parent 46cb627
commit 6181165
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 45 deletions.
diff --git a/internal/signalfx-agent/pkg/core/config/filters.go b/internal/signalfx-agent/pkg/core/config/filters.go
@@ -55,8 +55,6 @@ func (mf *MetricFilter) Normalize() (map[string][]string, error) {
 	return dimSet, nil
 }
 
-// This should be the preferred filter set creator from now on.  It is much
-// simpler to understand.
 func makeNewFilterSet(excludes []MetricFilter) (*dpfilters.FilterSet, error) {
 	var excludeSet []dpfilters.DatapointFilter
 	for _, f := range excludes {
@@ -79,44 +77,3 @@ func makeNewFilterSet(excludes []MetricFilter) (*dpfilters.FilterSet, error) {
 		ExcludeFilters: excludeSet,
 	}, nil
 }
-
-// AddOrMerge MetricFilter to list or merge with existing MetricFilter
-func AddOrMerge(mtes []MetricFilter, mf2 MetricFilter) []MetricFilter {
-	for i, mf1 := range mtes {
-		if mf1.ShouldMerge(mf2) {
-			mtes[i] = mf1.MergeWith(mf2)
-			return mtes
-		}
-	}
-	return append(mtes, mf2)
-}
-
-// MergeWith merges mf2's MetricFilter.MetricNames into receiver mf MetricFilter.MetricNames
-func (mf *MetricFilter) MergeWith(mf2 MetricFilter) MetricFilter {
-	if mf2.MetricName != "" {
-		mf2.MetricNames = append(mf2.MetricNames, mf2.MetricName)
-	}
-	mf.MetricNames = append(mf.MetricNames, mf2.MetricNames...)
-	return *mf
-}
-
-// ShouldMerge checks if mf2 MetricFilter should be merged into receiver mf MetricFilter
-// Filters with same monitorType, negation, and dimensions should be merged
-func (mf *MetricFilter) ShouldMerge(mf2 MetricFilter) bool {
-	if mf.MonitorType != mf2.MonitorType {
-		return false
-	}
-	if mf.Negated != mf2.Negated {
-		return false
-	}
-	if len(mf.Dimensions) != len(mf2.Dimensions) {
-		return false
-	}
-	// Ensure no differing dimension values
-	for k, v := range mf.Dimensions {
-		if mf2.Dimensions[k] != v {
-			return false
-		}
-	}
-	return true
-}
diff --git a/internal/signalfx-agent/pkg/core/config/monitor.go b/internal/signalfx-agent/pkg/core/config/monitor.go
@@ -155,7 +155,7 @@ func (mc *MonitorConfig) Validate() error {
 	return nil
 }
 
-// NewFilterSet makes a filter set using the new filter style
+// FilterSet makes a filter set using the new filter style
 func (mc *MonitorConfig) FilterSet() (*dpfilters.FilterSet, error) {
 	return makeNewFilterSet(mc.DatapointsToExclude)
 }
@@ -193,7 +193,7 @@ func (mc *MonitorConfig) MonitorConfigCore() *MonitorConfig {
 	return mc
 }
 
-// IsCollectdBased returns whether this montior type depends on the
+// IsCollectdBased returns whether this monitor type depends on the
 // collectd subprocess to run.
 func (mc *MonitorConfig) IsCollectdBased() bool {
 	return strings.HasPrefix(mc.Type, "collectd/")