Remove unused properties from metricset Intake API (elastic#2397)

As discussed in elastic/apm#78 (comment) the additional properties are not correct as they miss the `value` part and therefore unnecessary as already covered by the existing, more generic pattern.
simitt · Jul 9, 2019 · 4ea87e6 · 4ea87e6
1 parent 3fdec76
commit 4ea87e6
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 132 deletions.
diff --git a/docs/spec/metricsets/metricset.json b/docs/spec/metricsets/metricset.json
@@ -20,72 +20,6 @@
                             "$ref": "sample.json"
                         }
                     },
-                    "properties": {
-                        "transaction": {
-                            "type": ["object", "null"],
-                            "properties": {
-                                "duration": {
-                                    "type": ["object", "null"],
-                                    "properties": {
-                                        "count": {
-                                            "type": ["number", "null"]
-                                        },
-                                        "sum": {
-                                            "type": ["object", "null"],
-                                            "properties": {
-                                                "us": {
-                                                    "type": ["number", "null"]
-                                                }
-                                            }
-                                        }
-                                    }
-                                },
-                                "breakdown": {
-                                    "type": ["object", "null"],
-                                    "properties": {
-                                        "count": {
-                                            "type": ["number", "null"]
-                                        }
-                                    }
-                                },
-                                "self_time": {
-                                    "type": ["object", "null"],
-                                    "properties": {
-                                        "count": {
-                                            "type": ["number", "null"]
-                                        },
-                                        "sum": {
-                                            "type": ["object", "null"],
-                                            "properties": {
-                                                "us": {
-                                                    "type": ["number", "null"]
-                                                }
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        },
-                        "span": {
-                            "type": ["object", "null"],
-                            "self_time": {
-                                "type": ["object", "null"],
-                                "properties": {
-                                    "count": {
-                                        "type":  ["number", "null"]
-                                    },
-                                    "sum": {
-                                        "type": ["object", "null"],
-                                        "properties": {
-                                            "us": {
-                                                "type": ["number", "null"]
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    },
                     "additionalProperties": false
                 },
                 "tags": {

diff --git a/model/metricset/generated/schema/metricset.go b/model/metricset/generated/schema/metricset.go
@@ -91,72 +91,6 @@ const ModelSchema = `{
     "required": ["value"]
                         }
                     },
-                    "properties": {
-                        "transaction": {
-                            "type": ["object", "null"],
-                            "properties": {
-                                "duration": {
-                                    "type": ["object", "null"],
-                                    "properties": {
-                                        "count": {
-                                            "type": ["number", "null"]
-                                        },
-                                        "sum": {
-                                            "type": ["object", "null"],
-                                            "properties": {
-                                                "us": {
-                                                    "type": ["number", "null"]
-                                                }
-                                            }
-                                        }
-                                    }
-                                },
-                                "breakdown": {
-                                    "type": ["object", "null"],
-                                    "properties": {
-                                        "count": {
-                                            "type": ["number", "null"]
-                                        }
-                                    }
-                                },
-                                "self_time": {
-                                    "type": ["object", "null"],
-                                    "properties": {
-                                        "count": {
-                                            "type": ["number", "null"]
-                                        },
-                                        "sum": {
-                                            "type": ["object", "null"],
-                                            "properties": {
-                                                "us": {
-                                                    "type": ["number", "null"]
-                                                }
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        },
-                        "span": {
-                            "type": ["object", "null"],
-                            "self_time": {
-                                "type": ["object", "null"],
-                                "properties": {
-                                    "count": {
-                                        "type":  ["number", "null"]
-                                    },
-                                    "sum": {
-                                        "type": ["object", "null"],
-                                        "properties": {
-                                            "us": {
-                                                "type": ["number", "null"]
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    },
                     "additionalProperties": false
                 },
                 "tags": {