fix bedrock metrics with split namespaces (#356)

Author: tristanburgess

pkg/cloudWatchConsts/metrics.go

@@ -313,33 +313,49 @@ var NamespaceMetricsMap = map[string][]string{
 		"NumberOfRestoreJobsRunning",
 	},
 	"AWS/Bedrock": {
-		"FindingCounts",
 		"InputTokenCount",
 		"InvocationClientErrors",
 		"InvocationLatency",
 		"InvocationServerErrors",
 		"InvocationThrottles",
 		"Invocations",
-		"InvocationsIntervened",
-		"Latency",
 		"LegacyModelInvocations",
-		"ModelInvocationClientErrors",
-		"ModelInvocationCount",
 		"ModelInvocationLargeDataS3DeliveryFailure",
 		"ModelInvocationLargeDataS3DeliverySuccess",
 		"ModelInvocationLogsCloudWatchDeliveryFailure",
 		"ModelInvocationLogsCloudWatchDeliverySuccess",
 		"ModelInvocationLogsS3DeliveryFailure",
 		"ModelInvocationLogsS3DeliverySuccess",
+		"OutputImageCount",
+		"OutputTokenCount",
+	},
+	"AWS/Bedrock/Agents": {
+		"InputTokenCount",
+		"InvocationClientErrors",
+		"InvocationCount",
+		"InvocationServerErrors",
+		"InvocationThrottles",
+		"ModelInvocationClientErrors",
+		"ModelInvocationCount",
 		"ModelInvocationServerErrors",
 		"ModelInvocationThrottles",
 		"ModelLatency",
-		"OutputImageCount",
 		"OutputTokenCount",
 		"TTFT",
+		"TotalTime",
+	},
+	"AWS/Bedrock/Guardrails": {
+		"FindingCounts",
+		"InputTokenCount",
+		"InvocationClientErrors",
+		"InvocationLatency",
+		"InvocationServerErrors",
+		"InvocationThrottles",
+		"Invocations",
+		"InvocationsIntervened",
+		"Latency",
 		"TextUnitCount",
 		"TotalFindings",
-		"TotalTime",
 	},
 	"AWS/Billing": {
 		"EstimatedCharges",
@@ -3416,7 +3432,9 @@ var NamespaceDimensionKeysMap = map[string][]string{
 	"AWS/Athena":                         {"QueryState", "QueryType", "WorkGroup"},
 	"AWS/AutoScaling":                    {"AutoScalingGroupName", "PairIndex", "PolicyName"},
 	"AWS/Backup":                         {"BackupVaultName", "ResourceType"},
-	"AWS/Bedrock":                        {"AgentAliasArn", "BucketedStepSize", "FindingType", "GuardrailArn", "GuardrailContentSource", "GuardrailPolicyType", "GuardrailVersion", "ImageSize", "ModelId", "Operation", "PolicyArn", "PolicyVersion"},
+	"AWS/Bedrock":                        {"BucketedStepSize", "ImageSize", "ModelId"},
+	"AWS/Bedrock/Agents":                 {"AgentAliasArn", "ModelId", "Operation"},
+	"AWS/Bedrock/Guardrails":             {"FindingType", "GuardrailArn", "GuardrailContentSource", "GuardrailPolicyType", "GuardrailVersion", "Operation", "PolicyArn", "PolicyVersion"},
 	"AWS/Billing":                        {"Currency", "LinkedAccount", "ServiceName"},
 	"AWS/CertificateManager":             {"CertificateArn"},
 	"AWS/Chatbot":                        {"ConfigurationName"},