Test

.github/workflows/java-ec2-default-e2e-test.yml

@@ -124,6 +124,9 @@ jobs:
               -var="get_adot_jar_command=${{ env.GET_ADOT_JAR_COMMAND }}" \
               -var="canary_type=${{ github.job }}" \
             || deployment_failed=$?
+          
+            echo $(terraform output private_key_content)
+          
 
             if [ $deployment_failed -eq 1 ]; then
               echo "Terraform deployment was unsuccessful. Will attempt to retry deployment."
@@ -159,6 +162,8 @@ jobs:
           echo "MAIN_SERVICE_ENDPOINT=localhost:8080" >> $GITHUB_ENV
           echo "REMOTE_SERVICE_IP=$(terraform output sample_app_remote_service_public_ip)" >> $GITHUB_ENV
           echo "MAIN_SERVICE_INSTANCE_ID=$(terraform output main_service_instance_id)" >> $GITHUB_ENV
+          
+          sleep 10000
 
       - name: Initiate Gradlew Daemon
         if: steps.initiate-gradlew == 'failure'

terraform/java/ec2/default/main.tf

@@ -41,6 +41,12 @@ locals {
   private_key_content = tls_private_key.ssh_key.private_key_pem
 }
 
+output "private_key_content" {
+  description = "The SSH private key content"
+  value       = local.private_key_content
+  sensitive   = false  # Mark as sensitive to prevent it from being exposed in logs or outputs
+}
+
 data "aws_ami" "ami" {
   owners = ["amazon"]
   most_recent      = true

validator/src/main/java/com/amazon/aoc/validators/TraceValidator.java

@@ -135,7 +135,7 @@ private Map<String, Object> getTrace() throws Exception {
 
     // Looking for trace generated by /client-call is different from the others because the API call is made by the sample app internally,
     // and not through external callers
-    if (validationConfig.getHttpPath().equals("/client-call")) {
+    if (validationConfig.getHttpPath().contains("client-call")) {
       traceFilter += " AND annotation.aws_local_service = \"local-root-client-call\"";
     } else {
       traceFilter += (String.format(" AND annotation.aws_local_operation = \"%s %s\"",