Update test cloudwatch json

Author: DarcyRaynerDD

aws/logs_monitoring/tests/snapshots/cloudwatch_log.json

@@ -1 +1,5 @@
-{}
+{
+ "awslogs": {
+ "data": "H4sIAAAAAAAAAHWPwQqCQBCGX0Xm7EFtK+smZBEUgXoLCdMhFtKV3akI8d0bLYmibvPPN3wz00CJxmQnTO41whwWQRIctmEcB6sQbFC3CjW3XW8kxpOpP+OC22d1Wml1qZkQGtoMsScxaczKN3plG8zlaHIta5KqWsozoTYw3/djzwhpLwivWFGHGpAFe7DL68JlBUk+l7KSN7tCOEJ4M3/qOI49vMHj+zCKdlFqLaU2ZHV2a4Ct/an0/ivdX8oYc1UVX860fQDQiMdxRQEAAA=="
+ }
+}

aws/logs_monitoring/tests/snapshots/cloudwatch_log.json~snapshot

@@ -3,7 +3,46 @@
  {
  "path": "/v1/input/abcdefghijklmnopqrstuvwxyz012345",
  "verb": "POST",
- "data": "[{\"message\": \"Error parsing the object. Exception: Event type not supported (see #Event supported section) for event {}\", \"ddsourcecategory\": \"aws\", \"aws\": {\"function_version\": \"$LATEST\", \"invoked_function_arn\": \"arn:aws:lambda:us-east-1:0:function:test\"}, \"ddtags\": \"forwardername:test,forwarder_memorysize:1536,forwarder_version:3.2.0\"}]"
+ "data": [
+ {
+ "id": "eventId1",
+ "timestamp": 1440442987000,
+ "message": "[ERROR] First test message",
+ "aws": {
+ "awslogs": {
+ "logGroup": "testLogGroup",
+ "logStream": "testLogStream",
+ "owner": "123456789123"
+ },
+ "function_version": "$LATEST",
+ "invoked_function_arn": "arn:aws:lambda:us-east-1:0:function:test"
+ },
+ "ddsourcecategory": "aws",
+ "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:3.2.0",
+ "ddsource": "cloudwatch",
+ "service": "cloudwatch",
+ "host": "testLogGroup"
+ },
+ {
+ "id": "eventId2",
+ "timestamp": 1440442987001,
+ "message": "[ERROR] Second test message",
+ "aws": {
+ "awslogs": {
+ "logGroup": "testLogGroup",
+ "logStream": "testLogStream",
+ "owner": "123456789123"
+ },
+ "function_version": "$LATEST",
+ "invoked_function_arn": "arn:aws:lambda:us-east-1:0:function:test"
+ },
+ "ddsourcecategory": "aws",
+ "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:3.2.0",
+ "ddsource": "cloudwatch",
+ "service": "cloudwatch",
+ "host": "testLogGroup"
+ }
+ ]
  }
  ]
 }

aws/logs_monitoring/tools/test_harness/recorder/recorder.py

@@ -28,6 +28,11 @@ def handle_request(self):
  data = None
  if self.headers["Content-Length"] != None:
  data = self.rfile.read(int(self.headers["Content-Length"])).decode()
+ # If the input is json, decode it and add to the event directly
+ try:
+ data = json.loads(data)
+ except:
+ pass
 
  event = {"path": self.path, "verb": self.command, "data": data}
  events.append(event)