collector util func

Check feature gates and check spec

Author: benjaminjb

internal/collector/instance.go

@@ -49,9 +49,7 @@ func AddToPod(
 	logDirectories []string,
 	includeLogrotate bool,
 ) {
-	if spec == nil ||
-		!(feature.Enabled(ctx, feature.OpenTelemetryLogs) ||
-			feature.Enabled(ctx, feature.OpenTelemetryMetrics)) {
+	if !OpenTelemetryLogsOrMetricsEnabled(ctx, spec) {
 		return
 	}
 

internal/collector/util.go

@@ -0,0 +1,56 @@
+// Copyright 2025 Crunchy Data Solutions, Inc.
+//
+// SPDX-License-Identifier: Apache-2.0
+
+package collector
+
+import (
+	"context"
+
+	"github.com/crunchydata/postgres-operator/internal/feature"
+	"github.com/crunchydata/postgres-operator/pkg/apis/postgres-operator.crunchydata.com/v1beta1"
+)
+
+type CrunchyCRD interface {
+	*v1beta1.PostgresCluster | *v1beta1.PGAdmin | *v1beta1.InstrumentationSpec
+}
+
+func OpenTelemetrySpecPresent[T CrunchyCRD](object T) bool {
+
+	switch v := any(object).(type) {
+	case *v1beta1.InstrumentationSpec:
+		return true
+	case *v1beta1.PostgresCluster:
+		return v.Spec.Instrumentation != nil
+	case *v1beta1.PGAdmin:
+		return v.Spec.Instrumentation != nil
+	default:
+		return false
+	}
+
+}
+
+func OpenTelemetryLogsOrMetricsEnabled[T CrunchyCRD](
+	ctx context.Context,
+	object T,
+) bool {
+	return OpenTelemetrySpecPresent(object) &&
+		(feature.Enabled(ctx, feature.OpenTelemetryLogs) ||
+			feature.Enabled(ctx, feature.OpenTelemetryMetrics))
+}
+
+func OpenTelemetryLogsEnabled[T CrunchyCRD](
+	ctx context.Context,
+	object T,
+) bool {
+	return OpenTelemetrySpecPresent(object) &&
+		feature.Enabled(ctx, feature.OpenTelemetryLogs)
+}
+
+func OpenTelemetryMetricsEnabled[T CrunchyCRD](
+	ctx context.Context,
+	object T,
+) bool {
+	return OpenTelemetrySpecPresent(object) &&
+		feature.Enabled(ctx, feature.OpenTelemetryMetrics)
+}

internal/controller/standalone_pgadmin/configmap.go

@@ -19,7 +19,6 @@ import (
 	"github.com/pkg/errors"
 
 	"github.com/crunchydata/postgres-operator/internal/collector"
-	"github.com/crunchydata/postgres-operator/internal/feature"
 	"github.com/crunchydata/postgres-operator/internal/initialize"
 	"github.com/crunchydata/postgres-operator/internal/naming"
 	"github.com/crunchydata/postgres-operator/pkg/apis/postgres-operator.crunchydata.com/v1beta1"
@@ -73,7 +72,7 @@ func configmap(ctx context.Context, pgadmin *v1beta1.PGAdmin,
 		gunicornRetentionPeriod = "D"
 	)
 	// If OTel logs feature gate is enabled, we want to change the pgAdmin/gunicorn logging
-	if feature.Enabled(ctx, feature.OpenTelemetryLogs) && pgadmin.Spec.Instrumentation != nil {
+	if collector.OpenTelemetryLogsEnabled(ctx, pgadmin) {
 		logRetention = true
 
 		// If the user has set a retention period, we will use those values for log rotation,

internal/controller/standalone_pgadmin/statefulset.go

@@ -17,7 +17,6 @@ import (
 
 	"github.com/crunchydata/postgres-operator/internal/collector"
 	"github.com/crunchydata/postgres-operator/internal/controller/postgrescluster"
-	"github.com/crunchydata/postgres-operator/internal/feature"
 	"github.com/crunchydata/postgres-operator/internal/initialize"
 	"github.com/crunchydata/postgres-operator/internal/naming"
 	"github.com/crunchydata/postgres-operator/pkg/apis/postgres-operator.crunchydata.com/v1beta1"
@@ -122,7 +121,7 @@ func statefulset(
 
 	pod(pgadmin, configmap, &sts.Spec.Template.Spec, dataVolume)
 
-	if pgadmin.Spec.Instrumentation != nil && feature.Enabled(ctx, feature.OpenTelemetryLogs) {
+	if collector.OpenTelemetryLogsEnabled(ctx, pgadmin) {
 		// Logs for gunicorn and pgadmin write to /var/lib/pgadmin/logs
 		// so the collector needs access to that that path.
 		dataVolumeMount := corev1.VolumeMount{

internal/pgmonitor/postgres.go

@@ -8,12 +8,11 @@ import (
 	"context"
 	"strings"
 
-	corev1 "k8s.io/api/core/v1"
-
-	"github.com/crunchydata/postgres-operator/internal/feature"
+	"github.com/crunchydata/postgres-operator/internal/collector"
 	"github.com/crunchydata/postgres-operator/internal/logging"
 	"github.com/crunchydata/postgres-operator/internal/postgres"
 	"github.com/crunchydata/postgres-operator/pkg/apis/postgres-operator.crunchydata.com/v1beta1"
+	corev1 "k8s.io/api/core/v1"
 )
 
 const (
@@ -24,7 +23,8 @@ const (
 // PostgreSQLHBAs provides the Postgres HBA rules for allowing the monitoring
 // exporter to be accessible
 func PostgreSQLHBAs(ctx context.Context, inCluster *v1beta1.PostgresCluster, outHBAs *postgres.HBAs) {
-	if ExporterEnabled(ctx, inCluster) || feature.Enabled(ctx, feature.OpenTelemetryMetrics) {
+	if ExporterEnabled(ctx, inCluster) ||
+		collector.OpenTelemetryMetricsEnabled(ctx, inCluster) {
 		// Limit the monitoring user to local connections using SCRAM.
 		outHBAs.Mandatory = append(outHBAs.Mandatory,
 			postgres.NewHBA().TCP().Users(MonitoringUser).Method("scram-sha-256").Network("127.0.0.0/8"),
@@ -34,9 +34,11 @@ func PostgreSQLHBAs(ctx context.Context, inCluster *v1beta1.PostgresCluster, out
 }
 
 // PostgreSQLParameters provides additional required configuration parameters
-// that Postgres needs to support monitoring
+// that Postgres needs to support monitoring for both pgMonitor and OTel
 func PostgreSQLParameters(ctx context.Context, inCluster *v1beta1.PostgresCluster, outParameters *postgres.Parameters) {
-	if ExporterEnabled(ctx, inCluster) || feature.Enabled(ctx, feature.OpenTelemetryMetrics) {
+	if ExporterEnabled(ctx, inCluster) ||
+		collector.OpenTelemetryMetricsEnabled(ctx, inCluster) {
+
 		// Exporter expects that shared_preload_libraries are installed
 		// pg_stat_statements: https://access.crunchydata.com/documentation/pgmonitor/latest/exporter/
 		// pgnodemx: https://github.com/CrunchyData/pgnodemx