Added changes to make validator work with x-ray

Author: bhautikpip

validator/src/main/java/com/amazon/aoc/fileconfigs/ExpectedTrace.java

@@ -20,8 +20,10 @@
 @Getter
 public enum ExpectedTrace implements FileConfig {
   DEFAULT_EXPECTED_TRACE("/expected-data-template/defaultExpectedTrace.mustache"),
-  AWSSDK_EXPECTED_TRACE("/expected-data-template/expectedAWSSDKTrace.mustache"),
-  HTTP_EXPECTED_TRACE("/expected-data-template/expectedHTTPTrace.mustache")
+  OTEL_SDK_AWSSDK_EXPECTED_TRACE("/expected-data-template/otelSDKexpectedAWSSDKTrace.mustache"),
+  OTEL_SDK_HTTP_EXPECTED_TRACE("/expected-data-template/otelSDKexpectedHTTPTrace.mustache"),
+  XRAY_SDK_AWSSDK_EXPECTED_TRACE("/expected-data-template/xraySDKexpectedAWSSDKTrace.mustache"),
+  XRAY_SDK_HTTP_EXPECTED_TRACE("/expected-data-template/xraySDKexpectedHTTPTrace.mustache"),
   ;
 
   private String path;

validator/src/main/java/com/amazon/aoc/helpers/RetryHelper.java

@@ -41,7 +41,7 @@ public static void retry(
         retryable.execute();
         return;
       } catch (Exception ex) {
-        log.info("retrying after 10 seconds");
+        log.info("retrying after {} seconds", TimeUnit.MILLISECONDS.toSeconds(sleepInMilliSeconds));
 
         if (retryCount == 0) {
           log.error("retries exhausted, possible exception: ", ex);

validator/src/main/resources/expected-data-template/expectedAWSSDKTrace.mustache renamed to validator/src/main/resources/expected-data-template/otelSDKexpectedAWSSDKTrace.mustache

@@ -0,0 +1,34 @@
+{
+  "name": "My Flask Web Application",
+  "in_progress": false,
+  "http": {
+    "request": {
+      "url": "{{endpoint}}/aws-sdk-call",
+      "method": "GET"
+    },
+    "response": {
+      "status": 200
+    }
+  },
+  "aws": {
+    "xray": {
+      "sampling_rule_name": "Default"
+    }
+  },
+  "subsegments": [
+    {
+      "name": "S3",
+      "in_progress": false,
+      "http": {
+        "response": {
+          "status": 200
+        }
+      },
+      "aws": {
+        "region": "{{region}}",
+        "operation": "ListBuckets"
+      },
+      "namespace": "aws"
+    }
+  ]
+}

validator/src/main/resources/expected-data-template/expectedHTTPTrace.mustache renamed to validator/src/main/resources/expected-data-template/otelSDKexpectedHTTPTrace.mustache

@@ -0,0 +1,34 @@
+{
+  "name": "My Flask Web Application",
+  "in_progress": false,
+  "http": {
+    "request": {
+      "url": "{{endpoint}}/outgoing-http-call",
+      "method": "GET"
+    },
+    "response": {
+      "status": 200
+    }
+  },
+  "aws": {
+    "xray": {
+      "sampling_rule_name": "Default"
+    }
+  },
+  "subsegments": [
+    {
+      "name": "aws.amazon.com",
+      "in_progress": false,
+      "http": {
+        "request": {
+          "url": "https://aws.amazon.com",
+          "method": "get"
+        },
+        "response": {
+          "status": 200
+        }
+      },
+      "namespace": "remote"
+    }
+  ]
+}

validator/src/main/resources/expected-data-template/xraySDKexpectedAWSSDKTrace.mustache

@@ -0,0 +1,12 @@
+-
+  validationType: "trace"
+  httpPath: "/outgoing-http-call"
+  httpMethod: "get"
+  callingType: "http"
+  expectedTraceTemplate: "OTEL_SDK_HTTP_EXPECTED_TRACE"
+-
+  validationType: "trace"
+  httpPath: "/aws-sdk-call"
+  httpMethod: "get"
+  callingType: "http"
+  expectedTraceTemplate: "OTEL_SDK_AWSSDK_EXPECTED_TRACE"

validator/src/main/resources/expected-data-template/xraySDKexpectedHTTPTrace.mustache

@@ -3,10 +3,10 @@
   httpPath: "/outgoing-http-call"
   httpMethod: "get"
   callingType: "http"
-  expectedTraceTemplate: "HTTP_EXPECTED_TRACE"
+  expectedTraceTemplate: "XRAY_SDK_HTTP_EXPECTED_TRACE"
 -
   validationType: "trace"
   httpPath: "/aws-sdk-call"
   httpMethod: "get"
   callingType: "http"
-  expectedTraceTemplate: "AWSSDK_EXPECTED_TRACE"
+  expectedTraceTemplate: "XRAY_SDK_AWSSDK_EXPECTED_TRACE"