Add resource metric integration test

test/e2e/jmx/jmx_test.go

@@ -25,7 +25,7 @@ import (
 //------------------------------------------------------------------------------
 
 var (
-	env       *environment.MetaData
+	env *environment.MetaData
 )
 
 //------------------------------------------------------------------------------

test/entity/entity_test.go

@@ -4,8 +4,10 @@
 package entity
 
 import (
+	"encoding/json"
 	"fmt"
 	"log"
+	"net/http"
 	"path/filepath"
 	"strings"
 	"testing"
@@ -16,10 +18,12 @@ import (
 
 	"github.com/aws/amazon-cloudwatch-agent-test/environment"
 	"github.com/aws/amazon-cloudwatch-agent-test/util/awsservice"
+	"github.com/aws/amazon-cloudwatch-agent-test/util/common"
 )
 
 const (
 	sleepForFlush = 240 * time.Second
+	region        = "us-west-2"
 
 	entityType        = "@entity.KeyAttributes.Type"
 	entityName        = "@entity.KeyAttributes.Name"
@@ -237,6 +241,62 @@ func TestPutLogEventEntityEKS(t *testing.T) {
 	}
 }
 
+func TestResourceMetrics(t *testing.T) {
+	instanceId := awsservice.GetInstanceId()
+	configPath := "resources/config_metrics_resource.json"
+
+	// start agent and write metrics
+	common.StartAgent(configPath, true, false)
+	time.Sleep(sleepForFlush)
+	common.StopAgent()
+
+	// build ListEntitiesForMetric request:
+	requestBody := []byte(fmt.Sprintf(`{
+		"Namespace": "CWAgent",
+		"MetricName": "cpu_usage_idle",
+		"Dimensions": [
+			{"Name": "InstanceId", "Value": "%s"},
+			{"Name": "cpu", "Value": "cpu-total"}
+		]
+	}`, instanceId))
+	req, err := common.BuildListEntitiesForMetricRequest(requestBody, region)
+	assert.NoError(t, err, "Error building ListEntitiesForMetric request")
+
+	// send the request
+	client := &http.Client{}
+	resp, err := client.Do(req)
+	assert.NoError(t, err, "Error sending the request")
+	defer resp.Body.Close()
+
+	// parse and verify the response
+	var response struct {
+		Entities []struct {
+			KeyAttributes struct {
+				Type         string `json:"Type"`
+				ResourceType string `json:"ResourceType"`
+				Identifier   string `json:"Identifier"`
+			} `json:"KeyAttributes"`
+		} `json:"Entities"`
+	}
+
+	err = json.NewDecoder(resp.Body).Decode(&response)
+	assert.NoError(t, err, "Error parsing JSON response")
+
+	// Verify the KeyAttributes
+	expectedEntity := expectedEntity{
+		entityType:   "AWS::Resource",
+		platformType: "AWS::EC2::Instance",
+		instanceId:   instanceId,
+	}
+	assert.NotEmpty(t, response.Entities, "No entities found in the response")
+
+	entity := response.Entities[0]
+	validator := NewEntityValidator("EC2", expectedEntity)
+	validator.ValidateField(entityType, entity.KeyAttributes.Type, t)
+	validator.ValidateField(entityPlatform, entity.KeyAttributes.ResourceType, t)
+	validator.ValidateField(entityInstanceId, entity.KeyAttributes.Identifier, t)
+}
+
 // ValidateLogEntity performs the entity validation for PutLogEvents.
 func ValidateLogEntity(t *testing.T, logGroup, logStream string, end *time.Time, queryString string, expectedEntity expectedEntity, entityPlatformType string) {
 	log.Printf("Checking log group/stream: %s/%s", logGroup, logStream)

test/entity/resources/config_metrics_resource.json

@@ -0,0 +1,32 @@
+{
+    "agent": {
+        "metrics_collection_interval": 10,
+        "run_as_user": "root",
+        "debug": true
+    },
+    "metrics": {
+        "metrics_collected": {
+            "cpu": {
+                "resources": [
+                    "*"
+                ],
+                "measurement": [
+                    "cpu_usage_idle",
+                    "cpu_usage_nice",
+                    "cpu_usage_guest"
+                ],
+                "metrics_collection_interval": 10
+            },
+            "memory": {
+                "metrics_collection_interval": 10,
+                "measurement": [
+                    "mem_used",
+                    "mem_free"
+                ]
+            }
+        },
+        "append_dimensions": {
+            "InstanceId": "${aws:InstanceId}"
+        }
+    }
+}

util/common/metrics.go

@@ -7,6 +7,7 @@ import (
 	"bytes"
 	"context"
 	"crypto/rand"
+	"crypto/sha256"
 	"encoding/binary"
 	"encoding/hex"
 	"errors"
@@ -23,6 +24,8 @@ import (
 	"collectd.org/exec"
 	"collectd.org/network"
 	"github.com/DataDog/datadog-go/statsd"
+	v4 "github.com/aws/aws-sdk-go-v2/aws/signer/v4"
+	"github.com/aws/aws-sdk-go-v2/config"
 	"github.com/prozz/aws-embedded-metrics-golang/emf"
 )
 
@@ -350,3 +353,56 @@ func SendEMFMetrics(metricPerInterval int, metricLogGroup, metricNamespace strin
 	}
 
 }
+
+// This function builds and signs an ListEntitiesForMetric call, essentially trying to replicate this curl command:
+//
+//	curl -i -X POST monitoring.us-west-2.amazonaws.com -H 'Content-Type: application/json' \
+//	  -H 'Content-Encoding: amz-1.0' \
+//	  --user "$AWS_ACCESS_KEY_ID:$AWS_SECRET_ACCESS_KEY" \
+//	  -H "x-amz-security-token: $AWS_SESSION_TOKEN" \
+//	  --aws-sigv4 "aws:amz:us-west-2:monitoring" \
+//	  -H 'X-Amz-Target: com.amazonaws.cloudwatch.v2013_01_16.CloudWatchVersion20130116.ListEntitiesForMetric' \
+//	  -d '{
+//		   // sample request body:
+//	    "Namespace": "CWAgent",
+//	    "MetricName": "cpu_usage_idle",
+//	    "Dimensions": [{"Name": "InstanceId", "Value": "i-0123456789012"}, { "Name": "cpu", "Value": "cpu-total"}]
+//	  }'
+func BuildListEntitiesForMetricRequest(body []byte, region string) (*http.Request, error) {
+	cfg, err := config.LoadDefaultConfig(context.TODO(), config.WithRegion(region))
+	if err != nil {
+		return nil, err
+	}
+	signer := v4.NewSigner()
+	h := sha256.New()
+
+	h.Write(body)
+	payloadHash := hex.EncodeToString(h.Sum(nil))
+
+	// build the request
+	req, err := http.NewRequest("POST", "https://monitoring."+region+".amazonaws.com/", bytes.NewReader(body))
+	if err != nil {
+		return nil, err
+	}
+
+	// set headers
+	req.Header.Set("Content-Type", "application/json")
+	req.Header.Set("X-Amz-Target", "com.amazonaws.cloudwatch.v2013_01_16.CloudWatchVersion20130116.ListEntitiesForMetric")
+	req.Header.Set("Content-Encoding", "amz-1.0")
+
+	// set creds
+	credentials, err := cfg.Credentials.Retrieve(context.TODO())
+	if err != nil {
+		return nil, err
+	}
+
+	req.Header.Set("x-amz-security-token", credentials.SessionToken)
+
+	// sign the request
+	err = signer.SignHTTP(context.TODO(), credentials, req, payloadHash, "monitoring", region, time.Now())
+	if err != nil {
+		return nil, err
+	}
+
+	return req, nil
+}