Add tests and fix minor things

Signed-off-by: Ruben Vargas <[email protected]>

Author: rubenvp8510

go.sum

@@ -641,16 +641,12 @@ go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo=
 go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo=
 go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.24.0 h1:mM8nKi6/iFQ0iqst80wDHU2ge198Ye/TfN0WBS5U24Y=
 go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.24.0/go.mod h1:0PrIIzDteLSmNyxqcGYRL4mDIo8OTuBAOI/Bn1URxac=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.22.0 h1:9M3+rhx7kZCIQQhQRYaZCdNu1V73tm4TvXs2ntl98C4=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.22.0/go.mod h1:noq80iT8rrHP1SfybmPiRGc9dc5M8RPmGvtwo7Oo7tc=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.22.0 h1:FyjCyI9jVEfqhUh2MoSkmolPjfh5fp2hnV0b0irxH4Q=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.22.0/go.mod h1:hYwym2nDEeZfG/motx0p7L7J1N1vyzIThemQsb4g2qY=
-go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ=
-go.opentelemetry.io/otel/exporters/prometheus v0.46.0/go.mod h1:ztwVUHe5DTR/1v7PeuGRnU5Bbd4QKYwApWmuutKsJSs=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.24.0 h1:t6wl9SPayj+c7lEIFgm4ooDBZVb01IhLB4InpomhRw8=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.24.0/go.mod h1:iSDOcsnSA5INXzZtwaBPrKp/lWu/V14Dd+llD0oI2EA=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.24.0 h1:Xw8U6u2f8DK2XAkGRFV7BBLENgnTGX9i4rQRxJf+/vs=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.24.0/go.mod h1:6KW1Fm6R/s6Z3PGXwSJN2K4eT6wQB3vXX6CVnYX9NmM=
+go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ=
+go.opentelemetry.io/otel/exporters/prometheus v0.46.0/go.mod h1:ztwVUHe5DTR/1v7PeuGRnU5Bbd4QKYwApWmuutKsJSs=
 go.opentelemetry.io/otel/metric v1.24.0 h1:6EhoGWWK28x1fbpA4tYTOWBkPefTDQnb8WSGXlc88kI=
 go.opentelemetry.io/otel/metric v1.24.0/go.mod h1:VYhLe1rFfxuTXLgj4CBiyz+9WYBA8pNGJgDcSFRKBco=
 go.opentelemetry.io/otel/sdk v1.24.0 h1:YMPPDNymmQN3ZgczicBY3B6sf9n62Dlj9pWD3ucgoDw=

pkg/crdmetrics/collector.go

