Fixed labels and annotations filter

Signed-off-by: Yuri Sa <[email protected]>

Author: yuriolisa

.chloggen/fix-filter-labels-annotations.yaml

@@ -13,6 +13,4 @@ issues: [2770]
 # (Optional) One or more lines of additional information to render under the primary note.
 # These lines will be padded with 2 spaces and then inserted directly into the document.
 # Use pipe (|) for multiline entries.
-subtext: | 
-  Changed the approach from regexp.MatchString, which was representing a high resource cost 
-  and confusing the users to strings.Contains, which turned out to be simpler and more efficient.
+subtext:

.github/workflows/e2e.yaml

@@ -37,7 +37,7 @@ jobs:
          - group: e2e-multi-instrumentation
            setup: "add-operator-arg OPERATOR_ARG=--enable-multi-instrumentation prepare-e2e"
          - group: e2e-metadata-filters
-           setup: "add-operator-arg OPERATOR_ARG='--annotations-filter=filter.out --labels=filter.out' prepare-e2e"
+           setup: "add-operator-arg OPERATOR_ARG='--annotations-.*filter=filter.out --labels=.*filter.out' prepare-e2e"
 
     steps:
     - name: Check out code into the Go module directory

internal/manifests/collector/daemonset_test.go

@@ -227,7 +227,7 @@ func TestDaemonsetFilterLabels(t *testing.T) {
 		Spec: v1beta1.OpenTelemetryCollectorSpec{},
 	}
 
