New workflow (#8)

* fixed sendItem nil map error

* added concurreny retrying

* fixed no value bug

* fixed value bug

* demo-4

* demo 1

* Fix debug logging and revert Windows ctl script PS1 changes (aws#516)

* change to use fmt

* Revert "Using cmd/c to avoid PowerShell ISE does not accept stderr (aws#473)"

This reverts commit 89d1912.

* remove log entirely

* update release notes

* Performance Benchmarking Log monitor and TPS tests (aws#513)

* added concurrent log monitoring/writing to test and tests several combinations of # of logs monitored and different tps

* fixed call to StartLogWrite

* restructured json packet to send to database. CWA configs are now generated at runtime. log number is given as an environment variable so tests can run concurrently, so commented code is included for that change

* rewrote how databse entry packets are crafted/create, defer log stream/group deletions, addressed other small pr comments

* removed extra metrics from CWA config

* separated delete log group and streams so they can be called separately, but kept the original function definition as to not break other code. removed bad calls to DeleteLogGroupAndStreams

* testing with _GAVIN'S_ code

* debug print check

* changed parser

* testing with concurrency version

* changeg setenv to string

* added comments

Co-authored-by: Andrew Huynh <17056456+SaxyPandaBear@users.noreply.github.com>
Co-authored-by: gmealy1 <107051245+gmealy1@users.noreply.github.com>

.github/workflows/fastPeformanceTest.yml

@@ -19,7 +19,7 @@ env:
 on:
   push:
     branches:
-      - workflow
+      - newWorkflow
       - master
 
   workflow_dispatch:

.github/workflows/integrationTest.yml

@@ -19,6 +19,7 @@ env:
 on:
   push:
     branches:
+      - workflow
 
 
   workflow_dispatch:

RELEASE_NOTES

@@ -4,6 +4,7 @@ Amazon CloudWatch Agent 1.247354.0 (2022-07-14)
 
 Enhancements:
 * Increase PutMetricData request size allowed in agent
+* Fix Windows ctl issues on Windows 2012R2
 
 ========================================================================
 Amazon CloudWatch Agent 1.247353.0 (2022-06-13)

cmd/config-downloader/downloader.go

@@ -150,7 +150,7 @@ func main() {
 	region = util.DetectRegion(mode, cc.CredentialsMap())
 
 	if region == "" && downloadLocation != locationDefault {
-		log.Println("E! Unable to determine aws-region.")
+		fmt.Println("Unable to determine aws-region.")
 		if mode == config.ModeEC2 {
 			errorMessage = fmt.Sprintf("E! Please check if you can access the metadata service. For example, on linux, run 'wget -q -O - http://169.254.169.254/latest/meta-data/instance-id && echo' ")
 		} else {

integration/test/cwl_util.go

@@ -79,6 +79,12 @@ func ValidateLogs(t *testing.T, logGroup, logStream string, numExpectedLogs int,
 // DeleteLogGroupAndStream cleans up a log group and stream by name. This gracefully handles
 // ResourceNotFoundException errors from calling the APIs
 func DeleteLogGroupAndStream(logGroupName, logStreamName string) {
+	DeleteLogStream(logGroupName, logStreamName)
+	DeleteLogGroup(logGroupName)
+}
+
+// DeleteLogStream cleans up log stream by name
+func DeleteLogStream(logGroupName, logStreamName string) {
 	cwlClient, clientContext, err := getCloudWatchLogsClient()
 	if err != nil {
 		log.Printf("Error occurred while creating CloudWatch Logs SDK client: %v", err)
@@ -96,6 +102,19 @@ func DeleteLogGroupAndStream(logGroupName, logStreamName string) {
 	if err != nil && !errors.As(err, &rnf) {
 		log.Printf("Error occurred while deleting log stream %s: %v", logStreamName, err)
 	}
+}
+
+// DeleteLogGroup cleans up log group by name
+func DeleteLogGroup(logGroupName string) {
+	cwlClient, clientContext, err := getCloudWatchLogsClient()
+	if err != nil {
+		log.Printf("Error occurred while creating CloudWatch Logs SDK client: %v", err)
+		return // terminate gracefully so this alone doesn't cause integration test failures
+	}
+
+	// catch ResourceNotFoundException when deleting the log group and log stream, as these
+	// are not useful exceptions to log errors on during cleanup
+	var rnf *types.ResourceNotFoundException
 
 	_, err = cwlClient.DeleteLogGroup(*clientContext, &cloudwatchlogs.DeleteLogGroupInput{
 		LogGroupName: aws.String(logGroupName),

integration/test/performancetest/demo.txt

@@ -1 +1 @@
-commitCount=5
+commitCount=1

integration/test/performancetest/performance_query_utils.go

@@ -1,32 +1,55 @@
 package performancetest
 
 import (
-	"time"
-	"errors"
 	"context"
 	"encoding/json"
-	"os"
+	"errors"
 	"fmt"
-
+	"os"
+	"strconv"
+	"time"
+	"sort"
+	"math"
+	"log"
+
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/config"
 	"github.com/aws/aws-sdk-go-v2/service/cloudwatch"
 	"github.com/aws/aws-sdk-go-v2/service/cloudwatch/types"
+
+	"github.com/google/uuid"
 )
 
 const (
 	Namespace = "CWAgent"
 	DimensionName = "InstanceId"
 	Stat = "Average"
 	Period = 10
-	// configPath = "./resources/config.json"
+	METRIC_PERIOD = 5 * 60 // this const is in seconds , 5 mins
+	PARTITION_KEY ="Year"
+	HASH = "Hash"
+	COMMIT_DATE= "CommitDate"
+	TEST_HASH ="TestHash"
+	SHA_ENV  = "SHA"
+	SHA_DATE_ENV = "SHA_DATE"
 )
 
+//struct that holds statistics on the returned data
+type Stats struct {
+	Average float64
+	P99     float64 //99% percent process
+	Max     float64
+	Min     float64
+	Period  int //in seconds
+	Std 	float64
+	Data    []float64
+}
+
 /*
  * GetConfigMetrics parses the cloudwatch agent config and returns the associated 
  * metrics that the cloudwatch agent is measuring on itself
 */ 
-func GetConfigMetrics() ([]string, []string, error) {
+func GetConfigMetrics(configPath string) ([]string, []string, error) {
 	//get metric measurements from config file
 	file, err := os.ReadFile(configPath)
 	if err != nil {
@@ -120,7 +143,7 @@ func ConstructMetricDataQuery(id, namespace, dimensionName, dimensionValue, metr
 	return query
 }
 
-func GetPerformanceMetrics(instanceId string, agentRuntime int, agentContext context.Context) ([]byte, error) {
+func GetPerformanceMetrics(instanceId string, agentRuntime, logNum, tps int, agentContext context.Context, configPath string) (map[string]interface{}, error) {
 
 	//load default configuration
 	cfg, err := config.LoadDefaultConfig(agentContext)
@@ -131,7 +154,7 @@ func GetPerformanceMetrics(instanceId string, agentRuntime int, agentContext con
 	client := cloudwatch.NewFromConfig(cfg)
 
 	//fetch names of metrics to request and generate corresponding ids
-	metricNames, ids, err := GetConfigMetrics()
+	metricNames, ids, err := GetConfigMetrics(configPath)
 	if err != nil {
 		return nil, err
 	}
@@ -147,12 +170,78 @@ func GetPerformanceMetrics(instanceId string, agentRuntime int, agentContext con
 	if err != nil {
 		return nil, err
 	}
+
+	log.Println("Data successfully received from CloudWatch API")
+
+	//craft packet to be sent to database
+	packet := make(map[string]interface{})
+	//add information about current release/commit
+	packet[PARTITION_KEY] = time.Now().Year()
+	packet[HASH] = os.Getenv(SHA_ENV) //fmt.Sprintf("%d", time.Now().UnixNano())
+	packet[COMMIT_DATE],_ = strconv.Atoi(os.Getenv(SHA_DATE_ENV))
+	packet["isRelease"] = false
+	//add test metadata
+	packet[TEST_HASH] = uuid.New().String()
+	testSettings := fmt.Sprintf("%d-%d",logNum,tps)
+	testMetricResults := make(map[string]Stats)
+
 
-	//format data to json before passing output
-	outputData, err := json.MarshalIndent(metrics.MetricDataResults, "", "  ")
-	if err != nil {
-		return nil, err
-    }
+	//add actual test data with statistics
+	for _, result := range metrics.MetricDataResults {
+		stats:= CalcStats(result.Values)
+		testMetricResults[*result.Label] = stats
+	}
+	packet["Results"] = map[string]map[string]Stats{ testSettings: testMetricResults}
+	return packet, nil
+}
+
+/* CalcStats takes in an array of data and returns the average, min, max, p99, and stdev of the data in a Stats struct
+* statistics are calculated this way instead of using GetMetricStatistics API because GetMetricStatistics would require multiple
+* API calls as only one metric can be requested/processed at a time whereas all metrics can be requested in one GetMetricData request.
+*/
+func CalcStats(data []float64) Stats {
+	length := len(data)
+	if length == 0 {
+		return Stats{}
+	}
+
+	//make a copy so we aren't modifying original - keeps original data in order of the time 
+	dataCopy := make([]float64, length)
+	copy(dataCopy, data)
+	sort.Float64s(dataCopy)
+
+	min := dataCopy[0]
+	max := dataCopy[length - 1]
+
+	sum := 0.0
+	for _, value := range dataCopy {
+		sum += value
+	}
+
+	avg := sum / float64(length)
 
-	return outputData, nil
-}
+	if length < 99 {
+		log.Println("Note: less than 99 values given, p99 value will be equal the max value")
+	}
+	p99Index := int(float64(length) * .99) - 1
+	p99Val := dataCopy[p99Index]
+
+	stdDevSum := 0.0
+	for _, value := range dataCopy {
+		stdDevSum += math.Pow(avg - value, 2)
+	}
+
+	stdDev := math.Sqrt(stdDevSum / float64(length))
+
+	statistics := Stats{
+		Average: avg,
+		Max:     max,
+		Min:     min,
+		P99:     p99Val,
+		Std:     stdDev,
+		Period:  int(METRIC_PERIOD / float64(length)),
+		Data:    data,
+	}
+
+	return statistics
+}