Fix wrong unit type for contention count when parsing legacy Java profiles. (#404)

aalexand · nolanmar511 · commit cf6d271c8082 · 2018-08-06T07:41:13.000-07:00
diff --git a/profile/legacy_java_profile.go b/profile/legacy_java_profile.go
@@ -134,7 +134,7 @@ func parseJavaHeader(pType string, b []byte, p *Profile) ([]byte, error) {
 				}
 			case "contention/resolution":
 				p.SampleType = []*ValueType{
-					{Type: "contentions", Unit: value},
+					{Type: "contentions", Unit: "count"},
 					{Type: "delay", Unit: value},
 				}
 			case "contention/sampling period":
diff --git a/profile/testdata/java.contention.string b/profile/testdata/java.contention.string
@@ -2,7 +2,7 @@ PeriodType: contentions count
 Period: 100
 Duration: 1h40
 Samples:
-contentions/microseconds delay/microseconds
+contentions/count delay/microseconds
         100        100: 1 2 
         100       1400: 3 4 5 6 7 8 9 10 11 12 13 14 15 16 10 17 18 19 20 21 22 23 24 25 26 27 28 29 
         200        200: 1 2 

Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ func parseJavaHeader(pType string, b []byte, p *Profile) ([]byte, error) {`
`134`	`134`	`}`
`135`	`135`	`case "contention/resolution":`
`136`	`136`	`p.SampleType = []*ValueType{`
`137`		`- {Type: "contentions", Unit: value},`
	`137`	`+ {Type: "contentions", Unit: "count"},`
`138`	`138`	`{Type: "delay", Unit: value},`
`139`	`139`	`}`
`140`	`140`	`case "contention/sampling period":`