[v2] Require and change description for error.id (#1384)

elastic · Sep 19, 2018 · 553eb8d · 553eb8d
1 parent e30e02c
commit 553eb8d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
@@ -22,6 +22,7 @@ https://github.com/elastic/apm-server/compare/6.4\...master[View commits]
 - Rename `transaction.span_count.dropped.total` to `transaction.span_count.dropped` on Intake API v2 {pull}1351[1351]
 - Require either `message` or `type` for `error.exception` {pull}1354[1354].
 - Require `span.parent_id`, forbid `null` for `span.trace_id`, `transaction.trace_id` {pull}1391[1391]
+- Require `error.id` and changed description to 128 random bits ID {pull}1384[1384]
 
 [[release-notes-6.4]]
 == APM Server version 6.4

diff --git a/docs/spec/errors/v2_error.json b/docs/spec/errors/v2_error.json
@@ -8,8 +8,8 @@
         {  
             "properties": {
                 "id": {
-                    "type": ["string", "null"],
-                    "description": "Hex encoded 64 random bits ID of the error.",
+                    "type": ["string"],
+                    "description": "Hex encoded 128 random bits ID of the error.",
                     "maxLength": 1024
                 },
                 "trace_id": {
@@ -27,7 +27,8 @@
                     "type": ["string", "null"],
                     "maxLength": 1024
                 }
-            }
+            },
+            "required": ["id"]
         }
     ]
 }
diff --git a/model/error/generated/schema/error.go b/model/error/generated/schema/error.go
@@ -423,8 +423,8 @@ const ModelSchema = `{
         {  
             "properties": {
                 "id": {
-                    "type": ["string", "null"],
-                    "description": "Hex encoded 64 random bits ID of the error.",
+                    "type": ["string"],
+                    "description": "Hex encoded 128 random bits ID of the error.",
                     "maxLength": 1024
                 },
                 "trace_id": {
@@ -442,7 +442,8 @@ const ModelSchema = `{
                     "type": ["string", "null"],
                     "maxLength": 1024
                 }
-            }
+            },
+            "required": ["id"]
         }
     ]
 }