Fix equalAggTagKeys() in Stackdriver Exporter. (#664)

Sum Aggregation should match INT64 or DOUBLE, and LastValue should match DOUBLE.
census-instrumentation · Apr 2, 2018 · 3caf852 · 3caf852
1 parent 3531d67
commit 3caf852
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/exporter/stackdriver/stats.go b/exporter/stackdriver/stats.go
@@ -392,9 +392,9 @@ func equalAggTagKeys(md *metricpb.MetricDescriptor, agg *view.Aggregation, keys
 	var aggTypeMatch bool
 	switch md.ValueType {
 	case metricpb.MetricDescriptor_INT64:
-		aggTypeMatch = agg.Type == view.AggTypeCount
+		aggTypeMatch = agg.Type == view.AggTypeCount || agg.Type == view.AggTypeSum
 	case metricpb.MetricDescriptor_DOUBLE:
-		aggTypeMatch = agg.Type == view.AggTypeSum
+		aggTypeMatch = agg.Type == view.AggTypeSum || agg.Type == view.AggTypeLastValue
 	case metricpb.MetricDescriptor_DISTRIBUTION:
 		aggTypeMatch = agg.Type == view.AggTypeDistribution
 	}

diff --git a/exporter/stackdriver/stats_test.go b/exporter/stackdriver/stats_test.go
@@ -433,7 +433,7 @@ func TestEqualAggWindowTagKeys(t *testing.T) {
 			wantErr: false,
 		},
 		{
-			name: "sum agg",
+			name: "sum agg double",
 			md: &metricpb.MetricDescriptor{
 				MetricKind: metricpb.MetricDescriptor_CUMULATIVE,
 				ValueType:  metricpb.MetricDescriptor_DOUBLE,
@@ -442,6 +442,26 @@ func TestEqualAggWindowTagKeys(t *testing.T) {
 			agg:     view.Sum(),
 			wantErr: false,
 		},
+		{
+			name: "sum agg int64",
+			md: &metricpb.MetricDescriptor{
+				MetricKind: metricpb.MetricDescriptor_CUMULATIVE,
+				ValueType:  metricpb.MetricDescriptor_INT64,
+				Labels:     []*label.LabelDescriptor{{Key: opencensusTaskKey}},
+			},
+			agg:     view.Sum(),
+			wantErr: false,
+		},
+		{
+			name: "last value agg double",
+			md: &metricpb.MetricDescriptor{
+				MetricKind: metricpb.MetricDescriptor_CUMULATIVE,
+				ValueType:  metricpb.MetricDescriptor_DOUBLE,
+				Labels:     []*label.LabelDescriptor{{Key: opencensusTaskKey}},
+			},
+			agg:     view.LastValue(),
+			wantErr: false,
+		},
 		{
 			name: "distribution agg - mismatch",
 			md: &metricpb.MetricDescriptor{