Dir creation in collector startup

Author: benjaminjb

internal/collector/pgbouncer.go

@@ -54,12 +54,11 @@ func EnablePgBouncerLogging(ctx context.Context,
 
 		// Keep track of what log records and files have been processed.
 		// Use a subdirectory of the logs directory to stay within the same failure domain.
-		// TODO(log-rotation): Create this directory during Collector startup.
 		//
 		// https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/-/extension/storage/filestorage#readme
 		outConfig.Extensions["file_storage/pgbouncer_logs"] = map[string]any{
 			"directory":        directory + "/receiver",
-			"create_directory": true,
+			"create_directory": false,
 			"fsync":            true,
 		}
 

internal/collector/pgbouncer_test.go

@@ -35,7 +35,7 @@ exporters:
     verbosity: detailed
 extensions:
   file_storage/pgbouncer_logs:
-    create_directory: true
+    create_directory: false
     directory: /tmp/receiver
     fsync: true
 processors:
@@ -124,7 +124,7 @@ exporters:
     project: google-project-name
 extensions:
   file_storage/pgbouncer_logs:
-    create_directory: true
+    create_directory: false
     directory: /tmp/receiver
     fsync: true
 processors:

internal/controller/postgrescluster/instance.go

@@ -1219,8 +1219,10 @@ func (r *Reconciler) reconcileInstance(
 		}
 
 		// For now, we are not using logrotate to rotate postgres or patroni logs
+		// but we are using it for pgbackrest logs in the postgres pod
 		collector.AddToPod(ctx, cluster.Spec.Instrumentation, cluster.Spec.ImagePullPolicy, instanceConfigMap, &instance.Spec.Template.Spec,
-			[]corev1.VolumeMount{postgres.DataVolumeMount()}, pgPassword, []string{}, false)
+			[]corev1.VolumeMount{postgres.DataVolumeMount()}, pgPassword,
+			[]string{naming.PGBackRestPGDataLogPath}, true)
 	}
 
 	// Add postgres-exporter to the instance Pod spec

internal/pgbouncer/reconcile.go

@@ -192,7 +192,7 @@ func Pod(
 
 	if feature.Enabled(ctx, feature.OpenTelemetryLogs) || feature.Enabled(ctx, feature.OpenTelemetryMetrics) {
 		collector.AddToPod(ctx, inCluster.Spec.Instrumentation, inCluster.Spec.ImagePullPolicy, inConfigMap,
-			outPod, []corev1.VolumeMount{configVolumeMount}, string(inSecret.Data["pgbouncer-password"]), []string{},
+			outPod, []corev1.VolumeMount{configVolumeMount}, string(inSecret.Data["pgbouncer-password"]), []string{naming.PGBouncerLogPath},
 			true)
 	}
 }