@@ -110,14 +110,14 @@ func (i *OpenTelemetryCollectorMetrics) Setup() error {
 }
 
 func (i *OpenTelemetryCollectorMetrics) callback(ctx context.Context, observer metric.Observer) error {
+	// Reset observations
+	for _, o := range i.observations {
+		o.reset()
+	}
+
 	v1alpha1collectors := &v1alpha1.OpenTelemetryCollectorList{}
 	if err := i.client.List(ctx, v1alpha1collectors); err == nil {
 
-		// Reset observations
-		for _, o := range i.observations {
-			o.reset()
-		}
-
 		for k := range v1alpha1collectors.Items {
 			collector := v1alpha1collectors.Items[k]
 			configInfo, err := getComponentsFromConfigV1Alpha1(collector.Spec.Config)
@@ -133,8 +133,10 @@ func (i *OpenTelemetryCollectorMetrics) callback(ctx context.Context, observer m
 				o.Record(collectorInfo)
 			}
 		}
+	}
 
-		v1beta1collectors := &v1beta1.OpenTelemetryCollectorList{}
+	v1beta1collectors := &v1beta1.OpenTelemetryCollectorList{}
+	if err := i.client.List(ctx, v1beta1collectors); err == nil {
 
 		for k := range v1beta1collectors.Items {
 			collector := v1beta1collectors.Items[k]

pkg/crdmetrics/collector_test.go

@@ -1,9 +1,21 @@
+// Copyright The OpenTelemetry Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 package crdmetrics
 
 import (
 	"context"
-	"github.com/open-telemetry/opentelemetry-operator/apis/v1beta1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -12,11 +24,13 @@ import (
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/sdk/metric"
 	"go.opentelemetry.io/otel/sdk/metric/metricdata"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/kubernetes/scheme"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 
 	"github.com/open-telemetry/opentelemetry-operator/apis/v1alpha1"
+	"github.com/open-telemetry/opentelemetry-operator/apis/v1beta1"
 )
 
 type expectedMetric struct {
@@ -78,118 +92,110 @@ func TestValueObservedMetrics(t *testing.T) {
 	s.AddKnownTypes(v1alpha1.GroupVersion,
 		&v1alpha1.OpenTelemetryCollector{},
 		&v1alpha1.OpenTelemetryCollectorList{},
+	)
+
+	s.AddKnownTypes(v1beta1.GroupVersion,
 		&v1beta1.OpenTelemetryCollector{},
 		&v1beta1.OpenTelemetryCollectorList{},
 	)
-
 	collector1 := v1alpha1.OpenTelemetryCollector{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      "collector1",
-			Namespace: "otel",
+			Namespace: "otel1",
 		},
 		Spec: v1alpha1.OpenTelemetryCollectorSpec{
 
 			Mode: v1alpha1.ModeSidecar,
 			Config: `
-				receivers:
-				  otlp:
-					protocols:
-					  grpc:
-					  http:
-				processors:
-				  memory_limiter:
-					check_interval: 1s
-					limit_percentage: 75
-					spike_limit_percentage: 15
-				  batch:
-					send_batch_size: 10000
-					timeout: 10s
-			
-				exporters:
-				  debug:
-			
-				service:
-				  pipelines:
-					traces:
-					  receivers: [otlp]
-					  processors: []
-					  exporters: [debug]
-			`,
+receivers:
+  otlp:
+    protocols:
+      grpc: null
+      http: null
+processors:
+  memory_limiter:
+    check_interval: 1s
+    limit_percentage: 75
+    spike_limit_percentage: 15
+  batch:
+    send_batch_size: 10000
+    timeout: 10s
+exporters:
+  debug: null
+service:
+  pipelines:
+    traces:
+      receivers:
+        - otlp
+`,
 		},
 	}
 
 	collector2 := v1alpha1.OpenTelemetryCollector{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      "collector1",
-			Namespace: "otel",
+			Namespace: "otel2",
 		},
 		Spec: v1alpha1.OpenTelemetryCollectorSpec{
 
 			Mode: v1alpha1.ModeSidecar,
 			Config: `
-				receivers:
-				  otlp:
-					protocols:
-					  grpc:
-					  http:
-				processors:
-				  memory_limiter:
-					check_interval: 1s
-					limit_percentage: 75
-					spike_limit_percentage: 15
-				  batch:
-					send_batch_size: 10000
-					timeout: 10s
-			
-				exporters:
-				  debug:
-			
-				service:
-				  pipelines:
-					traces:
-					  receivers: [otlp]
-					  processors: []
-					  exporters: [debug]
-			`,
+receivers:
+  otlp:
+    protocols:
+      grpc: null
+      http: null
+processors:
+  memory_limiter:
+    check_interval: 1s
+    limit_percentage: 75
+    spike_limit_percentage: 15
+  batch:
+    send_batch_size: 10000
+    timeout: 10s
+exporters:
+  debug: null
+service:
+  pipelines:
+    traces:
+      receivers:
+        - otlp
+`,
 		},
 	}
 
 	collector3 := v1beta1.OpenTelemetryCollector{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      "collector1",
-			Namespace: "otel",
+			Namespace: "otel3",
 		},
 		Spec: v1beta1.OpenTelemetryCollectorSpec{
 
 			Mode: v1beta1.ModeSidecar,
 			Config: v1beta1.Config{
-				Receivers: v1beta1.AnyConfig{map[string]interface{}{
-					""
+				Receivers: v1beta1.AnyConfig{Object: map[string]interface{}{
+					"otlp": true,
+				}},
+				Exporters: v1beta1.AnyConfig{Object: map[string]interface{}{
+					"otlp": true,
+				}},
+				Processors: &v1beta1.AnyConfig{Object: map[string]interface{}{
+					"batch": true,
 				}},
 			},
 		},
 	}
 
 	objs := []runtime.Object{
-		&tempoGCS,
-		&tempoS3,
-		&tempoOtherS3,
-		&tempoUnmanaged,
-		&tempoUnmanaged2,
-		&tempoTenantOpenshift,
-		&tempoTenantStatic,
+		&collector1,
+		&collector2,
+		&collector3,
 	}
 	expected := []expectedMetric{
-		newExpectedMetric(managedMetric, attribute.String("state", string(v1alpha1.ManagementStateManaged)), 5),
-		newExpectedMetric(managedMetric, attribute.String("state", string(v1alpha1.ManagementStateUnmanaged)), 2),
-		newExpectedMetric(storageBackendMetric, attribute.String("type", string(v1alpha1.ObjectStorageSecretGCS)), 1),
-		newExpectedMetric(storageBackendMetric, attribute.String("type", string(v1alpha1.ObjectStorageSecretS3)), 4),
-		newExpectedMetric(storageBackendMetric, attribute.String("type", string(v1alpha1.ObjectStorageSecretAzure)), 2),
-		newExpectedMetric(multitenancy, attribute.String("type", "disabled"), 5),
-		newExpectedMetric(multitenancy, attribute.String("type", string(v1alpha1.ModeOpenShift)), 1),
-		newExpectedMetric(multitenancy, attribute.String("type", string(v1alpha1.ModeStatic)), 1),
-		newExpectedMetric(jaegerUIUsage, attribute.String("enabled", "true"), 1),
-		newExpectedMetric(jaegerUIUsage, attribute.String("enabled", "false"), 6),
+		newExpectedMetric(receivers, attribute.String("type", "otlp"), 3),
+		newExpectedMetric(exporters, attribute.String("type", "debug"), 2),
+		newExpectedMetric(processors, attribute.String("type", "memory_limiter"), 2),
+		newExpectedMetric(processors, attribute.String("type", "batch"), 3),
 	}
 
 	cl := fake.NewClientBuilder().WithScheme(s).WithRuntimeObjects(objs...).Build()
@@ -198,7 +204,7 @@ func TestValueObservedMetrics(t *testing.T) {
 	provider := metric.NewMeterProvider(metric.WithReader(reader))
 	otel.SetMeterProvider(provider)
 
-	instancesObservedValue := newTempoStackMetrics(cl)
+	instancesObservedValue := newOpenTelemetryCollectorMetrics(cl)
 	err := instancesObservedValue.Setup()
 	require.NoError(t, err)
 
@@ -211,7 +217,7 @@ func TestValueObservedMetrics(t *testing.T) {
 	}
 
 	// Test deleting GCS storage
-	err = cl.Delete(context.Background(), &tempoGCS)
+	err = cl.Delete(context.Background(), &collector1)
 	require.NoError(t, err)
 
 	// Reset measurement batches
@@ -223,15 +229,10 @@ func TestValueObservedMetrics(t *testing.T) {
 
 	// Set new numbers
 	expected = []expectedMetric{
-		newExpectedMetric(managedMetric, attribute.String("state", string(v1alpha1.ManagementStateManaged)), 4),
-		newExpectedMetric(managedMetric, attribute.String("state", string(v1alpha1.ManagementStateUnmanaged)), 2),
-		newExpectedMetric(storageBackendMetric, attribute.String("type", string(v1alpha1.ObjectStorageSecretGCS)), 0),
-		newExpectedMetric(storageBackendMetric, attribute.String("type", string(v1alpha1.ObjectStorageSecretS3)), 4),
-		newExpectedMetric(storageBackendMetric, attribute.String("type", string(v1alpha1.ObjectStorageSecretAzure)), 2),
-		newExpectedMetric(multitenancy, attribute.String("type", string(v1alpha1.ModeOpenShift)), 1),
-		newExpectedMetric(multitenancy, attribute.String("type", string(v1alpha1.ModeStatic)), 1),
-		newExpectedMetric(jaegerUIUsage, attribute.String("enabled", "true"), 0),
-		newExpectedMetric(jaegerUIUsage, attribute.String("enabled", "false"), 6),
+		newExpectedMetric(receivers, attribute.String("type", "otlp"), 2),
+		newExpectedMetric(exporters, attribute.String("type", "debug"), 1),
+		newExpectedMetric(processors, attribute.String("type", "memory_limiter"), 1),
+		newExpectedMetric(processors, attribute.String("type", "batch"), 2),
 	}
 	for _, e := range expected {
 		assertLabelAndValues(t, e.name, metrics, e.labels, e.value)

pkg/crdmetrics/parse_config.go

@@ -30,6 +30,10 @@ type components struct {
 }
 
 func extractElements(elements map[string]interface{}) []string {
+	if elements == nil {
+		return []string{}
+	}
+
 	itemsMap := map[string]struct{}{}
 	var items []string
 	for key := range elements {
@@ -58,10 +62,17 @@ func getComponentsFromConfigV1Alpha1(yamlContent string) (*components, error) {
 
 func getComponentsFromConfigV1Beta1(yamlContent v1beta1.Config) *components {
 
-	return &components{
-		processors: extractElements(yamlContent.Processors.Object),
-		receivers:  extractElements(yamlContent.Receivers.Object),
-		exporters:  extractElements(yamlContent.Exporters.Object),
-		extensions: extractElements(yamlContent.Extensions.Object),
+	info := &components{
+		receivers: extractElements(yamlContent.Receivers.Object),
+		exporters: extractElements(yamlContent.Exporters.Object),
+	}
+
+	if yamlContent.Processors != nil {
+		info.processors = extractElements(yamlContent.Processors.Object)
+	}
+
+	if yamlContent.Extensions != nil {
+		info.extensions = extractElements(yamlContent.Extensions.Object)
 	}
+	return info
 }