Skip to content

Enhance Logs E2E test and bump up MySQL library to 8.4 #221

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Sep 11, 2024
Merged

Enhance Logs E2E test and bump up MySQL library to 8.4 #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fe97861
Enhance Logs E2E test and bump up MySQL library to 8.4
ektabj Sep 6, 2024
1d5507c
Enhance Logs E2E test, bump up MySQL library to 8.4 and modified trac…
ektabj Sep 10, 2024
e44c899
Merge branch 'aws-observability:main' into main
ektabj Sep 10, 2024
7caa490
Updating trace template
ektabj Sep 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sample-apps/springboot/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ dependencies {
implementation("io.opentelemetry:opentelemetry-api:1.34.1")
implementation("software.amazon.awssdk:s3")
implementation("software.amazon.awssdk:sts")
implementation("com.mysql:mysql-connector-j:8.0.33")
implementation("com.mysql:mysql-connector-j:8.4.0")
}

jib {
Expand Down
10 changes: 8 additions & 2 deletions validator/src/main/java/com/amazon/aoc/validators/CWLogValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,11 @@ public void validate() throws Exception {
String operation = (String) expectedAttributes.get("Operation");
String remoteService = (String) expectedAttributes.get("RemoteService");
String remoteOperation = (String) expectedAttributes.get("RemoteOperation");
String remoteResourceType = (String) expectedAttributes.get("RemoteResourceType");
String remoteResourceIdentifier = (String) expectedAttributes.get("RemoteResourceIdentifier");

Map<String, Object> actualLog =
this.getActualLog(operation, remoteService, remoteOperation);
this.getActualLog(operation, remoteService, remoteOperation, remoteResourceType, remoteResourceIdentifier);
log.info("Value of an actual log: {}", actualLog);

if (actualLog == null) throw new BaseException(ExceptionCode.EXPECTED_LOG_NOT_FOUND);
Expand Down Expand Up @@ -126,7 +128,7 @@ private JsonifyArrayList<Map<String, Object>> getExpectedAttributes() throws Exc
}

private Map<String, Object> getActualLog(
String operation, String remoteService, String remoteOperation) throws Exception {
String operation, String remoteService, String remoteOperation, String remoteResourceType, String remoteResourceIdentifier) throws Exception {
String dependencyFilter = null;

// Dependency calls will have the remoteService and remoteOperation attribute, but service calls
Expand All @@ -139,6 +141,10 @@ private Map<String, Object> getActualLog(
dependencyFilter = String.format("&& ($.RemoteService = \"%s\") && ($.RemoteOperation = \"%s\")", remoteService, remoteOperation);
}

if (remoteResourceType != null && remoteResourceIdentifier != null) {
dependencyFilter += String.format(" && ($.RemoteResourceType = %%%s%%) && ($.RemoteResourceIdentifier = %%%s%%)", remoteResourceType, remoteResourceIdentifier);
}

String filterPattern = String.format("{ ($.Service = %s) && ($.Operation = \"%s\") %s }", context.getServiceName(), operation, dependencyFilter);
log.info("Filter Pattern for Log Search: " + filterPattern);

Expand Down
14 changes: 10 additions & 4 deletions validator/src/main/resources/expected-data-template/java/eks/rds-mysql-trace.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
"default": {
"EC2.AutoScalingGroup": "^eks-.+",
"EKS.Cluster": "^{{platformInfo}}$",
"K8s.Namespace": "^{{appNamespace}}",
"otel.resource.K8s.Workload": "^sample-app-deployment-{{testingId}}",
"K8s.Namespace": "^{{appNamespace}}$",
"otel.resource.K8s.Workload": "^sample-app-deployment-{{testingId}}$",
"otel.resource.K8s.Node": "^i-[A-Za-z0-9]{17}$",
"otel.resource.K8s.Pod": "^sample-app-deployment-{{testingId}}(-[A-Za-z0-9]*)*$",
"otel.resource.host.name": "^ip(-[0-9]{1,3}){4}.*$",
Expand All @@ -50,6 +50,12 @@
"aws.local.operation": "^GET /mysql$"
},
"subsegments": [
{
"name": "^mysql$",
"sql": {
"url": "^Create connection$"
}
},
{
"name": "^mysql$",
"sql": {
Expand All @@ -61,7 +67,7 @@
"aws.remote.operation": "^SELECT$",
"aws.local.operation": "^GET /mysql$",
"aws.remote.resource.type": "^DB::Connection$",
"aws.remote.resource.identifier": "{{remoteResourceIdentifier}}",
"aws.remote.resource.identifier": "^{{remoteResourceIdentifier}}$",
"aws.remote.service": "^mysql$",
"aws.local.service": "^{{serviceName}}$",
"aws.local.environment": "^eks:{{platformInfo}}/{{appNamespace}}$"
Expand All @@ -83,4 +89,4 @@
}
]
}
]
]