fix ecs otlp test

Author: Paamicky

generator/test_case_generator.go

@@ -381,7 +381,7 @@ var testTypeToTestConfig = map[string][]testConfig{
 			targets: map[string]map[string]struct{}{"metadataEnabled": {"enabled": {}}},
 		},
 		{
-			testDir: "./test/otel_collect/ecs/host_metrics",
+			testDir: "./test/otel_collect/ecs/otlp",
 			targets: map[string]map[string]struct{}{"metadataEnabled": {"enabled": {}}},
 		},
 	},

test/otel_collect/ecs/host_metrics/host_metrics_ecs_test.go

@@ -0,0 +1,58 @@
+[
+  {
+    "name": "cloudwatch_agent",
+    "image": "${cwagent_image}",
+    "essential": true,
+    "secrets": [
+      {
+        "name": "CW_CONFIG_CONTENT",
+        "valueFrom": "${cwagent_ssm_parameter_arn}"
+      },
+      {
+        "name": "PROMETHEUS_CONFIG_CONTENT",
+        "valueFrom": "${prometheus_ssm_parameter_arn}"
+      }
+    ],
+    "logConfiguration": {
+      "logDriver": "awslogs",
+      "options": {
+        "awslogs-region": "${region}",
+        "awslogs-stream-prefix": "${testing_id}",
+        "awslogs-group": "${log_group}"
+      }
+    },
+    "cpu": 1,
+    "memory": 1792
+  },
+  {
+    "name": "otlp_pusher",
+    "image": "curlimages/curl:8.10.1",
+    "essential": false,
+    "links": [
+      "cloudwatch_agent"
+    ],
+    "environment": [
+      {
+        "name": "TEST_ID",
+        "value": "${testing_id}"
+      }
+    ],
+    "entryPoint": [
+      "sh",
+      "-c"
+    ],
+    "command": [
+      "while true; do S=$$(date +%s); NOW=$${S}000000000; START=$$(expr $${S} - 10)000000000; printf '{\"resourceMetrics\":[{\"resource\":{\"attributes\":[{\"key\":\"TestId\",\"value\":{\"stringValue\":\"%s\"}}]},\"scopeMetrics\":[{\"metrics\":[{\"name\":\"otlp_test_counter\",\"sum\":{\"dataPoints\":[{\"asInt\":\"1\",\"startTimeUnixNano\":\"%s\",\"timeUnixNano\":\"%s\",\"attributes\":[{\"key\":\"TestId\",\"value\":{\"stringValue\":\"%s\"}}]}],\"aggregationTemporality\":1,\"isMonotonic\":true}},{\"name\":\"otlp_test_gauge\",\"gauge\":{\"dataPoints\":[{\"asDouble\":42.0,\"timeUnixNano\":\"%s\",\"attributes\":[{\"key\":\"TestId\",\"value\":{\"stringValue\":\"%s\"}}]}]}}]}]}]}' \"$${TEST_ID}\" \"$${START}\" \"$${NOW}\" \"$${TEST_ID}\" \"$${NOW}\" \"$${TEST_ID}\" > /tmp/p.json; curl -s -X POST http://cloudwatch_agent:4318/v1/metrics -H 'Content-Type: application/json' -d @/tmp/p.json; sleep 10; done"
+    ],
+    "logConfiguration": {
+      "logDriver": "awslogs",
+      "options": {
+        "awslogs-region": "${region}",
+        "awslogs-stream-prefix": "${testing_id}-pusher",
+        "awslogs-group": "${log_group}"
+      }
+    },
+    "cpu": 1,
+    "memory": 256
+  }
+]

test/otel_collect/ecs/otlp/ecs_resources/ec2_launch/daemon/ecs_taskdef.tpl

@@ -0,0 +1,87 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: MIT
+
+//go:build !windows
+
+package otlp
+
+import (
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/suite"
+
+	"github.com/aws/amazon-cloudwatch-agent-test/environment"
+	"github.com/aws/amazon-cloudwatch-agent-test/test/otel_collect/otlpvalidation"
+	"github.com/aws/amazon-cloudwatch-agent-test/test/status"
+	"github.com/aws/amazon-cloudwatch-agent-test/test/test_runner"
+)
+
+func init() {
+	environment.RegisterEnvironmentMetaDataFlags()
+}
+
+// clusterNamePrefix matches the ECS cluster naming in terraform/ecs_ec2/daemon.
+const clusterNamePrefix = "cwagent-integ-test-cluster-"
+
+// ECSOtlpTestRunner validates that a workload (sidecar) running on the ECS daemon
+// can publish OTLP metrics to the agent's OTLP receiver and have them reach CloudWatch.
+type ECSOtlpTestRunner struct {
+	test_runner.BaseTestRunner
+}
+
+var _ test_runner.ITestRunner = (*ECSOtlpTestRunner)(nil)
+
+func (t *ECSOtlpTestRunner) GetTestName() string { return "ecs_otlp" }
+
+// GetAgentConfigFileName returns "" — config is pre-loaded by Terraform via SSM, no restart needed.
+func (t *ECSOtlpTestRunner) GetAgentConfigFileName() string { return "" }
+
+func (t *ECSOtlpTestRunner) GetMeasuredMetrics() []string {
+	return []string{"otlp_test_counter", "otlp_test_gauge"}
+}
+
+func (t *ECSOtlpTestRunner) Validate() status.TestGroupResult {
+	env := environment.GetEnvironmentMetaData()
+	// Give the sidecar time to push and the agent to export before querying.
+	time.Sleep(3 * time.Minute)
+	// Isolate by the per-run testing_id, which the sidecar stamps as the TestId
+	// attribute and is embedded in the ECS cluster ARN.
+	labels := map[string]string{
+		"TestId": testIDFromClusterArn(env.EcsClusterArn),
+	}
+	return otlpvalidation.ValidateOtlpMetricsWithLabels(t.GetTestName(), env.Region, t.GetMeasuredMetrics(), labels)
+}
+
+// testIDFromClusterArn extracts the testing_id suffix from the ECS cluster ARN.
+func testIDFromClusterArn(clusterArn string) string {
+	if i := strings.LastIndex(clusterArn, clusterNamePrefix); i != -1 {
+		return clusterArn[i+len(clusterNamePrefix):]
+	}
+	return clusterArn
+}
+
+func TestECSOtlpSuite(t *testing.T) {
+	suite.Run(t, new(ECSOtlpTestSuite))
+}
+
+type ECSOtlpTestSuite struct {
+	suite.Suite
+	test_runner.TestSuite
+}
+
+func (suite *ECSOtlpTestSuite) GetSuiteName() string {
+	return "ECSOtlp"
+}
+
+func (suite *ECSOtlpTestSuite) TestAllInSuite() {
+	env := environment.GetEnvironmentMetaData()
+	ecsTestRunner := &test_runner.ECSTestRunner{
+		Runner:      &ECSOtlpTestRunner{},
+		RunStrategy: &test_runner.ECSAgentRunStrategy{},
+		Env:         *env,
+	}
+	ecsTestRunner.Run(suite, env)
+	suite.Assert().Equal(status.SUCCESSFUL, suite.Result.GetStatus(), "ECS OTLP Test Suite Failed")
+}

test/otel_collect/ecs/otlp/otlp_ecs_test.go

@@ -5,8 +5,9 @@
   "opentelemetry": {
     "cluster_name": "cwagent-ecs-integ-test",
     "collect": {
-      "host_metrics": {
-        "collection_interval": 30
+      "otlp": {
+        "grpc_endpoint": "0.0.0.0:4317",
+        "http_endpoint": "0.0.0.0:4318"
       }
     }
   }