From 4636b6a2c85afcdb712b88c9653081319c84402c Mon Sep 17 00:00:00 2001 From: XinRan Zhang Date: Fri, 6 Sep 2024 12:51:07 -0700 Subject: [PATCH] [Dotnet] Fix AWS SDK Test Metrics for E2E (#216) *Issue description:* After change the sample app the listbucketlocation, we miss some test metric *Description of changes:* add metrics related to AWS S3 operation *Rollback procedure:* roll back Yes *Test* https://github.com/aws-observability/aws-application-signals-test-framework/actions/runs/10741939621 *Ensure you've run the following tests on your changes and include the link below:* To do so, create a `test.yml` file with `name: Test` and workflow description to test your changes, then remove the file for your PR. Link your test run in your PR description. This process is a short term solution while we work on creating a staging environment for testing. NOTE: TESTS RUNNING ON A SINGLE EKS CLUSTER CANNOT BE RUN IN PARALLEL. See the [needs](https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idneeds) keyword to run tests in succession. - Run Java EKS on `e2e-playground` in us-east-1 and eu-central-2 - Run Python EKS on `e2e-playground` in us-east-1 and eu-central-2 - Run metric limiter on EKS cluster `e2e-playground` in us-east-1 and eu-central-2 - Run EC2 tests in all regions - Run K8s on a separate K8s cluster (check IAD test account for master node endpoints; these will change as we create and destroy clusters for OS patching) By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license. --- .../ec2/asg/aws-sdk-call-metric.mustache | 146 +++++++++++++++++ .../ec2/default/aws-sdk-call-metric.mustache | 147 ++++++++++++++++++ 2 files changed, 293 insertions(+) diff --git a/validator/src/main/resources/expected-data-template/dotnet/ec2/asg/aws-sdk-call-metric.mustache b/validator/src/main/resources/expected-data-template/dotnet/ec2/asg/aws-sdk-call-metric.mustache index 15755bca3..64d0aa44e 100644 --- a/validator/src/main/resources/expected-data-template/dotnet/ec2/asg/aws-sdk-call-metric.mustache +++ b/validator/src/main/resources/expected-data-template/dotnet/ec2/asg/aws-sdk-call-metric.mustache @@ -74,6 +74,55 @@ name: RemoteService value: AWS::S3 +- + metricName: Latency + namespace: {{metricNamespace}} + dimensions: + - + name: Operation + value: GET /aws-sdk-call + - + name: Service + value: {{serviceName}} + - + name: Environment + value: ec2:{{platformInfo}} + - + name: RemoteOperation + value: GetBucketLocation + - + name: RemoteService + value: AWS::S3 + - + name: RemoteResourceIdentifier + value: {{testingId}} + - + name: RemoteResourceType + value: AWS::S3::Bucket + +- + metricName: Latency + namespace: {{metricNamespace}} + dimensions: + - + name: Service + value: {{serviceName}} + - + name: Environment + value: ec2:{{platformInfo}} + - + name: RemoteOperation + value: GetBucketLocation + - + name: RemoteService + value: AWS::S3 + - + name: RemoteResourceIdentifier + value: {{testingId}} + - + name: RemoteResourceType + value: AWS::S3::Bucket + - metricName: Error namespace: {{metricNamespace}} @@ -150,6 +199,55 @@ name: RemoteService value: AWS::S3 +- + metricName: Error + namespace: {{metricNamespace}} + dimensions: + - + name: Operation + value: GET /aws-sdk-call + - + name: Service + value: {{serviceName}} + - + name: Environment + value: ec2:{{platformInfo}} + - + name: RemoteOperation + value: GetBucketLocation + - + name: RemoteService + value: AWS::S3 + - + name: RemoteResourceIdentifier + value: {{testingId}} + - + name: RemoteResourceType + value: AWS::S3::Bucket + +- + metricName: Error + namespace: {{metricNamespace}} + dimensions: + - + name: Service + value: {{serviceName}} + - + name: Environment + value: ec2:{{platformInfo}} + - + name: RemoteOperation + value: GetBucketLocation + - + name: RemoteService + value: AWS::S3 + - + name: RemoteResourceIdentifier + value: {{testingId}} + - + name: RemoteResourceType + value: AWS::S3::Bucket + - metricName: Fault namespace: {{metricNamespace}} @@ -226,3 +324,51 @@ name: RemoteService value: AWS::S3 +- + metricName: Fault + namespace: {{metricNamespace}} + dimensions: + - + name: Operation + value: GET /aws-sdk-call + - + name: Service + value: {{serviceName}} + - + name: Environment + value: ec2:{{platformInfo}} + - + name: RemoteOperation + value: GetBucketLocation + - + name: RemoteService + value: AWS::S3 + - + name: RemoteResourceIdentifier + value: {{testingId}} + - + name: RemoteResourceType + value: AWS::S3::Bucket + +- + metricName: Fault + namespace: {{metricNamespace}} + dimensions: + - + name: Service + value: {{serviceName}} + - + name: Environment + value: ec2:{{platformInfo}} + - + name: RemoteOperation + value: GetBucketLocation + - + name: RemoteService + value: AWS::S3 + - + name: RemoteResourceIdentifier + value: {{testingId}} + - + name: RemoteResourceType + value: AWS::S3::Bucket \ No newline at end of file diff --git a/validator/src/main/resources/expected-data-template/dotnet/ec2/default/aws-sdk-call-metric.mustache b/validator/src/main/resources/expected-data-template/dotnet/ec2/default/aws-sdk-call-metric.mustache index eabcdd913..e5e9a531d 100644 --- a/validator/src/main/resources/expected-data-template/dotnet/ec2/default/aws-sdk-call-metric.mustache +++ b/validator/src/main/resources/expected-data-template/dotnet/ec2/default/aws-sdk-call-metric.mustache @@ -74,6 +74,55 @@ name: RemoteService value: AWS::S3 +- + metricName: Latency + namespace: {{metricNamespace}} + dimensions: + - + name: Operation + value: GET /aws-sdk-call + - + name: Service + value: {{serviceName}} + - + name: Environment + value: ec2:default + - + name: RemoteOperation + value: GetBucketLocation + - + name: RemoteService + value: AWS::S3 + - + name: RemoteResourceIdentifier + value: {{testingId}} + - + name: RemoteResourceType + value: AWS::S3::Bucket + +- + metricName: Latency + namespace: {{metricNamespace}} + dimensions: + - + name: Service + value: {{serviceName}} + - + name: Environment + value: ec2:default + - + name: RemoteOperation + value: GetBucketLocation + - + name: RemoteService + value: AWS::S3 + - + name: RemoteResourceIdentifier + value: {{testingId}} + - + name: RemoteResourceType + value: AWS::S3::Bucket + - metricName: Error namespace: {{metricNamespace}} @@ -150,6 +199,55 @@ name: RemoteService value: AWS::S3 +- + metricName: Error + namespace: {{metricNamespace}} + dimensions: + - + name: Operation + value: GET /aws-sdk-call + - + name: Service + value: {{serviceName}} + - + name: Environment + value: ec2:default + - + name: RemoteOperation + value: GetBucketLocation + - + name: RemoteService + value: AWS::S3 + - + name: RemoteResourceIdentifier + value: {{testingId}} + - + name: RemoteResourceType + value: AWS::S3::Bucket + +- + metricName: Error + namespace: {{metricNamespace}} + dimensions: + - + name: Service + value: {{serviceName}} + - + name: Environment + value: ec2:default + - + name: RemoteOperation + value: GetBucketLocation + - + name: RemoteService + value: AWS::S3 + - + name: RemoteResourceIdentifier + value: {{testingId}} + - + name: RemoteResourceType + value: AWS::S3::Bucket + - metricName: Fault namespace: {{metricNamespace}} @@ -226,3 +324,52 @@ name: RemoteService value: AWS::S3 + +- + metricName: Fault + namespace: {{metricNamespace}} + dimensions: + - + name: Operation + value: GET /aws-sdk-call + - + name: Service + value: {{serviceName}} + - + name: Environment + value: ec2:default + - + name: RemoteOperation + value: GetBucketLocation + - + name: RemoteService + value: AWS::S3 + - + name: RemoteResourceIdentifier + value: {{testingId}} + - + name: RemoteResourceType + value: AWS::S3::Bucket + +- + metricName: Fault + namespace: {{metricNamespace}} + dimensions: + - + name: Service + value: {{serviceName}} + - + name: Environment + value: ec2:default + - + name: RemoteOperation + value: GetBucketLocation + - + name: RemoteService + value: AWS::S3 + - + name: RemoteResourceIdentifier + value: {{testingId}} + - + name: RemoteResourceType + value: AWS::S3::Bucket