Skip to content

Clone embedded metrics variable to avoid continuous appending. #4112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cbandy merged 1 commit into from
Mar 1, 2025
Merged

Clone embedded metrics variable to avoid continuous appending. #4112

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions internal/collector/postgres_metrics.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,17 +38,22 @@ var ltPG16 json.RawMessage

func EnablePostgresMetrics(ctx context.Context, inCluster *v1beta1.PostgresCluster, config *Config) {
if feature.Enabled(ctx, feature.OpenTelemetryMetrics) {
// We must create a copy of the fiveSecondMetrics variable, otherwise we
// will continually append to it and blow up our ConfigMap
fiveSecondMetricsClone := slices.Clone(fiveSecondMetrics)

if inCluster.Spec.PostgresVersion >= 17 {
fiveSecondMetrics, _ = appendToJSONArray(fiveSecondMetrics, gtePG17)
fiveSecondMetricsClone, _ = appendToJSONArray(fiveSecondMetricsClone, gtePG17)
} else {
fiveSecondMetrics, _ = appendToJSONArray(fiveSecondMetrics, ltPG17)
fiveSecondMetricsClone, _ = appendToJSONArray(fiveSecondMetricsClone, ltPG17)
}

if inCluster.Spec.PostgresVersion >= 16 {
fiveSecondMetrics, _ = appendToJSONArray(fiveSecondMetrics, gtePG16)
fiveSecondMetricsClone, _ = appendToJSONArray(fiveSecondMetricsClone, gtePG16)
} else {
fiveSecondMetrics, _ = appendToJSONArray(fiveSecondMetrics, ltPG16)
fiveSecondMetricsClone, _ = appendToJSONArray(fiveSecondMetricsClone, ltPG16)
}

// Add Prometheus exporter
config.Exporters[Prometheus] = map[string]any{
"endpoint": "0.0.0.0:9187",
Expand All @@ -60,7 +65,7 @@ func EnablePostgresMetrics(ctx context.Context, inCluster *v1beta1.PostgresClust
"collection_interval": "5s",
// Give Postgres time to finish setup.
"initial_delay": "10s",
"queries": slices.Clone(fiveSecondMetrics),
"queries": slices.Clone(fiveSecondMetricsClone),
}

config.Receivers[FiveMinuteSqlQuery] = map[string]any{
Expand Down
Loading