Expected template changes

aws-observability · Oct 26, 2023 · 4b9dccf · 4b9dccf
1 parent 56a2fc2
commit 4b9dccf
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 10 deletions.
diff --git a/validator/build.gradle b/validator/build.gradle
@@ -53,6 +53,7 @@ dependencies {
   implementation 'com.amazonaws:aws-java-sdk-xray'
   implementation 'com.amazonaws:aws-java-sdk-logs'
   implementation 'com.amazonaws:aws-java-sdk-sts'
+  implementation group: 'javax.json', name: 'javax.json-api', version: '1.0-b01'
 
   // aws ecs sdk
   implementation 'com.amazonaws:aws-java-sdk-ecs'

diff --git a/validator/src/main/java/com/amazon/aoc/helpers/RetryHelper.java b/validator/src/main/java/com/amazon/aoc/helpers/RetryHelper.java
@@ -43,6 +43,7 @@ public static boolean retry(
       } catch (Exception ex) {
         exceptionInTheEnd = ex;
         if (retryCount != 0) { // don't sleep before leave this loop
+          log.info("Error that occured:" + ex.getMessage());
           log.info(
               "retrying after {} seconds", TimeUnit.MILLISECONDS.toSeconds(sleepInMilliSeconds));
           TimeUnit.MILLISECONDS.sleep(sleepInMilliSeconds);

diff --git a/validator/src/main/java/com/amazon/aoc/validators/CWLogValidator.java b/validator/src/main/java/com/amazon/aoc/validators/CWLogValidator.java
@@ -54,14 +54,22 @@ public void init(
     //    cloudWatchService = new CloudWatchService(context.getRegion());
     MustacheHelper mustacheHelper = new MustacheHelper();
     String templateInput = mustacheHelper.render(expectedDataTemplate, context);
+    log.info("Template input: " + templateInput);
     JsonNode jsonNode = JsonLoader.fromString(templateInput);
+    log.info("Trying to get jsonNode string: " + jsonNode.textValue());
     JsonSchemaFactory jsonSchemaFactory =
         JsonSchemaFactory.newBuilder()
             .setReportProvider(new ListReportProvider(LogLevel.INFO, LogLevel.FATAL))
             .freeze();
-    JsonSchema schema = jsonSchemaFactory.getJsonSchema(jsonNode);
-    this.schema = schema;
+    JsonSchema jsonSchema = jsonSchemaFactory.getJsonSchema(jsonNode);
+    this.schema = jsonSchema;
     log.info(("CWLog init ending"));
+    Map<String, Object> mapping = new ObjectMapper().readValue(templateInput, HashMap.class);
+    //    ObjectMapper mapper = new ObjectMapper();
+    //    ObjectNode jsonObject = mapper.readValue(templateInput, ObjectNode.class);
+    //    Map<String, Object> result =
+    //        mapper.convertValue(jsonObject, new TypeReference<Map<String, Object>>() {});
+    log.info("Mapper is:" + mapping.toString());
     caller.callSampleApp();
   }
 
@@ -116,9 +124,12 @@ protected void fetchAndValidateLogs(Instant startTime) throws Exception {
               "[StructuredLogValidator] no logs found under log stream %s" + " in log group %s",
               logStreamName, logGroupName));
     }
+    log.info("Number of log events: " + logEvents.size());
     for (OutputLogEvent logEvent : logEvents) {
       log.info("Log message: " + logEvent.getMessage());
-      validateJsonSchema(logEvent.getMessage());
+      if (logEvent.getMessage().contains("Executing outgoing-http-call")) {
+        validateJsonSchema(logEvent.getMessage());
+      }
     }
   }
 

diff --git a/validator/src/main/resources/expected-data-template/otlpExpectedLog.mustache b/validator/src/main/resources/expected-data-template/otlpExpectedLog.mustache
@@ -1,14 +1,10 @@
-[
-  {
+{
     "body": "Executing outgoing-http-call",
-    "severity_number": 9,
+    "severity_number": "{{severity_number}}",
     "severity_text": "INFO",
-    "flags": 1,
     "trace_id": "{{trace_id}}",
     "span_id": "{{span_id}}",
     "resource": {
         "service.name": "{{resource.service.name}}"
     }
-
-  }
-]
+}