change OR to AND logic for filtering logs (open-telemetry#12198)

change OR to AND logic for filtering logs - as desribed, and as is done for span filtering

internal/coreinternal/processor/filterlog/filterlog.go

@@ -90,11 +90,11 @@ func NewMatcher(mp *filterconfig.MatchProperties) (Matcher, error) {
 // supported to have more than one of these specified, and all specified must
 // evaluate to true for a match to occur.
 func (mp *propertiesMatcher) MatchLogRecord(lr plog.LogRecord, resource pcommon.Resource, library pcommon.InstrumentationScope) bool {
- if lr.Body().Type() == pcommon.ValueTypeString && mp.bodyFilters != nil && mp.bodyFilters.Matches(lr.Body().StringVal()) {
- return true
+ if lr.Body().Type() == pcommon.ValueTypeString && mp.bodyFilters != nil && !mp.bodyFilters.Matches(lr.Body().StringVal()) {
+ return false
  }
- if mp.severityTextFilters != nil && mp.severityTextFilters.Matches(lr.SeverityText()) {
- return true
+ if mp.severityTextFilters != nil && !mp.severityTextFilters.Matches(lr.SeverityText()) {
+ return false
  }
 
  return mp.PropertiesMatcher.Match(lr.Attributes(), resource, library)

internal/coreinternal/processor/filterlog/filterlog_test.go

@@ -116,6 +116,13 @@ func TestLogRecord_Matching_False(t *testing.T) {
  },
  },
  },
+ {
+ name: "log_severity_text_regexp_dont_match",
+ properties: &filterconfig.MatchProperties{
+ Config: *createConfig(filterset.Regexp),
+ LogSeverityTexts: []string{"debug.*"},
+ },
+ },
  }
 
  lr := plog.NewLogRecord()

unreleased/fix-log-filter.yaml

@@ -0,0 +1,7 @@
+change_type: bug_fix
+
+component: filterlog
+
+note: change OR to AND logic for filtering logs - as desribed, and as is done for span filtering
+
+issues: [11439]