Add resource metric integration test

test/cloudwatchlogs/publish_logs_test.go

@@ -6,15 +6,23 @@
 package cloudwatchlogs
 
 import (
+	"bytes"
+	"context"
+	"crypto/sha256"
+	"encoding/hex"
+	"encoding/json"
 	"fmt"
 	"log"
+	"net/http"
 	"os"
 	"path/filepath"
 	"strconv"
 	"strings"
 	"testing"
 	"time"
 
+	v4 "github.com/aws/aws-sdk-go-v2/aws/signer/v4"
+	"github.com/aws/aws-sdk-go-v2/config"
 	"github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs/types"
 	"github.com/stretchr/testify/assert"
 
@@ -274,6 +282,103 @@ func TestLogGroupClass(t *testing.T) {
 	}
 }
 
+func TestResourceMetrics(t *testing.T) {
+	instanceId := awsservice.GetInstanceId()
+	configPath := "resources/config_log_resource.json"
+	logFile, err := os.Create(logFilePath)
+	assert.NoError(t, err, "Error occurred creating log file for writing")
+
+	defer logFile.Close()
+	defer os.Remove(logFilePath)
+	defer awsservice.DeleteLogGroupAndStream(instanceId, instanceId)
+
+	// start agent and write metrics and logs
+	common.CopyFile(configPath, configOutputPath)
+	common.StartAgent(configOutputPath, true, false)
+	time.Sleep(2 * time.Minute)
+	writeLogLines(t, logFile, 100)
+	time.Sleep(2 * time.Minute)
+	common.StopAgent()
+
+	// this section builds, signs, and sends the request
+	cfg, err := config.LoadDefaultConfig(context.TODO(), config.WithRegion("us-west-2"))
+	assert.NoError(t, err)
+	signer := v4.NewSigner()
+
+	body := []byte(fmt.Sprintf(`{
+        "Namespace": "CWAgent",
+        "MetricName": "cpu_usage_idle",
+        "Dimensions": [
+            {"Name": "InstanceId", "Value": "%s"},
+            {"Name": "cpu", "Value": "cpu-total"}
+        ]
+    }`, instanceId))
+
+	h := sha256.New()
+	h.Write(body)
+	payloadHash := hex.EncodeToString(h.Sum(nil))
+
+	// essentially trying to convert 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 '{
+	//     "Namespace": "CWAgent",
+	//     "MetricName": "cpu_usage_idle",
+	//     "Dimensions": [{"Name": "InstanceId", "Value": "i-0123456789012"}, { "Name": "cpu", "Value": "cpu-total"}]
+	//   }'
+
+	// build the request
+	req, err := http.NewRequest("POST", "https://monitoring.us-west-2.amazonaws.com/", bytes.NewReader(body))
+	assert.NoError(t, err, "Error creating request")
+
+	// 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())
+	assert.NoError(t, err, "Error getting credentials")
+
+	req.Header.Set("x-amz-security-token", credentials.SessionToken)
+
+	// sign the request
+	err = signer.SignHTTP(context.TODO(), credentials, req, payloadHash, "monitoring", "us-west-2", time.Now())
+	assert.NoError(t, err, "Error signing the 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
+	assert.NotEmpty(t, response.Entities, "No entities found in the response")
+	entity := response.Entities[0]
+	assert.Equal(t, "AWS::Resource", entity.KeyAttributes.Type)
+	assert.Equal(t, "AWS::EC2::Instance", entity.KeyAttributes.ResourceType)
+	assert.Equal(t, instanceId, entity.KeyAttributes.Identifier)
+}
+
 func writeLogLines(t *testing.T, f *os.File, iterations int) {
 	log.Printf("Writing %d lines to %s", iterations*len(logLineIds), f.Name())
 

test/cloudwatchlogs/resources/config_log_resource.json

@@ -0,0 +1,46 @@
+{
+    "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}"
+        }
+    },
+    "logs": {
+        "logs_collected": {
+            "files": {
+                "collect_list": [
+                    {
+                        "file_path": "/tmp/cwagent_log_test.log*",
+                        "log_group_name": "{instance_id}",
+                        "log_stream_name": "{instance_id}",
+                        "timezone": "UTC"
+                    }
+                ]
+            }
+        }
+    }
+}

test/e2e/jmx/jmx_test.go

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