feat： 优化 collector metricsfilter dropAction 部分逻辑，补充丰富单元测试用例

Author: AIvanzqx

pkg/collector/processor/metricsfilter/factory.go

@@ -149,19 +149,20 @@ func (p *metricsFilter) dropAction(record *define.Record, config Config) {
 			resourceMetrics.ScopeMetrics().RemoveIf(func(scopeMetrics pmetric.ScopeMetrics) bool {
 				scopeMetrics.Metrics().RemoveIf(func(metric pmetric.Metric) bool {
 					ruleMatch := true
-					if len(action.Rules) > 0 {
-						for _, rule := range action.Rules {
-							ff, pk := fields.DecodeFieldFrom(rule.PredicateKey)
-							switch ff {
-							// TODO(aivan): 目前 predicateKey 暂时只支持 resource 后续可能会扩展
-							case fields.FieldFromResource:
-								rv, ok := rs.Get(pk)
-								if !ok || !opmatch.Match(rv.AsString(), rule.MatchConfig.Value, rule.MatchConfig.Op) {
-									ruleMatch = false
-								}
-							default:
-								logger.Errorf("unsupported field %s", rule.PredicateKey)
+					for _, rule := range action.Rules {
+						ff, pk := fields.DecodeFieldFrom(rule.PredicateKey)
+						switch ff {
+						// TODO(aivan): 目前 predicateKey 暂时只支持 resource 后续可能会扩展
+						case fields.FieldFromResource:
+							rv, ok := rs.Get(pk)
+							if !ok || !opmatch.Match(rv.AsString(), rule.MatchConfig.Value, rule.MatchConfig.Op) {
+								ruleMatch = false
+								break
 							}
+						default:
+							logger.Warnf("unsupported field %s", rule.PredicateKey)
+							ruleMatch = false
+							break
 						}
 					}
 					return action.MetricMatch(metric.Name()) && ruleMatch

pkg/collector/processor/metricsfilter/factory_test.go

@@ -181,7 +181,7 @@ processor:
 		assert.Equal(t, 0, metrics.Len())
 	})
 
-	t.Run("complex_notin", func(t *testing.T) {
+	t.Run("notin_with_one_rules", func(t *testing.T) {
 		content := `
 processor:
    - name: "metrics_filter/drop"
@@ -210,6 +210,75 @@ processor:
 		metrics := record.Data.(pmetric.Metrics).ResourceMetrics()
 		assert.Equal(t, 0, metrics.Len())
 	})
+
+	t.Run("notin_with_multiple_rules_all_match", func(t *testing.T) {
+		content := `
+processor:
+   - name: "metrics_filter/drop"
+     config:
+       drop:
+         metrics:
+           - "my_metrics111"
+         op: "notin"
+         extra_rules:
+           - predicate_key: "resource.telemetry.distro.name"
+             match:
+               op: "eq"
+               value: "opentelemetry-java-instrumentation"
+           - predicate_key: "resource.telemetry.sdk.language"
+             match:
+               op: "eq"
+               value: "java"
+`
+		factory := processor.MustCreateFactory(content, NewFactory)
+
+		record := define.Record{
+			RecordType: define.RecordMetrics,
+			Data: makeMetricsRecordWith(
+				"my_metrics", 1, map[string]string{
+					"telemetry.distro.name":  "opentelemetry-java-instrumentation",
+					"telemetry.sdk.language": "java",
+				}, map[string]string{}),
+		}
+
+		testkits.MustProcess(t, factory, record)
+		metrics := record.Data.(pmetric.Metrics).ResourceMetrics()
+		assert.Equal(t, 0, metrics.Len())
+	})
+
+	t.Run("notin_with_multiple_rules_partial_match", func(t *testing.T) {
+		content := `
+processor:
+   - name: "metrics_filter/drop"
+     config:
+       drop:
+         metrics:
+           - "my_metrics111"
+         op: "notin"
+         extra_rules:
+           - predicate_key: "resource.telemetry.distro.name"
+             match:
+               op: "eq"
+               value: "opentelemetry-java-instrumentation"
+           - predicate_key: "attributes.telemetry.sdk.language"
+             match:
+               op: "eq"
+               value: "java"
+`
+		factory := processor.MustCreateFactory(content, NewFactory)
+
+		record := define.Record{
+			RecordType: define.RecordMetrics,
+			Data: makeMetricsRecordWith(
+				"my_metrics", 1, map[string]string{
+					"telemetry.distro.name": "opentelemetry-java-instrumentation",
+				}, map[string]string{}),
+		}
+
+		testkits.MustProcess(t, factory, record)
+		metrics := record.Data.(pmetric.Metrics).ResourceMetrics()
+		assert.Equal(t, 1, metrics.Len())
+	})
 }
 
 func TestMetricsReplaceAction(t *testing.T) {