Simplify use of time package (#1167)

census-instrumentation · Sep 10, 2019 · 3da91ae · 3da91ae
1 parent ce85b6d
commit 3da91ae
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 10 deletions.
diff --git a/examples/derived_gauges/README.md b/examples/derived_gauges/README.md
@@ -295,7 +295,7 @@ func doWork() {
 func main() {
 	// Using logexporter but you can choose any supported exporter.
 	exporter, err := exporter.NewLogExporter(exporter.Options{
-		ReportingInterval: time.Duration(10 * time.Second),
+		ReportingInterval: 10 * time.Second,
 		MetricsLogFile:    metricsLogFile,
 	})
 	if err != nil {

diff --git a/examples/derived_gauges/derived_gauge.go b/examples/derived_gauges/derived_gauge.go
@@ -172,7 +172,7 @@ func doWork() {
 func main() {
 	// Using logexporter but you can choose any supported exporter.
 	exporter, err := exporter.NewLogExporter(exporter.Options{
-		ReportingInterval: time.Duration(10 * time.Second),
+		ReportingInterval: 10 * time.Second,
 		MetricsLogFile:    metricsLogFile,
 	})
 	if err != nil {

diff --git a/examples/gauges/README.md b/examples/gauges/README.md
@@ -253,7 +253,7 @@ func work() {
 func main() {
 	// Using log exporter to export metrics but you can choose any supported exporter.
 	exporter, err := exporter.NewLogExporter(exporter.Options{
-		ReportingInterval: time.Duration(10 * time.Second),
+		ReportingInterval: 10 * time.Second,
 		MetricsLogFile:    metricsLogFile,
 	})
 	if err != nil {

diff --git a/examples/gauges/gauge.go b/examples/gauges/gauge.go
@@ -148,7 +148,7 @@ func work() {
 func main() {
 	// Using log exporter to export metrics but you can choose any supported exporter.
 	exporter, err := exporter.NewLogExporter(exporter.Options{
-		ReportingInterval: time.Duration(10 * time.Second),
+		ReportingInterval: 10 * time.Second,
 		MetricsLogFile:    metricsLogFile,
 	})
 	if err != nil {

diff --git a/examples/helloworld/main.go b/examples/helloworld/main.go
@@ -44,7 +44,7 @@ func main() {
 
 	// Register an exporter to be able to retrieve
 	// the data from the subscribed views.
-	e, err := exporter.NewLogExporter(exporter.Options{ReportingInterval: time.Duration(time.Second)})
+	e, err := exporter.NewLogExporter(exporter.Options{ReportingInterval: time.Second})
 	if err != nil {
 		log.Fatal(err)
 	}

diff --git a/examples/http/helloworld_server/main.go b/examples/http/helloworld_server/main.go
@@ -43,7 +43,7 @@ func main() {
 
 	// Using log exporter to export metrics but you can choose any supported exporter.
 	exporter, err := exporter.NewLogExporter(exporter.Options{
-		ReportingInterval: time.Duration(10 * time.Second),
+		ReportingInterval: 10 * time.Second,
 		MetricsLogFile:    metricsLogFile,
 		TracesLogFile:     tracesLogFile,
 	})

diff --git a/examples/quickstart/stats.go b/examples/quickstart/stats.go
@@ -100,7 +100,7 @@ func main() {
 
 	// Using log exporter here to export metrics but you can choose any supported exporter.
 	exporter, err := exporter.NewLogExporter(exporter.Options{
-		ReportingInterval: time.Duration(10 * time.Second),
+		ReportingInterval: 10 * time.Second,
 		MetricsLogFile:    metricsLogFile,
 	})
 	if err != nil {

diff --git a/plugin/ochttp/trace_test.go b/plugin/ochttp/trace_test.go
@@ -353,7 +353,7 @@ func serveHTTP(handler *Handler, done chan struct{}, wait chan time.Time, status
 		// Simulate a slow-responding server.
 		sleepUntil := <-wait
 		for time.Now().Before(sleepUntil) {
-			time.Sleep(sleepUntil.Sub(time.Now()))
+			time.Sleep(time.Until(sleepUntil))
 		}
 
 		io.WriteString(w, "expected-response")

diff --git a/stats/view/view_to_metric_test.go b/stats/view/view_to_metric_test.go
@@ -252,7 +252,7 @@ func initMetricDescriptors() {
 }
 
 func Test_ViewToMetric(t *testing.T) {
-	startTime := time.Now().Add(-time.Duration(60 * time.Second))
+	startTime := time.Now().Add(-60 * time.Second)
 	now := time.Now()
 	tests := []*testToMetrics{
 		{
@@ -460,7 +460,7 @@ func Test_ViewToMetric(t *testing.T) {
 // Test to verify that a metric converted from a view with Aggregation Count should always
 // have Dimensionless unit.
 func TestUnitConversionForAggCount(t *testing.T) {
-	startTime := time.Now().Add(-time.Duration(60 * time.Second))
+	startTime := time.Now().Add(-60 * time.Second)
 	now := time.Now()
 	tests := []*struct {
 		name     string