Use microseconds for rtt everywhere instead of milliseconds. Currentl…

…y we calculate in microseconds and export in milliseconds, this is confusing and unnecessary. ORIGINAL_AUTHOR=Manu Garg <[email protected]> PiperOrigin-RevId: 162277410
google · Jul 17, 2017 · fa62d61 · fa62d61
1 parent f6a475c
commit fa62d61
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 35 deletions.
diff --git a/probes/dns/dns.go b/probes/dns/dns.go
@@ -26,7 +26,6 @@ package dns
 import (
 	"context"
 	"errors"
-	"fmt"
 	"net"
 	"sync"
 	"time"
@@ -83,16 +82,9 @@ type probeRunResult struct {
 }
 
 func newProbeRunResult(target string) probeRunResult {
-	prr := probeRunResult{
+	return probeRunResult{
 		target: target,
 	}
-	// Borgmon and friends expect results to be in milliseconds. We should
-	// change expectations at the Borgmon end once the transition to the new
-	// metrics model is complete.
-	prr.rtt.Str = func(i int64) string {
-		return fmt.Sprintf("%.3f", float64(i)/1000)
-	}
-	return prr
 }
 
 // Metrics converts probeRunResult into metrics.EventMetrics object

diff --git a/probes/http/http.go b/probes/http/http.go
@@ -67,18 +67,11 @@ type probeRunResult struct {
 }
 
 func newProbeRunResult(target string) probeRunResult {
-	prr := probeRunResult{
+	return probeRunResult{
 		target:     target,
 		respCodes:  metrics.NewMap("code", &metrics.Int{}),
 		respBodies: metrics.NewMap("resp", &metrics.Int{}),
 	}
-	// Borgmon and friends expect results to be in milliseconds. We should
-	// change expectations at the Borgmon end once the transition to the new
-	// metrics model is complete.
-	prr.rtt.Str = func(i int64) string {
-		return fmt.Sprintf("%.3f", float64(i)/1000)
-	}
-	return prr
 }
 
 // Metrics converts probeRunResult into a slice of the metrics that is suitable for

diff --git a/probes/ping/ping.go b/probes/ping/ping.go
@@ -386,7 +386,7 @@ func (p *Probe) Start(ctx context.Context, dataChan chan *metrics.EventMetrics)
 			em := metrics.NewEventMetrics(ts).
 				AddMetric("sent", metrics.NewInt(p.sent[t])).
 				AddMetric("rcvd", metrics.NewInt(p.received[t])).
-				AddMetric("rtt", metrics.NewInt(p.latencyUsec[t]/1000)).
+				AddMetric("rtt", metrics.NewInt(p.latencyUsec[t])).
 				AddLabel("ptype", "ping").
 				AddLabel("probe", p.name).
 				AddLabel("dst", t)

diff --git a/probes/udp/udp.go b/probes/udp/udp.go
@@ -62,16 +62,9 @@ type probeRunResult struct {
 }
 
 func newProbeRunResult(target string) probeRunResult {
-	prr := probeRunResult{
+	return probeRunResult{
 		target: target,
 	}
-	// Borgmon and friends expect results to be in milliseconds. We should
-	// change expectations at the Borgmon end once the transition to the new
-	// metrics model is complete.
-	prr.rtt.Str = func(i int64) string {
-		return fmt.Sprintf("%.3f", float64(i)/1000)
-	}
-	return prr
 }
 
 // Target returns the p.target.

diff --git a/utils/proberesults_test.go b/utils/proberesults_test.go
@@ -16,7 +16,6 @@ package utils
 
 import (
 	"context"
-	"fmt"
 	"testing"
 	"time"
 
@@ -36,16 +35,9 @@ type probeRunResult struct {
 }
 
 func newProbeRunResult(target string) probeRunResult {
-	prr := probeRunResult{
+	return probeRunResult{
 		target: target,
 	}
-	// Borgmon and friends expect results to be in milliseconds. We should
-	// change expectations at the Borgmon end once the transition to the new
-	// metrics model is complete.
-	prr.rtt.Str = func(i int64) string {
-		return fmt.Sprintf("%.3f", float64(i)/1000)
-	}
-	return prr
 }
 
 // Metrics converts probeRunResult into a map of the metrics that is suitable for