update tests

DataDog · Nov 5, 2024 · 0d3a5a5 · 0d3a5a5
1 parent a9f5928
commit 0d3a5a5
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/cmd/serverless-init/cloudservice/containerapp.go b/cmd/serverless-init/cloudservice/containerapp.go
@@ -39,6 +39,9 @@ const (
 	acaReplicaName    = "aca.replica.name"
 	acaResourceID     = "aca.resource.id"
 	acaResourceGroup  = "aca.resource.group"
+	acaAppName        = "aca.app.name"
+	acaRegion         = "aca.app.region"
+	acaRevision       = "aca.app.revision"
 	acaSubscriptionID = "aca.subscription.id"
 )
 
@@ -61,9 +64,14 @@ func (c *ContainerApp) GetTags() map[string]string {
 		"region":       region,
 		"revision":     revision,
 		"replica_name": replica,
+		// new tags
+		acaAppName:     appName,
+		acaRegion:      region,
+		acaRevision:    revision,
 		acaReplicaName: replica,
-		"origin":       c.GetOrigin(),
-		"_dd.origin":   c.GetOrigin(),
+
+		"origin":     c.GetOrigin(),
+		"_dd.origin": c.GetOrigin(),
 	}
 
 	if c.SubscriptionId != "" {

diff --git a/cmd/serverless-init/cloudservice/containerapp_test.go b/cmd/serverless-init/cloudservice/containerapp_test.go
@@ -34,6 +34,9 @@ func TestGetContainerAppTags(t *testing.T) {
 		"replica_name":     "test--6nyz8z7-b845f7667-m7hlv",
 		"_dd.origin":       "containerapp",
 		"aca.replica.name": "test--6nyz8z7-b845f7667-m7hlv",
+		"aca.app.name":     "test_app_name",
+		"aca.app.region":   "eastus",
+		"aca.app.revision": "test_revision",
 	}, tags)
 }
 
@@ -63,6 +66,9 @@ func TestGetContainerAppTagsWithOptionalEnvVars(t *testing.T) {
 		"subscription_id":     "test_subscription_id",
 		"resource_id":         "/subscriptions/test_subscription_id/resourcegroups/test_resource_group/providers/microsoft.app/containerapps/test_app_name",
 		"resource_group":      "test_resource_group",
+		"aca.app.name":        "test_app_name",
+		"aca.app.region":      "eastus",
+		"aca.app.revision":    "test_revision",
 		"aca.replica.name":    "test--6nyz8z7-b845f7667-m7hlv",
 		"aca.resource.id":     "/subscriptions/test_subscription_id/resourcegroups/test_resource_group/providers/microsoft.app/containerapps/test_app_name",
 		"aca.resource.group":  "test_resource_group",