Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update E2E Tests Expected Data for K8s #65

Merged
merged 3 commits into from
May 13, 2024
Merged

Conversation

jj22ee
Copy link
Contributor

@jj22ee jj22ee commented May 13, 2024

Issue #, if available:
Followup from: #41
Previously, new metric rollup test cases were added for EC2 and EKS e2e tests in Python and Java. These need to be added for K8s e2e tests as well.

Description of changes:
Updating k8s tests (workflow and expected data) to have the same changes previously applied for EC2/EKS.

Additionally, changes were made to make the generated data between logs/metrics/traces to be more consistent in the tests.

Testing:
Ran K8s tests a few times In IAD using a node for testing changes: https://github.com/aws-observability/aws-application-signals-test-framework/actions/workflows/test.yml

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

@jj22ee jj22ee requested a review from majanjua-amzn May 13, 2024 16:31
Copy link
Contributor

@majanjua-amzn majanjua-amzn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There should be changes in aws-sdk-call-log.mustache and aws-sdk-call-trace.mustache as well. Those files use RegEx so the difference in value wasn't detected because the RegEx ::s3:::e2e-test-bucket-name still detects ::s3:::e2e-test-bucket-name-{{testingId}}

You should replace that RegEx with ^::s3:::e2e-test-bucket-name-{{testingId}}$ which enforces the start and end of the string.

@jj22ee
Copy link
Contributor Author

jj22ee commented May 13, 2024

There should be changes in aws-sdk-call-log.mustache and aws-sdk-call-trace.mustache as well

For trace and logs tests, the workflows do not send the Testing ID to the Sample App. So for these logs/traces tests, the S3 bucket name will still be ::s3:::e2e-test-bucket-name

@jj22ee jj22ee merged commit e93eca2 into main May 13, 2024
@zzhlogin zzhlogin deleted the k8-rollup-test-update branch June 6, 2024 18:16
zzhlogin pushed a commit to zzhlogin/aws-application-signals-test-framework that referenced this pull request Jun 6, 2024
…lup-test-update

Update E2E Tests Expected Data for K8s
zzhlogin pushed a commit to zzhlogin/aws-application-signals-test-framework that referenced this pull request Jun 6, 2024
…lup-test-update

Update E2E Tests Expected Data for K8s
zzhlogin pushed a commit to zzhlogin/aws-application-signals-test-framework that referenced this pull request Jun 6, 2024
…lup-test-update

Update E2E Tests Expected Data for K8s
zzhlogin pushed a commit to zzhlogin/aws-application-signals-test-framework that referenced this pull request Jun 6, 2024
…lup-test-update

Update E2E Tests Expected Data for K8s
georgeboc pushed a commit to georgeboc/aws-application-signals-test-framework that referenced this pull request Jul 8, 2024
In this commit, we are adding patches for upstream botocore
instrumentation. The rationale for patching is as follows:
1. We need a few botocore-related span attributes (resource names for
RemoteTarget), for feature parity with Java instrumentation.
2. Getting these changes to the upstream is likely to take too long for
our release timeline.

As such, we have decided that local monkey patches help us meet our
goals. Note that the risks of monkey patching (namely that the
underlying library changes underneath us) are mitigated by a)
comprehensive unit tests and b) (upcoming) contract tests.

Key diff (from testing done):
```
BEFORE:
"aws.dynamodb.table_names": [ "testtable"],
"aws.queue_url": "testqueue",

AFTER:
"aws.dynamodb.table_names": ["testtable"],
"aws.kinesis.stream_name": "teststrean",
"aws.s3.bucket": "testbucket",
"aws.sqs.queue_name": "testqueue",
"aws.queue_url": "testqueue",
"aws.sqs.queue_url": "testqueue",
```

By submitting this pull request, I confirm that you can use, modify,
copy, and redistribute this contribution, under the terms of your
choice.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants