fix suggested by easwars

Author: lychung83

monitoring/exporter/stackdriver/data_test.go

@@ -1,4 +1,18 @@
-package exporter
+// Copyright 2018 Google Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package stackdriver
 
 import (
 	"context"
@@ -9,16 +23,11 @@ import (
 	"go.opencensus.io/stats"
 	"go.opencensus.io/stats/view"
 	"go.opencensus.io/tag"
-	monitoredrespb "google.golang.org/genproto/googleapis/api/monitoredres"
+	mrpb "google.golang.org/genproto/googleapis/api/monitoredres"
 )
 
 // This file defines various data needed for testing.
 
-func init() {
-	// For testing convenience, we reduce maximum time series that metric client accepts.
-	MaxTimeSeriesPerUpload = 3
-}
-
 const (
 	label1name = "key_1"
 	label2name = "key_2"
@@ -32,11 +41,15 @@ const (
 	value4 = "value_4"
 	value5 = "value_5"
 	value6 = "value_6"
+	value7 = "value_7"
+	value8 = "value_8"
 
 	metric1name = "metric_1"
 	metric1desc = "this is metric 1"
 	metric2name = "metric_2"
 	metric2desc = "this is metric 2"
+	metric3name = "metric_3"
+	metric3desc = "this is metric 3"
 
 	project1 = "project-1"
 	project2 = "project-2"
@@ -45,14 +58,16 @@ const (
 var (
 	ctx = context.Background()
 
+	invalidDataErrStr = "invalid data"
 	// This error is used for test to catch some error happpened.
-	invalidDataError = errors.New("invalid data")
+	invalidDataError = errors.New(invalidDataErrStr)
 	// This error is used for unexpected error.
 	unrecognizedDataError = errors.New("unrecognized data")
 
-	key1 = getKey(label1name)
-	key2 = getKey(label2name)
-	key3 = getKey(label3name)
+	key1       = getKey(label1name)
+	key2       = getKey(label2name)
+	key3       = getKey(label3name)
+	projectKey = getKey(ProjectKeyName)
 
 	view1 = &view.View{
 		Name:        metric1name,
@@ -68,9 +83,16 @@ var (
 		Measure:     stats.Int64(metric2name, metric2desc, stats.UnitDimensionless),
 		Aggregation: view.Sum(),
 	}
+	view3 = &view.View{
+		Name:        metric3name,
+		Description: metric3desc,
+		TagKeys:     []tag.Key{projectKey},
+		Measure:     stats.Int64(metric3name, metric3desc, stats.UnitDimensionless),
+		Aggregation: view.Sum(),
+	}
 
-	// To make verification easy, we require all valid rows should int64 values and all of them
-	// must be distinct.
+	// To make verification easy, we require all valid rows should have int64 values and all of
+	// them must be distinct.
 	view1row1 = &view.Row{
 		Tags: nil,
 		Data: &view.SumData{Value: 1},
@@ -91,23 +113,30 @@ var (
 		Tags: []tag.Tag{{key1, value4}, {key2, value5}, {key3, value6}},
 		Data: &view.SumData{Value: 5},
 	}
+	view3row1 = &view.Row{
+		Tags: []tag.Tag{{projectKey, project1}},
+		Data: &view.SumData{Value: 6},
+	}
+	view3row2 = &view.Row{
+		Tags: []tag.Tag{{projectKey, project2}},
+		Data: &view.SumData{Value: 7},
+	}
+	view3row3 = &view.Row{
+		Tags: []tag.Tag{{projectKey, project1}},
+		Data: &view.SumData{Value: 8},
+	}
 	// This Row does not have valid Data field, so is invalid.
 	invalidRow = &view.Row{Data: nil}
 
-	startTime1 = endTime1.Add(-10 * time.Second)
-	endTime1   = startTime2.Add(-time.Second)
-	startTime2 = endTime2.Add(-10 * time.Second)
-	endTime2   = time.Now()
-
-	resource1 = &monitoredrespb.MonitoredResource{
+	resource1 = &mrpb.MonitoredResource{
 		Type: "cloudsql_database",
 		Labels: map[string]string{
 			"project_id":  project1,
 			"region":      "us-central1",
 			"database_id": "cloud-SQL-instance-1",
 		},
 	}
-	resource2 = &monitoredrespb.MonitoredResource{
+	resource2 = &mrpb.MonitoredResource{
 		Type: "gce_instance",
 		Labels: map[string]string{
 			"project_id":  project2,
@@ -117,6 +146,23 @@ var (
 	}
 )
 
+// Timestamps. We make sure that all time stamps are strictly increasing.
+var (
+	startTime1, endTime1, startTime2, endTime2 time.Time
+	startTime3, endTime3, startTime4, endTime4 time.Time
+)
+
+func init() {
+	ts := time.Now()
+	for _, t := range []*time.Time{
+		&startTime1, &endTime1, &startTime2, &endTime2,
+		&startTime3, &endTime3, &startTime4, &endTime4,
+	} {
+		*t = ts
+		ts = ts.Add(time.Second)
+	}
+}
+
 func getKey(name string) tag.Key {
 	key, err := tag.NewKey(name)
 	if err != nil {