OTel: Add tests for metrics exporters.

Author: dsessler7

internal/collector/helpers_test.go

@@ -23,6 +23,9 @@ func testInstrumentationSpec() *v1beta1.InstrumentationSpec {
 		Logs: &v1beta1.InstrumentationLogsSpec{
 			Exporters: []string{"googlecloud"},
 		},
+		Metrics: &v1beta1.InstrumentationMetricsSpec{
+			Exporters: []string{"googlecloud"},
+		},
 	}
 
 	return spec.DeepCopy()

internal/collector/patroni_test.go

@@ -16,7 +16,7 @@ import (
 )
 
 func TestEnablePatroniLogging(t *testing.T) {
-	t.Run("NilInstrumentationSpec", func(t *testing.T) {
+	t.Run("EmptyInstrumentationSpec", func(t *testing.T) {
 		gate := feature.NewGate()
 		assert.NilError(t, gate.SetFromMap(map[string]bool{
 			feature.OpenTelemetryLogs: true,
@@ -26,9 +26,7 @@ func TestEnablePatroniLogging(t *testing.T) {
 		config := NewConfig(nil)
 		cluster := new(v1beta1.PostgresCluster)
 		require.UnmarshalInto(t, &cluster.Spec, `{
-			instrumentation: {
-				logs: { retentionPeriod: 5h },
-			},
+			instrumentation: {}
 		}`)
 
 		EnablePatroniLogging(ctx, cluster, config)
@@ -216,3 +214,137 @@ service:
 `)
 	})
 }
+
+func TestEnablePatroniMetrics(t *testing.T) {
+	t.Run("EmptyInstrumentationSpec", func(t *testing.T) {
+		gate := feature.NewGate()
+		assert.NilError(t, gate.SetFromMap(map[string]bool{
+			feature.OpenTelemetryMetrics: true,
+		}))
+		ctx := feature.NewContext(context.Background(), gate)
+
+		config := NewConfig(nil)
+		cluster := new(v1beta1.PostgresCluster)
+		require.UnmarshalInto(t, &cluster.Spec, `{
+			instrumentation: {}
+		}`)
+
+		EnablePatroniMetrics(ctx, cluster, config)
+
+		result, err := config.ToYAML()
+		assert.NilError(t, err)
+		assert.DeepEqual(t, result, `# Generated by postgres-operator. DO NOT EDIT.
+# Your changes will not be saved.
+exporters:
+  debug:
+    verbosity: detailed
+  prometheus/cpk-monitoring:
+    endpoint: 0.0.0.0:9187
+extensions: {}
+processors:
+  batch/1s:
+    timeout: 1s
+  batch/200ms:
+    timeout: 200ms
+  batch/logs:
+    send_batch_size: 8192
+    timeout: 200ms
+  groupbyattrs/compact: {}
+  resourcedetection:
+    detectors: []
+    override: false
+    timeout: 30s
+receivers:
+  prometheus/cpk-monitoring:
+    config:
+      scrape_configs:
+      - job_name: patroni
+        scheme: https
+        scrape_interval: 10s
+        static_configs:
+        - targets:
+          - 0.0.0.0:8008
+        tls_config:
+          insecure_skip_verify: true
+service:
+  extensions: []
+  pipelines:
+    metrics/patroni:
+      exporters:
+      - prometheus/cpk-monitoring
+      processors:
+      - batch/200ms
+      - groupbyattrs/compact
+      receivers:
+      - prometheus/cpk-monitoring
+`)
+	})
+
+	t.Run("InstrumentationSpecDefined", func(t *testing.T) {
+		gate := feature.NewGate()
+		assert.NilError(t, gate.SetFromMap(map[string]bool{
+			feature.OpenTelemetryMetrics: true,
+		}))
+		ctx := feature.NewContext(context.Background(), gate)
+
+		cluster := new(v1beta1.PostgresCluster)
+		cluster.Spec.Instrumentation = testInstrumentationSpec()
+		config := NewConfig(cluster.Spec.Instrumentation)
+
+		EnablePatroniMetrics(ctx, cluster, config)
+
+		result, err := config.ToYAML()
+		assert.NilError(t, err)
+		assert.DeepEqual(t, result, `# Generated by postgres-operator. DO NOT EDIT.
+# Your changes will not be saved.
+exporters:
+  debug:
+    verbosity: detailed
+  googlecloud:
+    log:
+      default_log_name: opentelemetry.io/collector-exported-log
+    project: google-project-name
+  prometheus/cpk-monitoring:
+    endpoint: 0.0.0.0:9187
+extensions: {}
+processors:
+  batch/1s:
+    timeout: 1s
+  batch/200ms:
+    timeout: 200ms
+  batch/logs:
+    send_batch_size: 8192
+    timeout: 200ms
+  groupbyattrs/compact: {}
+  resourcedetection:
+    detectors: []
+    override: false
+    timeout: 30s
+receivers:
+  prometheus/cpk-monitoring:
+    config:
+      scrape_configs:
+      - job_name: patroni
+        scheme: https
+        scrape_interval: 10s
+        static_configs:
+        - targets:
+          - 0.0.0.0:8008
+        tls_config:
+          insecure_skip_verify: true
+service:
+  extensions: []
+  pipelines:
+    metrics/patroni:
+      exporters:
+      - prometheus/cpk-monitoring
+      - googlecloud
+      processors:
+      - batch/200ms
+      - groupbyattrs/compact
+      receivers:
+      - prometheus/cpk-monitoring
+`)
+
+	})
+}

internal/collector/pgadmin_test.go

@@ -20,7 +20,7 @@ import (
 )
 
 func TestEnablePgAdminLogging(t *testing.T) {
-	t.Run("NilInstrumentationSpec", func(t *testing.T) {
+	t.Run("EmptyInstrumentationSpec", func(t *testing.T) {
 		gate := feature.NewGate()
 		assert.NilError(t, gate.SetFromMap(map[string]bool{
 			feature.OpenTelemetryLogs: true,
@@ -31,9 +31,7 @@ func TestEnablePgAdminLogging(t *testing.T) {
 		configmap := new(corev1.ConfigMap)
 		initialize.Map(&configmap.Data)
 		var instrumentation *v1beta1.InstrumentationSpec
-		require.UnmarshalInto(t, &instrumentation, `{
-			logs: { retentionPeriod: 12h },
-		}`)
+		require.UnmarshalInto(t, &instrumentation, `{}`)
 		err := collector.EnablePgAdminLogging(ctx, instrumentation, configmap)
 		assert.NilError(t, err)
 

internal/collector/pgbackrest_test.go

@@ -16,7 +16,7 @@ import (
 )
 
 func TestNewConfigForPgBackrestRepoHostPod(t *testing.T) {
-	t.Run("NilInstrumentationSpec", func(t *testing.T) {
+	t.Run("EmptyInstrumentationSpec", func(t *testing.T) {
 		gate := feature.NewGate()
 		assert.NilError(t, gate.SetFromMap(map[string]bool{
 			feature.OpenTelemetryLogs: true,
@@ -29,9 +29,7 @@ func TestNewConfigForPgBackrestRepoHostPod(t *testing.T) {
 			},
 		}
 		var instrumentation *v1beta1.InstrumentationSpec
-		require.UnmarshalInto(t, &instrumentation, `{
-			logs: { retentionPeriod: 12h },
-		}`)
+		require.UnmarshalInto(t, &instrumentation, `{}`)
 
 		config := NewConfigForPgBackrestRepoHostPod(ctx, instrumentation, repos)