[v2] rename "metric" entity to "metricset" (elastic#1359)

Rename json schemas as well Closes elastic#1356.
roncohen · Oct 15, 2018 · 0bc7120 · 0bc7120
1 parent 84f3fce
commit 0bc7120
Show file tree

Hide file tree

Showing 13 changed files with 14 additions and 14 deletions.
diff --git a/docs/spec/metrics/metric.json → docs/spec/metrics/metricset.json b/docs/spec/metrics/metric.json → docs/spec/metrics/metricset.json
@@ -1,6 +1,6 @@
 {
     "$schema": "http://json-schema.org/draft-04/schema#",
-    "$id": "docs/spec/metrics/metric.json",
+    "$id": "docs/spec/metrics/metricset.json",
     "type": "object",
     "description": "Metric data captured by an APM agent",
     "properties": {

diff --git a/docs/spec/metrics/payload.json b/docs/spec/metrics/payload.json
@@ -8,7 +8,7 @@
         "metrics": {
             "type": "array",
             "items": {
-                "$ref": "metric.json"
+                "$ref": "metricset.json"
             },
             "minItems": 1
         },

diff --git a/model/metric/generated/schema/metric.go → model/metric/generated/schema/metricset.go b/model/metric/generated/schema/metric.go → model/metric/generated/schema/metricset.go
@@ -19,7 +19,7 @@ package schema
 
 const ModelSchema = `{
     "$schema": "http://json-schema.org/draft-04/schema#",
-    "$id": "docs/spec/metrics/metric.json",
+    "$id": "docs/spec/metrics/metricset.json",
     "type": "object",
     "description": "Metric data captured by an APM agent",
     "properties": {

diff --git a/model/metric/generated/schema/payload.go b/model/metric/generated/schema/payload.go
@@ -28,7 +28,7 @@ const PayloadSchema = `{
             "type": "array",
             "items": {
                     "$schema": "http://json-schema.org/draft-04/schema#",
-    "$id": "docs/spec/metrics/metric.json",
+    "$id": "docs/spec/metrics/metricset.json",
     "type": "object",
     "description": "Metric data captured by an APM agent",
     "properties": {

diff --git a/processor/stream/stream_processor.go b/processor/stream/stream_processor.go
@@ -68,7 +68,7 @@ var models = []struct {
 		span.V2DecodeEvent,
 	},
 	{
-		"metric",
+		"metricset",
 		metric.ModelSchema(),
 		metric.DecodeMetric,
 	},

diff --git a/script/inline_schemas/inline_schemas.go b/script/inline_schemas/inline_schemas.go
@@ -42,7 +42,7 @@ func main() {
 		{"errors/v2_error.json", "model/error/generated/schema/error.go", "ModelSchema"},
 		{"transactions/v2_transaction.json", "model/transaction/generated/schema/transaction.go", "ModelSchema"},
 		{"spans/v2_span.json", "model/span/generated/schema/transaction.go", "ModelSchema"},
-		{"metrics/metric.json", "model/metric/generated/schema/metric.go", "ModelSchema"},
+		{"metrics/metricset.json", "model/metric/generated/schema/metricset.go", "ModelSchema"},
 	}
 	for _, schemaInfo := range schemaPaths {
 		file := filepath.Join(filepath.Dir(basePath), schemaInfo.path)

diff --git a/testdata/intake-v2/invalid-json-metadata.ndjson b/testdata/intake-v2/invalid-json-metadata.ndjson
@@ -1,2 +1,2 @@
 {"metadata": {"invalid-json"}}
-{"metric": { "samples": { "byte_counter": { "value": 1 }, "short_counter": { "value": 227 }, "integer_gauge": { "value": 42767 }, "long_gauge": { "value": 3147483648 }, "float_gauge": { "value": 9.16 }, "double_gauge": { "value": 3.141592653589793 }, "dotted.float.gauge": { "value": 6.12 }, "negative.d.o.t.t.e.d": { "value": -1022 } }, "tags": { "code": "200", "some.other.code": "abc" }, "timestamp": "2017-05-30T18:53:42.281Z" }}
+{"metricset": { "samples": { "byte_counter": { "value": 1 }, "short_counter": { "value": 227 }, "integer_gauge": { "value": 42767 }, "long_gauge": { "value": 3147483648 }, "float_gauge": { "value": 9.16 }, "double_gauge": { "value": 3.141592653589793 }, "dotted.float.gauge": { "value": 6.12 }, "negative.d.o.t.t.e.d": { "value": -1022 } }, "tags": { "code": "200", "some.other.code": "abc" }, "timestamp": "2017-05-30T18:53:42.281Z" }}
diff --git a/testdata/intake-v2/invalid-metadata-2.ndjson b/testdata/intake-v2/invalid-metadata-2.ndjson
@@ -1,3 +1,3 @@
 {"not": "metadata"}
-{"metric": { "samples": { "byte_counter": { "value": 1 }, "short_counter": { "value": 227 }, "integer_gauge": { "value": 42767 }, "long_gauge": { "value": 3147483648 }, "float_gauge": { "value": 9.16 }, "double_gauge": { "value": 3.141592653589793 }, "dotted.float.gauge": { "value": 6.12 }, "negative.d.o.t.t.e.d": { "value": -1022 } }, "tags": { "code": "200", "some.other.code": "abc" }, "timestamp": "2017-05-30T18:53:42.281Z" }}
+{"metricset": { "samples": { "byte_counter": { "value": 1 }, "short_counter": { "value": 227 }, "integer_gauge": { "value": 42767 }, "long_gauge": { "value": 3147483648 }, "float_gauge": { "value": 9.16 }, "double_gauge": { "value": 3.141592653589793 }, "dotted.float.gauge": { "value": 6.12 }, "negative.d.o.t.t.e.d": { "value": -1022 } }, "tags": { "code": "200", "some.other.code": "abc" }, "timestamp": "2017-05-30T18:53:42.281Z" }}
 
diff --git a/testdata/intake-v2/invalid-metadata.ndjson b/testdata/intake-v2/invalid-metadata.ndjson
@@ -1,3 +1,3 @@
 {"metadata": {"user": null}}
-{"metric": { "samples": { "byte_counter": { "value": 1 }, "short_counter": { "value": 227 }, "integer_gauge": { "value": 42767 }, "long_gauge": { "value": 3147483648 }, "float_gauge": { "value": 9.16 }, "double_gauge": { "value": 3.141592653589793 }, "dotted.float.gauge": { "value": 6.12 }, "negative.d.o.t.t.e.d": { "value": -1022 } }, "tags": { "code": "200", "some.other.code": "abc" }, "timestamp": "2017-05-30T18:53:42.281Z" }}
+{"metricset": { "samples": { "byte_counter": { "value": 1 }, "short_counter": { "value": 227 }, "integer_gauge": { "value": 42767 }, "long_gauge": { "value": 3147483648 }, "float_gauge": { "value": 9.16 }, "double_gauge": { "value": 3.141592653589793 }, "dotted.float.gauge": { "value": 6.12 }, "negative.d.o.t.t.e.d": { "value": -1022 } }, "tags": { "code": "200", "some.other.code": "abc" }, "timestamp": "2017-05-30T18:53:42.281Z" }}
 
diff --git a/testdata/intake-v2/metrics.ndjson b/testdata/intake-v2/metrics.ndjson
@@ -1,3 +1,3 @@
 {"metadata": {"user": null, "process": {"ppid": null, "pid": 1234, "argv": null, "title": null}, "system": null, "service": {"name": "1234_service-12a3", "language": {"version": null, "name":"ecmascript"}, "agent": {"version": "3.14.0", "name": "elastic-node"}, "environment": null, "framework": null,"version": null, "runtime": null}}}
-{"metric": { "samples": { "byte_counter": { "value": 1 }, "short_counter": { "value": 227 }, "integer_gauge": { "value": 42767 }, "long_gauge": { "value": 3147483648 }, "float_gauge": { "value": 9.16 }, "double_gauge": { "value": 3.141592653589793 }, "dotted.float.gauge": { "value": 6.12 }, "negative.d.o.t.t.e.d": { "value": -1022 } }, "tags": { "code": "200", "some.other.code": "abc" }, "timestamp": "2017-05-30T18:53:42.281Z" }}
-{ "metric": { "samples": { "go.memstats.heap.sys.bytes": { "value": 6.520832e+06 } }, "timestamp": "2017-05-30T18:53:42.281Z" }}
+{"metricset": { "samples": { "byte_counter": { "value": 1 }, "short_counter": { "value": 227 }, "integer_gauge": { "value": 42767 }, "long_gauge": { "value": 3147483648 }, "float_gauge": { "value": 9.16 }, "double_gauge": { "value": 3.141592653589793 }, "dotted.float.gauge": { "value": 6.12 }, "negative.d.o.t.t.e.d": { "value": -1022 } }, "tags": { "code": "200", "some.other.code": "abc" }, "timestamp": "2017-05-30T18:53:42.281Z" }}
+{ "metricset": { "samples": { "go.memstats.heap.sys.bytes": { "value": 6.520832e+06 } }, "timestamp": "2017-05-30T18:53:42.281Z" }}
diff --git a/testdata/intake-v2/minimal_process.ndjson b/testdata/intake-v2/minimal_process.ndjson
@@ -2,4 +2,4 @@
 { "error": {"id": "abcdef0123456789", "timestamp": "2018-08-09T15:04:05.999Z","log": {"level": "custom log level","message": "Cannot read property 'baz' of undefined"}}}
 { "span": { "id": "0123456a89012345", "trace_id": "0123456789abcdef0123456789abcdef", "transaction_id": "ab23456a89012345", "parent": 1, "name": "GET /api/types", "type": "request", "start": 1.845, "duration": 3.5642981, "stacktrace": [], "context": {}  }}
 { "transaction": { "trace_id": "01234567890123456789abcdefabcdef", "id": "abcdef1478523690", "type": "request", "duration": 32.592981, "timestamp": "2018-08-30T18:53:27.154Z", "result": "200", "context": null, "spans": null, "sampled": null, "span_count": null }}
-{ "metric": { "samples": { "go.memstats.heap.sys.bytes": { "value": 61235 } }, "timestamp": "2017-05-30T18:53:42.281Z" }}
+{ "metricset": { "samples": { "go.memstats.heap.sys.bytes": { "value": 61235 } }, "timestamp": "2017-05-30T18:53:42.281Z" }}
diff --git a/testdata/intake-v2/minimal_service.ndjson b/testdata/intake-v2/minimal_service.ndjson
@@ -1,3 +1,3 @@
 {"metadata": { "service": {"name": "1234_service-12a3", "language": {"name": "ecmascript"}, "agent": {"version": "3.14.0", "name": "elastic-node"}}}}
 { "error": {"id": "abcdef0123456789", "timestamp": "2018-08-09T15:04:05.999Z","log": {"level": "custom log level","message": "Cannot read property 'baz' of undefined"}}}
-{ "metric": { "samples": { "go.memstats.heap.sys.bytes": { "value": 61235 } }, "timestamp": "2017-05-30T18:53:42.281Z" }}
+{ "metricset": { "samples": { "go.memstats.heap.sys.bytes": { "value": 61235 } }, "timestamp": "2017-05-30T18:53:42.281Z" }}
diff --git a/testdata/intake-v2/optional-timestamps.ndjson b/testdata/intake-v2/optional-timestamps.ndjson
@@ -1,4 +1,4 @@
 {"metadata": {"user": {"id": "123", "email": "[email protected]", "username": "john"}, "process": {"ppid": 6789, "pid": 1234,"argv": ["node", "server.js"], "title": "node"}, "system": {"platform": "darwin", "hostname": "prod1.example.com", "architecture": "x64"}, "service": {"name": "backendspans", "language": {"version": "8", "name": "ecmascript"}, "agent": {"version": "3.14.0", "name": "elastic-node"}, "environment": "staging", "framework": {"version": "1.2.3", "name": "Express"}, "version": "5.1.3", "runtime": {"version": "8.0.0", "name": "node"}}}}
 {"transaction": {"name": "tx1", "id": "1111222233334444", "trace_id": "abcdefabcdef01234567890123456789", "duration": 12, "type": "request"}}
 {"span": {"name": "sp1","trace_id": "abcdefabcdef01234567890123456789", "duration": 20, "start": 10, "type": "db", "id": "0147258369abcdef", "transaction_id": "fedcba0123456789"}}
-{"metric": {"samples": {"my-metric": {"value": 99}}, "timestamp": "2018-01-01T11:00:00Z"}}
+{"metricset": {"samples": {"my-metric": {"value": 99}}, "timestamp": "2018-01-01T11:00:00Z"}}