Update timestamp in JSON Spec for edge-case (elastic#77)

Also brings back logging in case we missed other issues.
ruflin · Aug 21, 2017 · 449df0f · 449df0f
1 parent cd5a0e4
commit 449df0f
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 6 deletions.
diff --git a/docs/spec/errors/error.json b/docs/spec/errors/error.json
@@ -98,7 +98,7 @@
         "timestamp": {
             "type": "string",
             "description": "Recorded time of the error, UTC based and formatted as YYYY-MM-DDTHH:mm:ss.sssZ",
-            "pattern": "^(\\d{4})-(\\d{2})-(\\d{2})T(\\d{2}):(\\d{2}):(\\d{2})(\\.\\d{1,6})?Z"
+            "pattern": "^(\\d{4})-(\\d{2})-(\\d{2})T(\\d{2}):(\\d{2}):(\\d{2})(\\.\\d{1,6})?Z$"
         }
     },
     "required": ["timestamp"],

diff --git a/docs/spec/transactions/transaction.json b/docs/spec/transactions/transaction.json
@@ -29,7 +29,7 @@
         "timestamp": {
             "type": "string",
             "description": "Recorded time of the transaction, UTC based and formatted as YYYY-MM-DDTHH:mm:ss.sssZ",
-            "pattern": "^(\\d{4})-(\\d{2})-(\\d{2})T(\\d{2}):(\\d{2}):(\\d{2})(\\.\\d{1,6})?Z"
+            "pattern": "^(\\d{4})-(\\d{2})-(\\d{2})T(\\d{2}):(\\d{2}):(\\d{2})(\\.\\d{1,6})?Z$"
         },
         "traces": {
             "type": ["array", "null"],

diff --git a/processor/error/schema.go b/processor/error/schema.go
@@ -476,7 +476,7 @@ var errorSchema = `{
         "timestamp": {
             "type": "string",
             "description": "Recorded time of the error, UTC based and formatted as YYYY-MM-DDTHH:mm:ss.sssZ",
-            "pattern": "^(\\d{4})-(\\d{2})-(\\d{2})T(\\d{2}):(\\d{2}):(\\d{2})(\\.\\d{1,6})?Z"
+            "pattern": "^(\\d{4})-(\\d{2})-(\\d{2})T(\\d{2}):(\\d{2}):(\\d{2})(\\.\\d{1,6})?Z$"
         }
     },
     "required": ["timestamp"],

diff --git a/processor/processor.go b/processor/processor.go
@@ -3,6 +3,8 @@ package processor
 import (
 	"io"
 
+	"github.com/elastic/beats/libbeat/logp"
+
 	m "github.com/elastic/apm-server/processor/model"
 	"github.com/elastic/apm-server/utility"
 	"github.com/elastic/beats/libbeat/beat"
@@ -29,8 +31,10 @@ func CreateDoc(strTime string, docMappings []m.DocMapping) beat.Event {
 		}
 	}
 
-	// This assumes JSON Spec has already validated the timestamp to be the correct format.
-	timestamp, _ := utility.ParseTime(strTime)
+	timestamp, err := utility.ParseTime(strTime)
+	if err != nil {
+		logp.Err("Unable to parse timestamp %s: %s", strTime, err)
+	}
 
 	return beat.Event{
 		Fields:    doc,

diff --git a/processor/transaction/schema.go b/processor/transaction/schema.go
@@ -324,7 +324,7 @@ var transactionSchema = `{
         "timestamp": {
             "type": "string",
             "description": "Recorded time of the transaction, UTC based and formatted as YYYY-MM-DDTHH:mm:ss.sssZ",
-            "pattern": "^(\\d{4})-(\\d{2})-(\\d{2})T(\\d{2}):(\\d{2}):(\\d{2})(\\.\\d{1,6})?Z"
+            "pattern": "^(\\d{4})-(\\d{2})-(\\d{2})T(\\d{2}):(\\d{2}):(\\d{2})(\\.\\d{1,6})?Z$"
         },
         "traces": {
             "type": ["array", "null"],

diff --git a/tests/data/invalid/error/invalid_timestamp5.json b/tests/data/invalid/error/invalid_timestamp5.json
@@ -0,0 +1,7 @@
+{
+  "id": "85915e55-b43f-4340-a8e0-df1906ecbfa9",
+  "timestamp": "2017-05-30T18:53:27ZNOTCORRECT",
+  "exception": {
+      "message": ""
+  }
+}
diff --git a/tests/data/invalid/transaction/invalid_timestamp5.json b/tests/data/invalid/transaction/invalid_timestamp5.json
@@ -0,0 +1,8 @@
+{
+  "id": "85915e55-b43f-4340-a8e0-df1906ecbfa9",
+  "name": "GET /api/types",
+  "type": "request",
+  "duration": 2.0,
+  "timestamp": "2017-05-30T18:53:27ZNOTCORRECT",
+  "traces": []
+}
diff --git a/tests/json_schema_test.go b/tests/json_schema_test.go
@@ -102,6 +102,7 @@ func TestTransactionSchema(t *testing.T) {
 		{File: "invalid_timestamp2.json", Error: "[#/properties/timestamp/pattern] does not match pattern"},
 		{File: "invalid_timestamp3.json", Error: "[#/properties/timestamp/pattern] does not match pattern"},
 		{File: "invalid_timestamp4.json", Error: "[#/properties/timestamp/pattern] does not match pattern"},
+		{File: "invalid_timestamp5.json", Error: "[#/properties/timestamp/pattern] does not match pattern"},
 	}
 	testDataAgainstSchema(t, testData, "transactions/transaction", "transaction", `"$ref": "../docs/spec/transactions/`)
 }
@@ -121,6 +122,7 @@ func TestErrorSchema(t *testing.T) {
 		{File: "invalid_timestamp2.json", Error: "[#/properties/timestamp/pattern] does not match pattern"},
 		{File: "invalid_timestamp3.json", Error: "[#/properties/timestamp/pattern] does not match pattern"},
 		{File: "invalid_timestamp4.json", Error: "[#/properties/timestamp/pattern] does not match pattern"},
+		{File: "invalid_timestamp5.json", Error: "[#/properties/timestamp/pattern] does not match pattern"},
 		{File: "no_log_message.json", Error: "missing properties: \"message\""},
 		{File: "no_exception_message.json", Error: "missing properties: \"message\""},
 		{File: "no_log_or_exception.json", Error: "missing properties: \"exception\""},