Skip to content

Commit 01c7555

Browse files
committed
changes
1 parent e30d8d7 commit 01c7555

File tree

3 files changed

+34
-22
lines changed

3 files changed

+34
-22
lines changed

.evergreen/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ functions:
292292
binary: bash
293293
env:
294294
VERSION_ID: ${version_id}
295-
include_expansions_in_env: [perf_uri_private_endpoint]
295+
include_expansions_in_env: [PERF_URI_PRIVATE_ENDPOINT]
296296
args: [*task-runner, perf-pr-comment]
297297

298298
run-enterprise-auth-tests:

internal/cmd/perfcomp/energystatistics_test.go

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,11 @@ func createTestVectors(start1 int, stop1 int, step1 int, start2 int, stop2 int,
1717
xData := []float64{}
1818
yData := []float64{}
1919

20-
i := start1
21-
for i < stop1 {
20+
for i := start1; i < stop1; i += step1 {
2221
xData = append(xData, float64(i))
23-
i += step1
2422
}
25-
j := start2
26-
for j < stop2 {
23+
for j := start2; j < stop2; j += step2 {
2724
yData = append(yData, float64(j))
28-
j += step2
2925
}
3026

3127
x := mat.NewDense(len(xData), 1, xData)
@@ -41,8 +37,8 @@ func TestEnergyStatistics(t *testing.T) {
4137
e, tstat, h := GetEnergyStatistics(x, y)
4238

4339
del := 1e-3
44-
45-
assert.InDelta(t, 0.160, e, del) // |0.160 - e| < 1/100
40+
// Limit precision of comparison to 3 digits after the decimal.
41+
assert.InDelta(t, 0.160, e, del) // |0.160 - e| < 0.001
4642
assert.InDelta(t, 8.136, tstat, del)
4743
assert.InDelta(t, 0.002, h, del)
4844
})
@@ -72,11 +68,10 @@ func TestEnergyStatistics(t *testing.T) {
7268
y := mat.NewDense(1, 1, []float64{1})
7369

7470
e, tstat, h := GetEnergyStatistics(x, y)
75-
del := 1e-3
7671

77-
assert.InDelta(t, 0.0, e, del)
78-
assert.InDelta(t, 0.0, tstat, del)
79-
assert.InDelta(t, 0.0, h, del)
72+
assert.Equal(t, 0.0, e)
73+
assert.Equal(t, 0.0, tstat)
74+
assert.Equal(t, 0.0, h)
8075
})
8176

8277
}

internal/cmd/perfcomp/main.go

Lines changed: 26 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010
"context"
1111
"fmt"
1212
"log"
13+
"math"
1314
"os"
1415
"strings"
1516
"time"
@@ -91,14 +92,14 @@ type EnergyStats struct {
9192

9293
func main() {
9394
// Connect to analytics node
94-
uri := os.Getenv("perf_uri_private_endpoint")
95+
uri := os.Getenv("PERF_URI_PRIVATE_ENDPOINT")
9596
if uri == "" {
96-
log.Panic("perf_uri_private_endpoint env variable is not set")
97+
log.Panic("PERF_URI_PRIVATE_ENDPOINT env variable is not set")
9798
}
9899

99100
version := os.Getenv("VERSION_ID")
100101
if version == "" {
101-
log.Panic("could not retrieve version")
102+
log.Panic("VERSION_ID env variable is not set")
102103
}
103104

104105
client, err1 := mongo.Connect(options.Client().ApplyURI(uri))
@@ -150,7 +151,11 @@ func findRawData(version string, coll *mongo.Collection) ([]RawData, error) {
150151

151152
cursor, err := coll.Find(findCtx, filter, findOptions)
152153
if err != nil {
153-
return nil, err
154+
log.Panicf(
155+
"Error retrieving raw data for version %q: %v",
156+
version,
157+
err,
158+
)
154159
}
155160
defer cursor.Close(findCtx)
156161

@@ -160,13 +165,20 @@ func findRawData(version string, coll *mongo.Collection) ([]RawData, error) {
160165
for cursor.Next(findCtx) {
161166
var rd RawData
162167
if err := cursor.Decode(&rd); err != nil {
163-
return nil, err
168+
break
164169
}
165170
rawData = append(rawData, rd)
166171
}
167172

168-
if err := cursor.Err(); err != nil {
169-
return nil, err
173+
if err == nil {
174+
err = cursor.Err()
175+
}
176+
if err != nil {
177+
log.Panicf(
178+
"Error decoding raw data from version %q: %v",
179+
version,
180+
err,
181+
)
170182
}
171183

172184
return rawData, nil
@@ -208,7 +220,12 @@ func getEnergyStatsForOneBenchmark(rd RawData, coll *mongo.Collection) ([]*Energ
208220

209221
stableRegion, err := findLastStableRegion(testname, measurement, coll)
210222
if err != nil {
211-
return nil, err
223+
log.Panicf(
224+
"Error finding last stable region for test %q, measurement %q: %v",
225+
testname,
226+
measurement,
227+
err,
228+
)
212229
}
213230

214231
pChange := GetPercentageChange(patchVal[0], stableRegion.Mean)
@@ -253,7 +270,7 @@ func generatePRComment(energyStats []*EnergyStats, version string) string {
253270

254271
var testCount int64
255272
for _, es := range energyStats {
256-
if es.Z > 1.96 || es.Z < -1.96 {
273+
if math.Abs(es.Z) > 1.96 {
257274
testCount += 1
258275
fmt.Fprintf(&comment, "| %s | %s | %.4f | %.4f | %.4f | Avg: %.4f, Stdev: %.4f | %.4f |\n", es.Benchmark, es.Measurement, es.H, es.Z, es.PChange, es.StableRegion.Mean, es.StableRegion.Std, es.PatchValues[0])
259276
}

0 commit comments

Comments
 (0)