Skip to content

Update clean-up for e2e-k8s to delete the helm-charts repo #50

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

Closed
wants to merge 2 commits into from

Conversation

harrryr
Copy link
Contributor

@harrryr harrryr commented Apr 25, 2024

Issue #, if available:
The K8s tests are failing due to remaining folder from previous runs after changes were made in this PR.

Description of changes:
Delete the helm-charts repo during cleanup

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

@harrryr harrryr changed the title Fix e2e k8s Update clean-up for e2e-k8s to delete the helm-charts repo Apr 25, 2024
@harrryr harrryr closed this Apr 25, 2024
@harrryr
Copy link
Contributor Author

harrryr commented Apr 25, 2024

Closed since there is a duplicate PR

@harrryr harrryr deleted the fix-e2e-k8s branch April 25, 2024 00:08
georgeboc pushed a commit to georgeboc/aws-application-signals-test-framework that referenced this pull request Jul 8, 2024
…bility#50)

Description of changes:
When `"db.operation"` is not provided in span attributes, the
`"aws.remote.operation"` will be `UnknowRemoteOperation`.
This PR updated the `_set_remote_service_and_operation` function to
parsing the `"db.statement"` attribute when `"db.operation"` is missing,
and extract the valid `"aws.remote.operation"` (We setup a set of valid
database related `"aws.remote.operation"` for security concern):
1. Add a json file `configuration/dialect_keywords.json` saving all the
valid keywords. In this file, the sequence of key words matter -> The
keyword with longer word length are placed towards the front of the list
so it will be matched first.
2. We retrieve the first 27 characters from `"db.statement"` to avoid
the case where very large statements, and use regular expression to
match the keyword, it will match the beginning of the string. If the
string's start does not conform to the regular expression, the match
fails.
3. Add unit test for _set_remote_service_and_operation performance where
tested _DB_STATEMENT is/is not present and is/is not valid.
4. Add unit test covering different `"db.statement"` cases:
a. Only 1 valid keywords match
b. More than 1 valid keywords match, we want to pick the longest match
c. More than 1 valid keywords match, but the other keywords is not at
the start of the SpanAttributes.DB_STATEMENT. We want to only pick start
match
d. No valid match
e. Have valid but it is not at the start of SpanAttributes.DB_STATEMENT
f. Have valid keywords, match the longest word
g. Have valid keywords, match with first word
h.Have valid keywords, match with upper case
5.Add unit test for testing keywords sequence in json file:
a.Confirm the keywords are sorted based on descending order of keywords
character length
b.Confirm maximum length of keywords is not longer than
MAX_KEYWORD_LENGTH
6. exclude `configuration/dialect_keywords.json` from codespell check
because the Keywords are fixed for the query, and codespell does not
recognize the comments in json.

Testing
Tested by deploying the code changes to EKS and nodes, where we can see
the actual operation instead of `UnknowRemoteOperation`:

![Screenshot 2024-02-13 at 6 21
34 PM](https://github.com/aws-observability/aws-otel-python-instrumentation/assets/146124015/cd4cb2d5-f069-45c9-8487-45a709ef6e5a)


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.

1 participant