Roll go_deps 96..97
The AutoRoll server is located here: https://autoroll.skia.org/r/skia-go-deps-infra-autoroll
Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md
If the roll is causing failures, please contact the current sheriff, who should
be CC'd on the roll, and stop the roller if necessary.
TBR=borenet@google.com
Change-Id: I7c0327e9044bf57876073ed89d119a39b1613a56
Reviewed-on: https://skia-review.googlesource.com/c/179055
Reviewed-by: Eric Boren <borenet@google.com>
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Reviewed-by: skia-autoroll <skia-autoroll@skia-public.iam.gserviceaccount.com>
Commit-Queue: Eric Boren <borenet@google.com>
diff --git a/datahopper/go/swarming_metrics/bots_test.go b/datahopper/go/swarming_metrics/bots_test.go
index 5df2883..c927230 100644
--- a/datahopper/go/swarming_metrics/bots_test.go
+++ b/datahopper/go/swarming_metrics/bots_test.go
@@ -212,10 +212,10 @@
assert.NoError(t, err)
assert.Len(t, newMetrics, 32, "21 bot metrics + 10 temp metrics + 1 win OS = 32 expected metrics")
- expected := map[string]int64{
- "thermal_zone0": 28,
- "thermal_zone1": 30,
- "thermal_zone2": 36,
+ expected := map[string]float64{
+ "thermal_zone0": 28.0,
+ "thermal_zone1": 30.0,
+ "thermal_zone2": 36.0,
}
for z, v := range expected {
tags := map[string]string{
@@ -224,19 +224,19 @@
"swarming": MOCK_SERVER,
"temp_zone": z,
}
- actual, err := strconv.ParseInt(metrics_util.GetRecordedMetric(t, MEASUREMENT_SWARM_BOTS_DEVICE_TEMP, tags), 10, 64)
+ actual, err := strconv.ParseFloat(metrics_util.GetRecordedMetric(t, MEASUREMENT_SWARM_BOTS_DEVICE_TEMP, tags), 64)
assert.NoError(t, err)
- assert.Equalf(t, v, int64(actual), "Wrong temperature seen for metric %s - %s", MEASUREMENT_SWARM_BOTS_DEVICE_TEMP, z)
+ assert.Equalf(t, v, actual, "Wrong temperature seen for metric %s - %s", MEASUREMENT_SWARM_BOTS_DEVICE_TEMP, z)
}
- expected = map[string]int64{
- "battery_direct": 25,
- "merble": 2879,
- "gerble": 40,
- "battery": 26,
- "thermal_zone0": 43,
- "tsens_tz_sensor1": 37,
- "tsens_tz_sensor2": 41,
+ expected = map[string]float64{
+ "battery_direct": 25.0,
+ "merble": 2879.0,
+ "gerble": 40.0,
+ "battery": 26.0,
+ "thermal_zone0": 43.0,
+ "tsens_tz_sensor1": 37.0,
+ "tsens_tz_sensor2": 41.0,
}
for z, v := range expected {
tags := map[string]string{
@@ -245,9 +245,9 @@
"swarming": MOCK_SERVER,
"temp_zone": z,
}
- actual, err := strconv.ParseInt(metrics_util.GetRecordedMetric(t, MEASUREMENT_SWARM_BOTS_DEVICE_TEMP, tags), 10, 64)
+ actual, err := strconv.ParseFloat(metrics_util.GetRecordedMetric(t, MEASUREMENT_SWARM_BOTS_DEVICE_TEMP, tags), 64)
assert.NoError(t, err)
- assert.Equalf(t, v, int64(actual), "Wrong temperature seen for metric %s - %s", MEASUREMENT_SWARM_BOTS_DEVICE_TEMP, z)
+ assert.Equalf(t, v, actual, "Wrong temperature seen for metric %s - %s", MEASUREMENT_SWARM_BOTS_DEVICE_TEMP, z)
}
}
@@ -293,9 +293,9 @@
assert.NoError(t, err)
expected := map[string]string{
- "my-bot-empty-state": "0",
- "my-bot-no-reboot-required": "0",
- "my-bot-reboot-required": "1",
+ "my-bot-empty-state": "0.0",
+ "my-bot-no-reboot-required": "0.0",
+ "my-bot-reboot-required": "1.0",
}
for bot, v := range expected {
tags := map[string]string{
@@ -346,7 +346,7 @@
Quarantined: false,
},
}
- windowsSkoloOSVersionCountHelper(t, now, bots0, "0")
+ windowsSkoloOSVersionCountHelper(t, now, bots0, "0.0")
genBot := func(id, winVer string) *swarming_api.SwarmingRpcsBotInfo {
return &swarming_api.SwarmingRpcsBotInfo{
@@ -366,7 +366,7 @@
genBot("my-bot3", "Windows-10-17134.345"),
genBot("my-bot4", "Windows-10-17134.345"),
}
- windowsSkoloOSVersionCountHelper(t, now, bots1, "1")
+ windowsSkoloOSVersionCountHelper(t, now, bots1, "1.0")
// Two different versions.
bots2 := []*swarming_api.SwarmingRpcsBotInfo{
@@ -375,5 +375,5 @@
genBot("my-bot3", "Windows-10-17134.345"),
genBot("my-bot4", "Windows-10-17134.228"),
}
- windowsSkoloOSVersionCountHelper(t, now, bots2, "2")
+ windowsSkoloOSVersionCountHelper(t, now, bots2, "2.0")
}
diff --git a/go/cipd/asset_versions_gen.go b/go/cipd/asset_versions_gen.go
index 79869ef..be244c1 100644
--- a/go/cipd/asset_versions_gen.go
+++ b/go/cipd/asset_versions_gen.go
@@ -5,7 +5,7 @@
var PKG_VERSIONS_FROM_ASSETS = map[string]string{
"gcloud_linux": "13",
"go": "6",
- "go_deps": "96",
+ "go_deps": "97",
"node": "0",
"protoc": "0",
}
diff --git a/go/metrics2/prom_test.go b/go/metrics2/prom_test.go
index a4f7e51..0e83870 100644
--- a/go/metrics2/prom_test.go
+++ b/go/metrics2/prom_test.go
@@ -25,11 +25,11 @@
func TestInt64(t *testing.T) {
testutils.SmallTest(t)
c := getPromClient()
- check := func(m Int64Metric, metric string, tags map[string]string, expect int64) {
- actual, err := strconv.ParseInt(metrics_util.GetRecordedMetric(t, metric, tags), 10, 64)
+ check := func(m Int64Metric, metric string, tags map[string]string, expect float64) {
+ actual, err := strconv.ParseFloat(metrics_util.GetRecordedMetric(t, metric, tags), 64)
assert.NoError(t, err)
assert.Equal(t, expect, actual)
- assert.Equal(t, m.Get(), expect)
+ assert.Equal(t, float64(m.Get()), expect)
}
labels := map[string]string{"some_key": "some-value"}
g := c.GetInt64Metric("a.b", labels)
@@ -113,11 +113,11 @@
func TestCounter(t *testing.T) {
testutils.SmallTest(t)
c := getPromClient()
- check := func(m Counter, metric string, tags map[string]string, expect int64) {
- actual, err := strconv.ParseInt(metrics_util.GetRecordedMetric(t, metric, tags), 10, 64)
+ check := func(m Counter, metric string, tags map[string]string, expect float64) {
+ actual, err := strconv.ParseFloat(metrics_util.GetRecordedMetric(t, metric, tags), 64)
assert.NoError(t, err)
assert.Equal(t, expect, actual)
- assert.Equal(t, m.Get(), expect)
+ assert.Equal(t, float64(m.Get()), expect)
}
labels := map[string]string{"some_key": "some-value"}
g := c.GetCounter("c", labels)
diff --git a/infra/bots/assets/go_deps/VERSION b/infra/bots/assets/go_deps/VERSION
index 56749c8..c4fbb1c 100644
--- a/infra/bots/assets/go_deps/VERSION
+++ b/infra/bots/assets/go_deps/VERSION
@@ -1 +1 @@
-96
\ No newline at end of file
+97
\ No newline at end of file
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index c559e46..7fee725 100755
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -186,7 +186,7 @@
{
"name": "skia/bots/go_deps",
"path": "go_deps",
- "version": "version:96"
+ "version": "version:97"
}
],
"command": [
@@ -263,7 +263,7 @@
{
"name": "skia/bots/go_deps",
"path": "go_deps",
- "version": "version:96"
+ "version": "version:97"
}
],
"command": [
diff --git a/task_scheduler/go/scheduling/task_scheduler_test.go b/task_scheduler/go/scheduling/task_scheduler_test.go
index c7b7629..9eb108c 100644
--- a/task_scheduler/go/scheduling/task_scheduler_test.go
+++ b/task_scheduler/go/scheduling/task_scheduler_test.go
@@ -3654,9 +3654,9 @@
// At 'now', c1 is 60 seconds old, c2 is 55 seconds old, and c3 (below) is 50 seconds old.
now := c1time.Add(time.Minute)
- c1age := "60"
- c2age := "55"
- c3age := "50"
+ c1age := "60.0"
+ c2age := "55.0"
+ c3age := "50.0"
check := func(buildAge, testAge, perfAge string) {
tags := map[string]string{
@@ -3714,7 +3714,7 @@
assert.NoError(t, s.MainLoop(ctx))
// Expect Build to be up-to-date.
assert.NoError(t, s.updateOverdueJobSpecMetrics(ctx, now))
- check("0", c1age, c2age)
+ check("0.0", c1age, c2age)
// Revert back to c1 (no Perf task) and check that Perf job disappears.
content, err := repo.Repo().GetFile(ctx, "infra/bots/tasks.json", c1)
@@ -3725,5 +3725,5 @@
// Run MainLoop to update to c3. Perf job should be reset to zero. Build job age is now at c3.
assert.NoError(t, s.MainLoop(ctx))
assert.NoError(t, s.updateOverdueJobSpecMetrics(ctx, now))
- check(c3age, c1age, "0")
+ check(c3age, c1age, "0.0")
}
