From 8b85c334e28c43f1446ff11003bea2278536a30c Mon Sep 17 00:00:00 2001
From: geigerj0 <112163019+geigerj0@users.noreply.github.com>
Date: Tue, 2 Apr 2024 17:52:30 +0200
Subject: [PATCH] feat(cpuutil): support `cpuutil` also for deployments using
 loggregator (#2808)

---
 ci/autoscaler/scripts/run-acceptance-tests.sh |  2 +-
 src/acceptance/helpers/debug.go               |  1 +
 src/autoscaler/metricsgateway/nozzle.go       |  5 +--
 src/autoscaler/metricsgateway/nozzle_test.go  | 36 ++++++++++++++++---
 4 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/ci/autoscaler/scripts/run-acceptance-tests.sh b/ci/autoscaler/scripts/run-acceptance-tests.sh
index 739858c7a8..e3b9a87eda 100755
--- a/ci/autoscaler/scripts/run-acceptance-tests.sh
+++ b/ci/autoscaler/scripts/run-acceptance-tests.sh
@@ -46,7 +46,7 @@ cat > acceptance_config.json <<EOF
   "use_http": false,
   "service_name": "${deployment_name}",
   "service_broker": "${deployment_name}",
-	"use_existing_organization": ${use_existing_organization},
+  "use_existing_organization": ${use_existing_organization},
   "existing_organization": "${existing_organization}",
   "use_existing_space": ${use_existing_space},
   "existing_space": "${existing_space}",
diff --git a/src/acceptance/helpers/debug.go b/src/acceptance/helpers/debug.go
index 62df5219f3..983cebff44 100644
--- a/src/acceptance/helpers/debug.go
+++ b/src/acceptance/helpers/debug.go
@@ -29,6 +29,7 @@ func DebugInfo(cfg *config.Config, setup *workflowhelpers.ReproducibleTestSuiteS
 		commands = append(commands, command("cf", "autoscaling-metrics", anApp, "responsetime"))
 		commands = append(commands, command("cf", "autoscaling-metrics", anApp, "throughput"))
 		commands = append(commands, command("cf", "autoscaling-metrics", anApp, "cpu"))
+		commands = append(commands, command("cf", "autoscaling-metrics", anApp, "cpuutil"))
 		commands = append(commands, command("cf", "autoscaling-metrics", anApp, "test_metric"))
 		output := new(strings.Builder)
 		_, _ = fmt.Fprintf(output, "\n=============== DEBUG ===============\n")
diff --git a/src/autoscaler/metricsgateway/nozzle.go b/src/autoscaler/metricsgateway/nozzle.go
index d03373c813..c489b7e046 100644
--- a/src/autoscaler/metricsgateway/nozzle.go
+++ b/src/autoscaler/metricsgateway/nozzle.go
@@ -134,6 +134,7 @@ func (n *Nozzle) filterEnvelopes(envelops []*loggregator_v2.Envelope) {
 }
 
 func isContainerMetricEnvelope(e *loggregator_v2.Envelope) bool {
-	_, exist := e.GetGauge().GetMetrics()["memory_quota"]
-	return exist
+	_, memoryQuotaExists := e.GetGauge().GetMetrics()["memory_quota"]
+	_, cpuEntitlementExists := e.GetGauge().GetMetrics()["cpu_entitlement"]
+	return memoryQuotaExists || cpuEntitlementExists
 }
diff --git a/src/autoscaler/metricsgateway/nozzle_test.go b/src/autoscaler/metricsgateway/nozzle_test.go
index 99e8c273c5..615b7317a6 100644
--- a/src/autoscaler/metricsgateway/nozzle_test.go
+++ b/src/autoscaler/metricsgateway/nozzle_test.go
@@ -46,7 +46,7 @@ var _ = Describe("Nozzle", func() {
 			},
 		}
 
-		containerMetricEnvelope = loggregator_v2.Envelope{
+		containerMetricEnvelope1 = loggregator_v2.Envelope{
 			SourceId: testAppId,
 			Message: &loggregator_v2.Envelope_Gauge{
 				Gauge: &loggregator_v2.Gauge{
@@ -72,6 +72,21 @@ var _ = Describe("Nozzle", func() {
 			},
 		}
 
+		// cpu_entitlement is emitted in a separate envelope https://docs.cloudfoundry.org/loggregator/container-metrics.html
+		containerMetricEnvelope2 = loggregator_v2.Envelope{
+			SourceId: testAppId,
+			Message: &loggregator_v2.Envelope_Gauge{
+				Gauge: &loggregator_v2.Gauge{
+					Metrics: map[string]*loggregator_v2.GaugeValue{
+						"cpu_entitlement": {
+							Unit:  "percentage",
+							Value: 20.5,
+						},
+					},
+				},
+			},
+		}
+
 		customMetricEnvelope = loggregator_v2.Envelope{
 			SourceId: testAppId,
 			DeprecatedTags: map[string]*loggregator_v2.Value{
@@ -164,8 +179,7 @@ var _ = Describe("Nozzle", func() {
 			return appIDs
 		}
 		envelopes = []*loggregator_v2.Envelope{
-			&containerMetricEnvelope,
-			&httpStartStopEnvelope,
+			&containerMetricEnvelope1,
 		}
 		LogServerName = "reverselogproxy"
 
@@ -226,10 +240,22 @@ var _ = Describe("Nozzle", func() {
 				Consistently(envelopChan).ShouldNot(Receive())
 			})
 		})
-		Context("there is container metric envelope", func() {
+		Context("there is container metric envelope 1", func() {
+			BeforeEach(func() {
+				envelopes = []*loggregator_v2.Envelope{
+					&containerMetricEnvelope1,
+				}
+			})
+			It("should accept the envelope", func() {
+				Eventually(envelopChan).Should(Receive())
+
+			})
+		})
+
+		Context("there is container metric envelope 2", func() {
 			BeforeEach(func() {
 				envelopes = []*loggregator_v2.Envelope{
-					&containerMetricEnvelope,
+					&containerMetricEnvelope2,
 				}
 			})
 			It("should accept the envelope", func() {