From cc23e86f3882dc9208db9cf9a1a12236ebe9f136 Mon Sep 17 00:00:00 2001
From: Rowan Seymour <rowanseymour@gmail.com>
Date: Mon, 16 Dec 2024 14:04:59 -0500
Subject: [PATCH] Tweak metrics namespace and fix metric names and dimensions

---
 archives/archives.go | 76 ++++++++++++++++++--------------------------
 runtime/config.go    |  2 +-
 2 files changed, 32 insertions(+), 46 deletions(-)

diff --git a/archives/archives.go b/archives/archives.go
index 793feae..6cfaecb 100644
--- a/archives/archives.go
+++ b/archives/archives.go
@@ -967,82 +967,68 @@ func ArchiveActiveOrgs(rt *runtime.Runtime) error {
 	timeTaken := dates.Now().Sub(start)
 	slog.Info("archiving of active orgs complete", "time_taken", timeTaken, "num_orgs", len(orgs))
 
-	dims := []types.Dimension{
-		{Name: aws.String("App"), Value: aws.String("archiver")},
-	}
+	msgsDim := types.Dimension{Name: aws.String("ArchiveType"), Value: aws.String("msgs")}
+	runsDim := types.Dimension{Name: aws.String("ArchiveType"), Value: aws.String("runs")}
 
 	metrics := []types.MetricDatum{
+		{MetricName: aws.String("ArchivingElapsed"), Value: aws.Float64(timeTaken.Seconds()), Unit: types.StandardUnitSeconds},
 		{
-			MetricName: aws.String("ArchiveElapsed"),
-			Dimensions: dims,
-			Value:      aws.Float64(timeTaken.Seconds()),
-			Unit:       types.StandardUnitSeconds,
-		},
-		{
-			MetricName: aws.String("OrgsArchived"),
-			Dimensions: dims,
-			Value:      aws.Float64(float64(len(orgs))),
-			Unit:       types.StandardUnitCount,
-		},
-		{
-			MetricName: aws.String("MsgsRecordsArchived"),
-			Dimensions: dims,
+			MetricName: aws.String("RecordsArchived"),
+			Dimensions: []types.Dimension{msgsDim},
 			Value:      aws.Float64(float64(totalMsgsRecordsArchived)),
 			Unit:       types.StandardUnitCount,
 		},
 		{
-			MetricName: aws.String("MsgsArchivedsCreated"),
-			Dimensions: dims,
-			Value:      aws.Float64(float64(totalMsgsArchivesCreated)),
+			MetricName: aws.String("RecordsArchived"),
+			Dimensions: []types.Dimension{runsDim},
+			Value:      aws.Float64(float64(totalRunsRecordsArchived)),
 			Unit:       types.StandardUnitCount,
 		},
-
 		{
-			MetricName: aws.String("MsgsArchivedsFailed"),
-			Dimensions: dims,
-			Value:      aws.Float64(float64(totalMsgsArchivesFailed)),
+			MetricName: aws.String("ArchivesCreated"),
+			Dimensions: []types.Dimension{msgsDim},
+			Value:      aws.Float64(float64(totalMsgsArchivesCreated)),
 			Unit:       types.StandardUnitCount,
 		},
-
 		{
-			MetricName: aws.String("MsgsRollupsCreated"),
-			Dimensions: dims,
-			Value:      aws.Float64(float64(totalMsgsRollupsCreated)),
+			MetricName: aws.String("ArchivesCreated"),
+			Dimensions: []types.Dimension{runsDim},
+			Value:      aws.Float64(float64(totalRunsArchivesCreated)),
 			Unit:       types.StandardUnitCount,
 		},
 		{
-			MetricName: aws.String("MsgsRollupsFailed"),
-			Dimensions: dims,
-			Value:      aws.Float64(float64(totalMsgsRollupsFailed)),
+			MetricName: aws.String("ArchivesFailed"),
+			Dimensions: []types.Dimension{msgsDim},
+			Value:      aws.Float64(float64(totalMsgsArchivesFailed)),
 			Unit:       types.StandardUnitCount,
 		},
 		{
-			MetricName: aws.String("RunsRecordsArchived"),
-			Dimensions: dims,
-			Value:      aws.Float64(float64(totalRunsRecordsArchived)),
+			MetricName: aws.String("ArchivesFailed"),
+			Dimensions: []types.Dimension{runsDim},
+			Value:      aws.Float64(float64(totalRunsArchivesFailed)),
 			Unit:       types.StandardUnitCount,
 		},
 		{
-			MetricName: aws.String("RunsArchivedsCreated"),
-			Dimensions: dims,
-			Value:      aws.Float64(float64(totalRunsArchivesCreated)),
+			MetricName: aws.String("RollupsCreated"),
+			Dimensions: []types.Dimension{msgsDim},
+			Value:      aws.Float64(float64(totalMsgsRollupsCreated)),
 			Unit:       types.StandardUnitCount,
 		},
 		{
-			MetricName: aws.String("RunsArchivedsFailed"),
-			Dimensions: dims,
-			Value:      aws.Float64(float64(totalRunsArchivesFailed)),
+			MetricName: aws.String("RollupsCreated"),
+			Dimensions: []types.Dimension{runsDim},
+			Value:      aws.Float64(float64(totalRunsRollupsCreated)),
 			Unit:       types.StandardUnitCount,
 		},
 		{
-			MetricName: aws.String("RunsRollupsCreated"),
-			Dimensions: dims,
-			Value:      aws.Float64(float64(totalRunsRollupsCreated)),
+			MetricName: aws.String("RollupsFailed"),
+			Dimensions: []types.Dimension{msgsDim},
+			Value:      aws.Float64(float64(totalMsgsRollupsFailed)),
 			Unit:       types.StandardUnitCount,
 		},
 		{
-			MetricName: aws.String("RunsRollupsFailed"),
-			Dimensions: dims,
+			MetricName: aws.String("RollupsFailed"),
+			Dimensions: []types.Dimension{runsDim},
 			Value:      aws.Float64(float64(totalRunsRollupsFailed)),
 			Unit:       types.StandardUnitCount,
 		},
diff --git a/runtime/config.go b/runtime/config.go
index 2df4fe1..0450395 100644
--- a/runtime/config.go
+++ b/runtime/config.go
@@ -56,7 +56,7 @@ func NewDefaultConfig() *Config {
 		StartTime:       "00:01",
 		Once:            false,
 
-		CloudwatchNamespace: "Temba",
+		CloudwatchNamespace: "Temba/Archiver",
 		DeploymentID:        "dev",
 
 		LogLevel: "info",