Only add custom queries to projected config volume if metrics feature is enabled and the pod serves metrics. Reorganize some code.

Author: dsessler7

internal/collector/instance.go

@@ -48,7 +48,7 @@ func AddToPod(
 	sqlQueryPassword string,
 	logDirectories []string,
 	includeLogrotate bool,
-	includeMetricsPort bool,
+	thisPodServesMetrics bool,
 ) {
 	if spec == nil ||
 		!(feature.Enabled(ctx, feature.OpenTelemetryLogs) ||
@@ -84,21 +84,6 @@ func AddToPod(
 			spec.Config.Files...)
 	}
 
-	// If the user has specified custom queries to add, put the queries file(s)
-	// in the projected config volume
-	if spec.Metrics != nil && spec.Metrics.CustomQueries != nil &&
-		spec.Metrics.CustomQueries.Add != nil {
-		for _, querySet := range spec.Metrics.CustomQueries.Add {
-			projection := querySet.Queries.AsProjection(querySet.Name +
-				"/" + querySet.Queries.Key)
-			configVolume.Projected.Sources = append(configVolume.Projected.Sources,
-				corev1.VolumeProjection{ConfigMap: &projection})
-		}
-	}
-
-	// Add configVolume to the pod's volumes
-	template.Spec.Volumes = append(template.Spec.Volumes, configVolume)
-
 	// Create collector container
 	container := corev1.Container{
 		Name:            naming.ContainerCollector,
@@ -128,6 +113,28 @@ func AddToPod(
 		VolumeMounts:    append(volumeMounts, configVolumeMount),
 	}
 
+	// If metrics feature is enabled and this Pod serves metrics, add the
+	// Prometheus port to this container
+	if feature.Enabled(ctx, feature.OpenTelemetryMetrics) && thisPodServesMetrics {
+		container.Ports = []corev1.ContainerPort{{
+			ContainerPort: int32(PrometheusPort),
+			Name:          "otel-metrics",
+			Protocol:      corev1.ProtocolTCP,
+		}}
+
+		// If the user has specified custom queries to add, put the queries
+		// file(s) in the projected config volume
+		if spec.Metrics != nil && spec.Metrics.CustomQueries != nil &&
+			spec.Metrics.CustomQueries.Add != nil {
+			for _, querySet := range spec.Metrics.CustomQueries.Add {
+				projection := querySet.Queries.AsProjection(querySet.Name +
+					"/" + querySet.Queries.Key)
+				configVolume.Projected.Sources = append(configVolume.Projected.Sources,
+					corev1.VolumeProjection{ConfigMap: &projection})
+			}
+		}
+	}
+
 	// If this is a pod that uses logrotate for log rotation, add config volume
 	// and mount for logrotate config
 	if includeLogrotate {
@@ -154,17 +161,12 @@ func AddToPod(
 		template.Spec.Volumes = append(template.Spec.Volumes, logrotateConfigVolume)
 	}
 
-	if feature.Enabled(ctx, feature.OpenTelemetryMetrics) && includeMetricsPort {
-		container.Ports = []corev1.ContainerPort{{
-			ContainerPort: int32(PrometheusPort),
-			Name:          "otel-metrics",
-			Protocol:      corev1.ProtocolTCP,
-		}}
-	}
-
+	// Add configVolume to the Pod's volumes and add the collector container to
+	// the Pod's containers
+	template.Spec.Volumes = append(template.Spec.Volumes, configVolume)
 	template.Spec.Containers = append(template.Spec.Containers, container)
 
-	// add the proper label to support Pod discovery by Prometheus
+	// add the OTel collector label to the Pod
 	initialize.Labels(template)
 	template.Labels[naming.LabelCollectorDiscovery] = "true"
 }