.

Change-Id: Ieab1fa5f38cdfcb2e7f0de9934bf69f51463ded5

Author: kadupoornima

pkg/telemetry/collector_test.go

@@ -3076,6 +3076,31 @@ func TestGetMachineCategory(t *testing.T) {
 			},
 			want: "a100-40gb-1:GPU,v6e-4:TPU",
 		},
+		{
+			name: "Handles memory-optimized machine types correctly as CPU",
+			bp: config.Blueprint{
+				Groups: []config.Group{
+					{
+						Name: config.GroupName("primary"),
+						Modules: []config.Module{
+							{
+								ID: config.ModuleID("compute_mem_1"),
+								Settings: config.NewDict(map[string]cty.Value{
+									"machine_type": cty.StringVal("m1-megamem-96"),
+								}),
+							},
+							{
+								ID: config.ModuleID("compute_mem_2"),
+								Settings: config.NewDict(map[string]cty.Value{
+									"machine_type": cty.StringVal("m2-ultramem-208"),
+								}),
+							},
+						},
+					},
+				},
+			},
+			want: "m1-megamem-96:CPU,m2-ultramem-208:CPU",
+		},
 		{
 			name: "Handles unknown machine types mapped to Other",
 			bp: config.Blueprint{

pkg/telemetry/collector_util.go

@@ -1104,9 +1104,23 @@ func detectMachineCategory(mType string) string {
 		}
 	}
 
-	if strings.Contains(mType, "-standard-") || strings.Contains(mType, "-highmem-") || strings.Contains(mType, "-highcpu-") || strings.Contains(mType, "-megamem-") || strings.Contains(mType, "-ultramem-") || strings.Contains(mType, "custom-") {
+	if isCPUFallback(mType) {
 		return "CPU"
 	}
 
 	return "Other"
 }
+
+// isCPUFallback checks if the machine type contains any of the standard CPU identifiers.
+func isCPUFallback(mType string) bool {
+	cpuKeywords := []string{
+		"-standard-", "-highmem-", "-highcpu-",
+		"-megamem-", "-ultramem-", "custom-",
+	}
+	for _, kw := range cpuKeywords {
+		if strings.Contains(mType, kw) {
+			return true
+		}
+	}
+	return false
+}