Fix rebase error, revise postgres collector logic

Author: benjaminjb

internal/collector/instance.go

@@ -154,15 +154,14 @@ func startCommand(dir string, includeLogrotate bool) []string {
 		mkdirScript = `
 ` + shell.MakeDirectories(0o775, dir, dir+"/receiver")
 	}
-	var startScript = `
-/otelcol-contrib --config /etc/otel-collector/config.yaml
-`
 
+	var logrotateCommand string
 	if includeLogrotate {
 		logrotateCommand = `logrotate -s /tmp/logrotate.status /etc/logrotate.d/logrotate.conf`
 	}
 
 	var startScript = fmt.Sprintf(`
+%s
 OTEL_PIDFILE=/tmp/otel.pid
 
 start_otel_collector() {
@@ -185,9 +184,9 @@ while read -r -t 5 -u "${fd}" ||:; do
 		start_otel_collector
 	fi
 done
-`, configDirectory, logrotateCommand)
+`, mkdirScript, configDirectory, logrotateCommand)
 
-  wrapper := `monitor() {` + mkdirScript + startScript + `}; export directory="$1"; export -f monitor; exec -a "$0" bash -ceu monitor`
+	wrapper := `monitor() {` + startScript + `}; export directory="$1"; export -f monitor; exec -a "$0" bash -ceu monitor`
 
 	return []string{"bash", "-ceu", "--", wrapper, "collector", configDirectory}
 }

internal/controller/postgrescluster/instance.go

@@ -1200,29 +1200,33 @@ func (r *Reconciler) reconcileInstance(
 			spec, instanceCertificates, instanceConfigMap, &instance.Spec.Template)
 	}
 
-	if err == nil &&
-		(feature.Enabled(ctx, feature.OpenTelemetryLogs) && !feature.Enabled(ctx, feature.OpenTelemetryMetrics)) {
+	if err == nil {
 
-		// TODO: Setting the includeLogrotate argument to false for now. This
-		// should be changed when we implement log rotation for postgres
-		// TODO: add dir
-		collector.AddToPod(ctx, cluster.Spec.Instrumentation, cluster.Spec.ImagePullPolicy, instanceConfigMap, &instance.Spec.Template.Spec,
-			[]corev1.VolumeMount{postgres.DataVolumeMount()}, "", "", false)
-	}
+		// If OTel metrics are enabled, we'll need the MonitoringUserSecret
+		var password = ""
+		if feature.Enabled(ctx, feature.OpenTelemetryMetrics) {
+			monitoringUserSecret := &corev1.Secret{ObjectMeta: naming.MonitoringUserSecret(cluster)}
+			err = errors.WithStack(
+				r.Client.Get(ctx, client.ObjectKeyFromObject(monitoringUserSecret), monitoringUserSecret))
+
+			if err == nil {
+				password = string(monitoringUserSecret.Data["password"])
+			}
+		}
 
-	if err == nil &&
-		feature.Enabled(ctx, feature.OpenTelemetryMetrics) {
+		// FIXME: is this bool really asking for a backup vol?
+		var logrotate = false
+		if backupsSpecFound {
+			logrotate = true
+		}
 
-		monitoringUserSecret := &corev1.Secret{ObjectMeta: naming.MonitoringUserSecret(cluster)}
-		err = errors.WithStack(
-			r.Client.Get(ctx, client.ObjectKeyFromObject(monitoringUserSecret), monitoringUserSecret))
+		if feature.Enabled(ctx, feature.OpenTelemetryLogs) || feature.Enabled(ctx, feature.OpenTelemetryMetrics) {
 
-		if err == nil {
-			// TODO: Setting the includeLogrotate argument to false for now. This
-			// should be changed when we implement log rotation for postgres
-			// TODO: add dir
-			collector.AddToPod(ctx, cluster.Spec.Instrumentation, cluster.Spec.ImagePullPolicy, instanceConfigMap, &instance.Spec.Template.Spec,
-				[]corev1.VolumeMount{postgres.DataVolumeMount()}, string(monitoringUserSecret.Data["password"]), "", false)
+			// TODO: Add pgBackRestDir if we want that.
+			collector.AddToPod(ctx, cluster.Spec.Instrumentation, cluster.Spec.ImagePullPolicy,
+				instanceConfigMap, &instance.Spec.Template.Spec,
+				[]corev1.VolumeMount{postgres.DataVolumeMount()},
+				password, naming.PGBackRestPGDataLogPath, logrotate)
 		}
 	}
 
@@ -1435,7 +1439,7 @@ func (r *Reconciler) reconcileInstanceConfigMap(
 		if err == nil && feature.Enabled(ctx, feature.OpenTelemetryLogs) &&
 			backupSpecFound && cluster.Spec.Instrumentation != nil {
 			err = collector.AddLogrotateConfig(ctx, cluster.Spec.Instrumentation,
-				instanceConfigMap, naming.PGBackRestPGDataLogPath, "")
+				instanceConfigMap, naming.PGBackRestPGDataLogPath+"/*.log", "")
 		}
 	}
 	if err == nil {