HomeMesosphereNo notifications. 4 unresolved issues.
  • Search
Differential D918

Remove duplicate data from the metrics endpoint
ClosedAll Users
Actions

Authored by timcharper on Jul 12 2017, 7:56 AM.

Details

Reviewers
ichernetsky
jeschkies
jenkins
Commits
rMARATHON0b7793cc163d: Remove duplicate data from the metrics endpoint
JIRA Issues
JIRA MARATHON-7521 Histograms, counters, min-max-counters, and timers are duplicated in /metrics
Summary

Also pluralize min-max-counters to stay consistent with pluralization of
other keys

Test Plan

query /metrics

Diff Detail

Repository
rMARATHON marathon
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
Changes from before your most recent comment are hidden. Show Older Changes
jeschkies accepted this revision.Jul 13 2017, 11:17 AM

Cool thanks.

jenkins requested changes to this revision.Jul 19 2017, 6:07 AM
This revision now requires changes to proceed.Jul 19 2017, 6:07 AM
jenkins added a comment.Jul 19 2017, 6:18 AM
✗ Build of 3817 failed jenkins-public-marathon-phabricator-541.

Error message:

Stage Compile and Test failed.

(๑′°︿°๑)

Closed by commit rMARATHON0b7793cc163d: Remove duplicate data from the metrics endpoint (authored by timcharper). · Explain WhyJul 21 2017, 7:08 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

Diff 3825

View Options

docs/docs/rest-api/public/api/v2/types/metrics.raml

Show First 20 Lines • Show All 83 Lines • ▼ Show 20 Line(s)
8484 counters:
8585 type: object
8686 properties:
8787 /.*/: Counter
8888 gauges:
8989 type: object
9090 properties:
9191 /.*/: Histogram
92 min-max-counter:
92 min-max-counters:
jeschkiesUnsubmitted
Not Done

Isn't this a breaking change?

timcharperAuthorUnsubmitted
Not Done

min-max-counters is new to 1.5.x; since there is not yet a stable release of 1.5.x, then I submit that it is safe to change.

9393 type: object
9494 properties:
9595 /.*/: Histogram
9696 /.*/:
9797 type: object
9898
View Options

src/main/scala/mesosphere/marathon/raml/MetricsConversion.scala

Show First 20 Lines • Show All 48 Lines • ▼ Show 20 Line(s)
4949
5050 Metrics(
5151 // the start zoneId could be different than the current system zone.
5252 start = OffsetDateTime.ofInstant(Instant.ofEpochMilli(snapshot.from.millis), zoneId),
5353 end = OffsetDateTime.ofInstant(Instant.ofEpochMilli(snapshot.from.millis), ZoneId.systemDefault()),
5454 counters = metrics.getOrElse("counter", Map.empty).collect { case (k, v: Counter) => k -> v },
5555 gauges = metrics.getOrElse("gauge", Map.empty).collect { case (k, v: Histogram) => k -> v },
5656 histograms = metrics.getOrElse("histogram", Map.empty).collect { case (k, v: Histogram) => k -> v },
57 `min-max-counter` = metrics.getOrElse("min-max-counter", Map.empty).collect { case (k, v: Histogram) => k -> v },
57 `min-max-counters` = metrics.getOrElse("min-max-counter", Map.empty).collect { case (k, v: Histogram) => k -> v },
5858 additionalProperties = JsObject(
59 metrics.filterKeys(s => s != "counter" || s != "gauge" || s != "histogram" || s != "min-max-counter").map {
60 case (name, metrics) =>
59 metrics.collect {
60 case (name, metrics) if name != "counter" && name != "gauge" && name != "histogram" && name != "min-max-counter" =>
6161 name -> JsObject(metrics.collect {
6262 case (name, histogram: Histogram) => name -> Json.toJson(histogram)
6363 case (name, counter: Counter) => name -> Json.toJson(counter)
6464 })
6565 }
6666 )
6767 )
6868 }
6969}
7070
7171object MetricsConversion extends MetricsConversion