-	cfg := config.New(config.WithLabelFilters([]string{"foo", ".bar"}))
+	cfg := config.New(config.WithLabelFilters([]string{"foo*", ".*bar"}))
 
 	params := manifests.Params{
 		Config:  cfg,
@@ -258,7 +258,7 @@ func TestDaemonsetFilterAnnotations(t *testing.T) {
 		Spec: v1beta1.OpenTelemetryCollectorSpec{},
 	}
 
-	cfg := config.New(config.WithAnnotationFilters([]string{"foo", ".bar"}))
+	cfg := config.New(config.WithAnnotationFilters([]string{"foo*", ".*bar"}))
 
 	params := manifests.Params{
 		Config:  cfg,

internal/manifests/collector/deployment_test.go

@@ -309,7 +309,7 @@ func TestDeploymentFilterLabels(t *testing.T) {
 		Spec: v1beta1.OpenTelemetryCollectorSpec{},
 	}
 
-	cfg := config.New(config.WithLabelFilters([]string{"foo", ".bar"}))
+	cfg := config.New(config.WithLabelFilters([]string{"foo*", "app.*.bar"}))
 
 	params := manifests.Params{
 		Config:  cfg,
@@ -340,7 +340,7 @@ func TestDeploymentFilterAnnotations(t *testing.T) {
 		Spec: v1beta1.OpenTelemetryCollectorSpec{},
 	}
 
-	cfg := config.New(config.WithAnnotationFilters([]string{"foo", ".bar"}))
+	cfg := config.New(config.WithAnnotationFilters([]string{"foo*", "app.*.bar"}))
 
 	params := manifests.Params{
 		Config:  cfg,

internal/manifests/collector/statefulset_test.go

@@ -319,7 +319,7 @@ func TestStatefulSetFilterLabels(t *testing.T) {
 		Spec: v1beta1.OpenTelemetryCollectorSpec{},
 	}
 
-	cfg := config.New(config.WithLabelFilters([]string{"foo", ".bar"}))
+	cfg := config.New(config.WithLabelFilters([]string{"foo*", "app.*.bar"}))
 
 	params := manifests.Params{
 		OtelCol: otelcol,
@@ -350,7 +350,7 @@ func TestStatefulSetFilterAnnotations(t *testing.T) {
 		Spec: v1beta1.OpenTelemetryCollectorSpec{},
 	}
 
-	cfg := config.New(config.WithAnnotationFilters([]string{"foo", ".bar"}))
+	cfg := config.New(config.WithAnnotationFilters([]string{"foo*", "app.*.bar"}))
 
 	params := manifests.Params{
 		OtelCol: otelcol,

internal/manifests/manifestutils/annotations_test.go

@@ -175,7 +175,7 @@ func TestAnnotationsSingleFilter(t *testing.T) {
 	}
 
 	// This requires the filter to be in regex match form and not the other simpler wildcard one.
-	annotations, err := Annotations(otelcol, []string{".bar.io"})
+	annotations, err := Annotations(otelcol, []string{".*bar.io"})
 
 	// verify
 	require.NoError(t, err)
@@ -188,10 +188,10 @@ func TestAnnotationsFilter(t *testing.T) {
 	otelcol := v1beta1.OpenTelemetryCollector{
 		ObjectMeta: metav1.ObjectMeta{
 			Annotations: map[string]string{
-				"test.bar.io":  "foo",
-				"test.otel.io": "true",
-				"test.io/port": "1234",
-				"test.io/path": "/test",
+				"test.bar.io":             "foo",
+				"test.io/port":            "1234",
+				"test.io/path":            "/test",
+				"config.otel.test/filter": "true",
 			},
 		},
 		Spec: v1beta1.OpenTelemetryCollectorSpec{
@@ -200,12 +200,13 @@ func TestAnnotationsFilter(t *testing.T) {
 	}
 
 	// This requires the filter to be in regex match form and not the other simpler wildcard one.
-	annotations, err := Annotations(otelcol, []string{".bar.io", "otel.io"})
+	annotations, err := Annotations(otelcol, []string{".*bar.io", ".*otel/io", "config.*otel.test.*"})
 
 	// verify
 	require.NoError(t, err)
 	assert.Len(t, annotations, 6)
 	assert.NotContains(t, annotations, "test.bar.io")
-	assert.NotContains(t, annotations, "test.otel.io")
+	assert.NotContains(t, annotations, "test.otel/io")
+	assert.NotContains(t, annotations, "config.otel.test/filter")
 	assert.Equal(t, "1234", annotations["test.io/port"])
 }

internal/manifests/manifestutils/labels.go

@@ -15,17 +15,27 @@
 package manifestutils
 
 import (
+	"regexp"
 	"strings"
 
+	"github.com/go-logr/logr"
+
 	"github.com/open-telemetry/opentelemetry-operator/apis/v1beta1"
 	"github.com/open-telemetry/opentelemetry-operator/internal/naming"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
+var logger logr.Logger
+
 func IsFilteredSet(sourceSet string, filterSet []string) bool {
-	for _, pattern := range filterSet {
-		if strings.Contains(sourceSet, pattern) {
+	for _, basePattern := range filterSet {
+		pattern, compileErr := regexp.Compile(basePattern)
+		match := pattern.MatchString(sourceSet)
+		if compileErr != nil {
+			logger.Error(compileErr, "could not compile the regexp pattern")
+		}
+		if match {
 			return true
 		}
 	}

internal/manifests/manifestutils/labels_test.go

@@ -147,7 +147,7 @@ func TestLabelsFilter(t *testing.T) {
 	}
 
 	// This requires the filter to be in regex match form and not the other simpler wildcard one.
-	labels := Labels(otelcol.ObjectMeta, collectorName, otelcol.Spec.Image, "opentelemetry-collector", []string{".bar.io"})
+	labels := Labels(otelcol.ObjectMeta, collectorName, otelcol.Spec.Image, "opentelemetry-collector", []string{".*bar.io"})
 
 	// verify
 	assert.Len(t, labels, 7)

internal/manifests/opampbridge/deployment_test.go

@@ -237,7 +237,7 @@ func TestDeploymentFilterLabels(t *testing.T) {
 		Spec: v1alpha1.OpAMPBridgeSpec{},
 	}
 
-	cfg := config.New(config.WithLabelFilters([]string{"foo", ".bar"}))
+	cfg := config.New(config.WithLabelFilters([]string{"foo*", "app.*.bar"}))
 
 	params := manifests.Params{
 		Config:      cfg,
@@ -268,7 +268,7 @@ func TestDeploymentFilterAnnotations(t *testing.T) {
 		Spec: v1alpha1.OpAMPBridgeSpec{},
 	}
 
-	cfg := config.New(config.WithAnnotationFilters([]string{"foo", ".bar"}))
+	cfg := config.New(config.WithAnnotationFilters([]string{"foo*", "app.*.bar"}))
 
 	params := manifests.Params{
 		Config:      cfg,